Allow unapproved submissions when registering export repeats (#2764)

* allow unapproved submissions when building export columns

unapproved submissions are allowed during exports

* fix wrong task call

Author: kelvin-muchiri

onadata/apps/logger/models/instance.py

@@ -884,9 +884,7 @@ def register_export_repeats(sender, instance, created=False, **kwargs):
     logger_tasks = importlib.import_module("onadata.apps.logger.tasks")
 
     transaction.on_commit(
-        lambda: logger_tasks.register_xform_export_repeats_async.delay(
-            instance.xform.pk
-        )
+        lambda: logger_tasks.register_instance_export_repeats_async.delay(instance.pk)
     )
 
 

onadata/libs/tests/utils/test_logger_tools.py

@@ -27,7 +27,6 @@
     EntityList,
     Instance,
     RegistrationForm,
-    SubmissionReview,
     SurveyType,
     XForm,
 )
@@ -1307,30 +1306,6 @@ def test_no_repeats(self):
 
         self.assertEqual(register.extra_data, {})
 
-    def test_submission_review_enabled(self):
-        """When submission review is enabled, only approved Instance is registered"""
-        self.instance.delete()
-        MetaData.submission_review(self.xform, "true")  # Enable submission review
-        self.instance = Instance.objects.create(
-            xml=self.xml, user=self.user, xform=self.xform
-        )
-        register_instance_export_repeats(self.instance)
-
-        self.register.refresh_from_db()
-
-        self.assertEqual(self.register.extra_data, {})
-
-        # Approve submission
-        SubmissionReview.objects.create(
-            instance=self.instance, status=SubmissionReview.APPROVED
-        )
-
-        register_instance_export_repeats(self.instance)
-
-        self.register.refresh_from_db()
-
-        self.assertEqual(self.register.extra_data.get("hospital_repeat"), 2)
-
 
 class RegisterXFormExportRepeatsTestCase(TestBase):
     """Tests for method `register_xform_export_repeats`"""

onadata/libs/utils/logger_tools.py

@@ -59,7 +59,6 @@
     Attachment,
     Instance,
     RegistrationForm,
-    SubmissionReview,
     XForm,
     XFormVersion,
 )
@@ -1557,9 +1556,6 @@ def _update_export_repeat_register(instance: Instance, metadata: MetaData) -> No
     :param instance: Instance object
     :param metadata: MetaData object that stores the export repeat register
     """
-    if not _is_submission_approved(instance):
-        return
-
     repeat_max = _get_instance_repeat_max(instance)
 
     for repeat, incoming_max in repeat_max.items():
@@ -1592,30 +1588,6 @@ def _update_export_repeat_register(instance: Instance, metadata: MetaData) -> No
             )
 
 
-def _is_submission_approved(instance: Instance) -> bool:
-    """Check if a submission has been approved
-
-    :param instance: Instance object
-    :return: True if submission is approved, False otherwise
-    """
-    content_type = ContentType.objects.get_for_model(instance.xform)
-    is_review_enabled = MetaData.objects.filter(
-        content_type=content_type,
-        object_id=instance.xform.id,
-        data_type="submission_review",
-        data_value="true",
-    ).exists()
-
-    if not is_review_enabled:
-        return True
-
-    is_submission_approved = SubmissionReview.objects.filter(
-        instance_id=instance.id, status=SubmissionReview.APPROVED
-    ).exists()
-
-    return is_submission_approved
-
-
 @transaction.atomic()
 def register_instance_export_repeats(instance: Instance) -> None:
     """Register an Instance's repeats for export