Merge pull request #94 from openimis/feature/CM-1000

CM-1000: added changes with synch enabled/disabled - opensearch

social_protection/apps.py

@@ -50,7 +50,6 @@
     ],
     "social_protection_masking_enabled": True,
     "enable_python_workflows": True,
-    "opensearch_synch": False,
 }
 
 
@@ -91,7 +90,6 @@ class SocialProtectionConfig(AppConfig):
 
     enable_python_workflows = None
     enable_maker_checker_logic_enrollment = None
-    opensearch_synch = None
     beneficiary_mask_fields = None
     group_beneficiary_mask_fields = None
     social_protection_masking_enabled = None

social_protection/documents.py

@@ -1,16 +1,20 @@
 from django.apps import apps
+from django.conf import settings
 
-from social_protection.apps import SocialProtectionConfig
+is_unit_test_env = getattr(settings, 'IS_UNIT_TEST_ENV', False)
 
 # Check if the 'opensearch_reports' app is in INSTALLED_APPS
-if 'opensearch_reports' in apps.app_configs and SocialProtectionConfig.opensearch_synch:
-    from django_opensearch_dsl import Document, fields as opensearch_fields
+if 'opensearch_reports' in apps.app_configs and not is_unit_test_env:
+    from opensearch_reports.service import BaseSyncDocument
+    from django_opensearch_dsl import fields as opensearch_fields
     from django_opensearch_dsl.registries import registry
     from social_protection.models import Beneficiary, BenefitPlan
     from individual.models import Individual
 
     @registry.register_document
-    class BeneficiaryDocument(Document):
+    class BeneficiaryDocument(BaseSyncDocument):
+        DASHBOARD_NAME = 'Beneficiary'
+
         benefit_plan = opensearch_fields.ObjectField(properties={
             'code': opensearch_fields.KeywordField(),
             'name': opensearch_fields.KeywordField(),