Merge pull request #69 from openimis/develop

MERGING develop into release/24.10

Author: dragos-dobre

payroll/apps.py

@@ -41,7 +41,6 @@
     "csv_reconciliation_paid_no": "No",
     "payroll_delete_event": "payroll.payroll_delete",
     "benefit_delete_event": "payroll.benefit_delete",
-    "opensearch_synch": False,
 
     "gateway_base_url": "http://41.175.18.170:8070/api/mobile/v1/",
     "endpoint_payment": "mock/payment",
@@ -82,7 +81,6 @@ class PayrollConfig(AppConfig):
     csv_reconciliation_paid_no = None
     payroll_delete_event = None
     benefit_delete_event = None
-    opensearch_synch = None
 
     gateway_base_url = None
     endpoint_payment = None

payroll/documents.py

@@ -1,10 +1,12 @@
 from django.apps import apps
+from django.conf import settings
 
-from payroll.apps import PayrollConfig
+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 PayrollConfig.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 payroll.models import (
         Payroll,
@@ -18,7 +20,9 @@
     from invoice.models import Bill
 
     @registry.register_document
-    class PayrollDocument(Document):
+    class PayrollDocument(BaseSyncDocument):
+        DASHBOARD_NAME = 'Payment'
+
         name = opensearch_fields.KeywordField()
         status = opensearch_fields.KeywordField()
         payment_method = opensearch_fields.KeywordField()
@@ -52,13 +56,15 @@ class Django:
 
         def get_instances_from_related(self, related_instance):
             if isinstance(related_instance, PaymentPlan):
-                return related_instance.payroll_set.all()
+                return Payroll.objects.filter(payment_plan=related_instance)
             elif isinstance(related_instance, PaymentCycle):
-                return related_instance.payroll_set.all()
+                return Payroll.objects.filter(payment_cycle=related_instance)
 
 
     @registry.register_document
-    class BenefitConsumptionDocument(Document):
+    class BenefitConsumptionDocument(BaseSyncDocument):
+        DASHBOARD_NAME = 'Payment'
+
         photo = opensearch_fields.KeywordField()
         code = opensearch_fields.KeywordField()
         date_due = opensearch_fields.DateField()
@@ -92,11 +98,13 @@ class Django:
 
         def get_instances_from_related(self, related_instance):
             if isinstance(related_instance, Individual):
-                return related_instance.benefit_consumption_set.all()
+                return BenefitConsumption.objects.filter(individual=related_instance)
 
 
     @registry.register_document
-    class PayrollBenefitConsumptionDocument(Document):
+    class PayrollBenefitConsumptionDocument(BaseSyncDocument):
+        DASHBOARD_NAME = 'Payment'
+
         payroll = opensearch_fields.ObjectField(properties={
             'name': opensearch_fields.KeywordField(),
             'status': opensearch_fields.KeywordField(),
@@ -152,7 +160,9 @@ def get_instances_from_related(self, related_instance):
 
 
     @registry.register_document
-    class BenefitAttachmentDocument(Document):
+    class BenefitAttachmentDocument(BaseSyncDocument):
+        DASHBOARD_NAME = 'Invoice'
+
         bill = opensearch_fields.ObjectField(properties={
             'code': opensearch_fields.KeywordField(),
             'code_ext': opensearch_fields.KeywordField(),