Merge pull request #2392 from anehx/fix-validation-context

fix(structure): fix passing of global validation context for structure

Author: winged

caluma/caluma_form/domain_logic.py

@@ -9,7 +9,7 @@
 from caluma.caluma_core.exceptions import ConfigurationError
 from caluma.caluma_core.models import BaseModel
 from caluma.caluma_core.relay import extract_global_id
-from caluma.caluma_form import models, structure, validators
+from caluma.caluma_form import models, validators
 from caluma.caluma_form.utils import recalculate_field
 from caluma.caluma_user.models import BaseUser
 from caluma.utils import update_model
@@ -172,7 +172,9 @@ def recalculate_dependents(answer, update_info):
             return
         log.debug("update_calc_dependents(%s)", answer)
 
-        struc = structure.FieldSet(answer.document.family)
+        struc = validators.DocumentValidator().get_validation_context(
+            answer.document.family
+        )
         field = struc.find_field_by_answer(answer)
         if not field:  # pragma: no cover
             # not covering this, because it's a developer error
@@ -350,7 +352,7 @@ def _initialize_calculated_answers(document):
         In order to do this efficiently, we get all calculated questions with
         their dependents, sort them topoligically, and then update their answer.
         """
-        struc = structure.FieldSet(document.family)
+        struc = validators.DocumentValidator().get_validation_context(document.family)
 
         calculated_fields = (
             field

caluma/caluma_form/tests/test_question.py

@@ -1295,5 +1295,5 @@ def test_init_of_calc_questions_queries(
         question__calc_expression="'table'|answer|mapby('column')|sum + 'top_question'|answer + 'sub_question'|answer",
     )
 
-    with django_assert_num_queries(31):
+    with django_assert_num_queries(34):
         api.save_answer(questions_dict["top_question"], document, value="1")

caluma/caluma_form/utils.py

@@ -1,6 +1,6 @@
 from logging import getLogger
 
-from caluma.caluma_form import models, structure
+from caluma.caluma_form import models, structure, validators
 from caluma.caluma_form.jexl import QuestionJexl
 
 log = getLogger(__name__)
@@ -87,6 +87,6 @@ def recalculate_dependent_fields(
 def update_or_create_calc_answer(question, document, update_dependents=True):
     """Recalculate all answers in the document after calc dependency change."""
 
-    root = structure.FieldSet(document.family)
+    root = validators.DocumentValidator().get_validation_context(document.family)
     for field in root.find_all_fields_by_slug(question.slug):
         recalculate_field(field, update_recursively=update_dependents)

caluma/caluma_form/validators.py

@@ -116,7 +116,7 @@ def _structure_field(self, document, question, validation_context):
 
         # If we need to create the context ourselves here, we'll need to fetch
         # the field from the context.
-        validation_context = structure.FieldSet(document)
+        validation_context = DocumentValidator().get_validation_context(document)
         return validation_context.get_field(question.slug), validation_context
 
     def _evaluate_options_jexl(
@@ -381,7 +381,7 @@ def validate(
                     data_source_context=data_source_context,
                 )
 
-    def get_validation_context(self, document):
+    def get_validation_context(self, document, _fastloader=None):
         relevant_case: Case = (
             getattr(document, "case", None)
             or getattr(getattr(document, "work_item", None), "case", None)
@@ -425,7 +425,11 @@ def get_validation_context(self, document):
             }
         }
 
-        return structure.FieldSet(document, global_context=context)
+        return structure.FieldSet(
+            document,
+            global_context=context,
+            _fastloader=_fastloader,
+        )
 
     def visible_questions(self, document, validation_context=None) -> list[Question]:
         """Evaluate the visibility of the questions for the given context.