From d84997694ced6d6b2084d09eb2625771ce3ed5d0 Mon Sep 17 00:00:00 2001 From: Kelvin Muchiri Date: Mon, 20 Jan 2025 12:04:19 +0300 Subject: [PATCH 1/2] fix exception Instance.DoesNotExist when registering Instance repeats --- onadata/apps/logger/models/instance.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/onadata/apps/logger/models/instance.py b/onadata/apps/logger/models/instance.py index c1f14d8c66..142f656615 100644 --- a/onadata/apps/logger/models/instance.py +++ b/onadata/apps/logger/models/instance.py @@ -883,7 +883,11 @@ def register_export_repeats(sender, instance, created=False, **kwargs): # Avoid cyclic dependency errors logger_tasks = importlib.import_module("onadata.apps.logger.tasks") - logger_tasks.register_instance_export_repeats_async.delay(instance.pk) + transaction.on_commit( + lambda: logger_tasks.register_xform_export_repeats_async.delay( + instance.xform.pk + ) + ) post_save.connect( From 87157897e369bfbc5f32b2e0d2b6e856b2ee928a Mon Sep 17 00:00:00 2001 From: Kelvin Muchiri Date: Mon, 20 Jan 2025 13:36:58 +0300 Subject: [PATCH 2/2] enhance test --- onadata/libs/tests/utils/test_csv_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onadata/libs/tests/utils/test_csv_builder.py b/onadata/libs/tests/utils/test_csv_builder.py index 7566b5afca..abd1cb5b00 100644 --- a/onadata/libs/tests/utils/test_csv_builder.py +++ b/onadata/libs/tests/utils/test_csv_builder.py @@ -161,7 +161,7 @@ def test_csv_dataframe_export_to(self, mock_register_repeats): self._test_csv_files(csv_file, csv_fixture_path) os.unlink(temp_file.name) # Repeat register is created for future use - mock_register_repeats.assert_called_once_with(self.xform.id) + mock_register_repeats.assert_called() # pylint: disable=invalid-name def test_csv_columns_for_gps_within_groups(self):