diff --git a/src/openforms/formio/formatters/tests/test_kitchensink.py b/src/openforms/formio/formatters/tests/test_kitchensink.py index 56a2d9df00..82029675b1 100644 --- a/src/openforms/formio/formatters/tests/test_kitchensink.py +++ b/src/openforms/formio/formatters/tests/test_kitchensink.py @@ -17,7 +17,7 @@ def _get_printable_data(submission: Submission) -> list[tuple[str, Any]]: printable_data: list[tuple[str, Any]] = [] - merged_data = submission.get_merged_data() + merged_data = submission.data for component in filter_printable(submission.form.iter_components(recursive=True)): key = component["key"] diff --git a/src/openforms/registrations/contrib/camunda/plugin.py b/src/openforms/registrations/contrib/camunda/plugin.py index 415a9a3608..85b64dbf4c 100644 --- a/src/openforms/registrations/contrib/camunda/plugin.py +++ b/src/openforms/registrations/contrib/camunda/plugin.py @@ -48,7 +48,7 @@ def get_process_variables( ] ) - merged_data: dict[str, Any] = submission.get_merged_data() + merged_data = submission.data for component in submission.form.iter_components(recursive=True): if (key := component.get("key")) not in simple_mappings: continue diff --git a/src/openforms/registrations/contrib/microsoft_graph/plugin.py b/src/openforms/registrations/contrib/microsoft_graph/plugin.py index a2d4bec28c..48260e326a 100644 --- a/src/openforms/registrations/contrib/microsoft_graph/plugin.py +++ b/src/openforms/registrations/contrib/microsoft_graph/plugin.py @@ -64,7 +64,7 @@ def register_submission(self, submission: Submission, options: dict) -> None: submission_report.content, folder_name / "report.pdf" ) - data = submission.get_merged_data() + data = submission.data data["__metadata__"] = {"submission_language": submission.language_code} uploader.upload_json(data, folder_name / "data.json") diff --git a/src/openforms/submissions/mapping.py b/src/openforms/submissions/mapping.py index 7d610b8eaf..900ddcdfed 100644 --- a/src/openforms/submissions/mapping.py +++ b/src/openforms/submissions/mapping.py @@ -97,7 +97,7 @@ def apply_data_mapping( attr_key_lookup[attribute] = key # grab submitted data - data = submission.get_merged_data() + data = submission.data for target_path, conf in mapping_config.items(): if isinstance(conf, str): @@ -137,7 +137,7 @@ def get_unmapped_data( """ companion to apply_data_mapping() returns data not mapped to RegistrationAttributes """ - data = submission.get_merged_data() + data = submission.data attr_key_lookup = dict() diff --git a/src/openforms/submissions/models/submission.py b/src/openforms/submissions/models/submission.py index 76e4b5bea0..83a21b6c28 100644 --- a/src/openforms/submissions/models/submission.py +++ b/src/openforms/submissions/models/submission.py @@ -614,7 +614,7 @@ def get_merged_appointment_data(self) -> dict[str, dict[str, str | dict]]: "appointments.phoneNumber": "clientPhoneNumber", } - merged_data = self.get_merged_data() + merged_data = self.data appointment_data = {} for component in self.form.iter_components(recursive=True): diff --git a/src/openforms/submissions/tests/form_logic/test_submission_logic.py b/src/openforms/submissions/tests/form_logic/test_submission_logic.py index 39c5b0f402..567630e5db 100644 --- a/src/openforms/submissions/tests/form_logic/test_submission_logic.py +++ b/src/openforms/submissions/tests/form_logic/test_submission_logic.py @@ -424,9 +424,7 @@ def test_response_contains_submission(self): self._add_submission_to_session(submission) with freeze_time("2015-10-10"): - response = self.client.post( - endpoint, {"data": submission.get_merged_data()} - ) + response = self.client.post(endpoint, {"data": submission.data}) submission_details = response.json() diff --git a/src/openforms/submissions/tests/test_factories.py b/src/openforms/submissions/tests/test_factories.py index 417b774662..64d39fef33 100644 --- a/src/openforms/submissions/tests/test_factories.py +++ b/src/openforms/submissions/tests/test_factories.py @@ -63,7 +63,7 @@ def test_from_components__with_data(self): }, ) - actual = submission.get_merged_data() + actual = submission.data expected = {"foo": 1, "bar": 2} self.assertEqual(actual, expected) @@ -94,7 +94,7 @@ def test_from_data__simple(self): } ) - actual = submission.get_merged_data() + actual = submission.data expected = { "foo": 1, "bar": 2, @@ -111,7 +111,7 @@ def test_from_data__kwargs(self): kvk="111222333", ) - actual = submission.get_merged_data() + actual = submission.data expected = { "foo": 1, "bar": 2,