OP-2331: added workflow for adding group into programme

social_protection/apps.py

@@ -30,6 +30,7 @@
     "enable_maker_checker_for_beneficiary_update": True,
     "validation_import_valid_items": "validation.import_valid_items",
     "validation_import_valid_items": "validation.import_valid_items",
+    "validation_import_group_valid_items": "validation.import_group_valid_items",
     "validation_upload_valid_items": "validation.upload_valid_items",
     "validation_download_invalid_items": "validation.download_invalid_items",
     "benefit_plan_suspend": "benefit_plan.benefit_plan_suspend",
@@ -40,6 +41,7 @@
     "validation_group_enrollment": "validation-group-enrollment",
 
     "enable_maker_checker_logic_enrollment": True,
+    "enable_maker_checker_for_group_upload": True,
     "beneficiary_mask_fields": [
         'json_ext.beneficiary_data_source',
         'json_ext.educated_level'
@@ -87,13 +89,15 @@ class SocialProtectionConfig(AppConfig):
     validation_upload_valid_items_workflow = None
     validation_enrollment = None
     validation_group_enrollment = None
+    validation_import_group_valid_items = None
     benefit_plan_suspend = None
 
     enable_maker_checker_for_beneficiary_upload = None
     enable_maker_checker_for_beneficiary_update = None
 
     enable_python_workflows = None
     enable_maker_checker_logic_enrollment = None
+    enable_maker_checker_for_group_upload = None
     beneficiary_mask_fields = None
     group_beneficiary_mask_fields = None
     beneficiary_base_fields = None

social_protection/services.py

@@ -244,17 +244,16 @@ def validate_import_beneficiaries(self, upload_id: uuid, individual_sources, ben
         return {'success': True, 'data': validated_dataframe, 'summary_invalid_items': invalid_items}
 
     def create_task_with_importing_valid_items(self, upload_id: uuid, benefit_plan: BenefitPlan):
-        BeneficiaryTaskCreatorService(self.user)\
-            .create_task_with_importing_valid_items(upload_id, benefit_plan)
-
-        record = BenefitPlanDataUploadRecords.objects.get(
-            data_upload_id=upload_id,
-            benefit_plan=benefit_plan,
-            is_deleted=False
-        )
-        if not SocialProtectionConfig.enable_maker_checker_for_beneficiary_upload:
-            from social_protection.signals.on_validation_import_valid_items import ItemsUploadTaskCompletionEvent
-            ItemsUploadTaskCompletionEvent(
+        if SocialProtectionConfig.enable_maker_checker_for_beneficiary_upload:
+            BeneficiaryTaskCreatorService(self.user) \
+                .create_task_with_importing_valid_items(upload_id, benefit_plan)
+        else:
+            record = BenefitPlanDataUploadRecords.objects.get(
+                data_upload_id=upload_id,
+                is_deleted=False
+            )
+            from social_protection.signals.on_validation_import_valid_items import IndividualItemsImportTaskCompletionEvent
+            IndividualItemsImportTaskCompletionEvent(
                 SocialProtectionConfig.validation_import_valid_items_workflow,
                 record,
                 record.data_upload.id,
@@ -263,18 +262,19 @@ def create_task_with_importing_valid_items(self, upload_id: uuid, benefit_plan:
             ).run_workflow()
 
     def create_task_with_update_valid_items(self, upload_id: uuid, benefit_plan: BenefitPlan):
-        BeneficiaryTaskCreatorService(self.user)\
-            .create_task_with_update_valid_items(upload_id, benefit_plan)
+        if SocialProtectionConfig.enable_maker_checker_for_beneficiary_update:
+            BeneficiaryTaskCreatorService(self.user)\
+                .create_task_with_update_valid_items(upload_id, benefit_plan)
 
-        record = BenefitPlanDataUploadRecords.objects.get(
-            data_upload_id=upload_id,
-            benefit_plan=benefit_plan,
-            is_deleted=False
-        )
         # Resolve automatically if maker-checker not enabled
         if not SocialProtectionConfig.enable_maker_checker_for_beneficiary_update:
-            from social_protection.signals.on_validation_import_valid_items import ItemsUploadTaskCompletionEvent
-            ItemsUploadTaskCompletionEvent(
+            from social_protection.signals.on_validation_import_valid_items import IndividualItemsUploadTaskCompletionEvent
+            record = BenefitPlanDataUploadRecords.objects.get(
+                data_upload_id=upload_id,
+                benefit_plan=benefit_plan,
+                is_deleted=False
+            )
+            IndividualItemsUploadTaskCompletionEvent(
                 SocialProtectionConfig.validation_upload_valid_items_workflow,
                 record,
                 record.data_upload.id,