Merge pull request #49 from openimis/develop

MERGING develop into release/24.04

Author: delcroip

payroll/schema.py

@@ -93,12 +93,16 @@ class Query(graphene.ObjectType):
         dateValidTo__Lte=graphene.DateTime(),
         client_mutation_id=graphene.String(),
         benefitPlanName=graphene.String(),
+        benefitPlanUuid=graphene.String(),
+        paymentCycleUuid=graphene.String(),
     )
 
     benefits_summary = graphene.Field(
         BenefitsSummaryGQLType,
         individualId=graphene.String(),
-        payrollId=graphene.String()
+        payrollId=graphene.String(),
+        benefitPlanUuid=graphene.String(),
+        paymentCycleUuid=graphene.String(),
     )
 
     def resolve_bill_by_payroll(self, info, **kwargs):
@@ -189,6 +193,14 @@ def resolve_payroll_benefit_consumption(self, info, **kwargs):
             benefit_plan_ids = list(BenefitPlan.objects.filter(name__icontains=benefit_plan_name).values_list('id', flat=True))
             filters.append(Q(payroll__payment_plan__benefit_plan_id__in=benefit_plan_ids))
 
+        benefit_plan_uuid = kwargs.get("benefitPlanUuid")
+        if benefit_plan_uuid:
+            filters.append(Q(payroll__payment_plan__benefit_plan_id=benefit_plan_uuid))
+
+        payment_cycle_uuid = kwargs.get("paymentCycleUuid")
+        if payment_cycle_uuid:
+            filters.append(Q(payroll__payment_cycle_id=payment_cycle_uuid))
+
         query = PayrollBenefitConsumption.objects.filter(*filters)
         return gql_optimizer.query(query, info)
 
@@ -225,13 +237,21 @@ def resolve_benefits_summary(self, info, **kwargs):
         filters = append_validity_filter(**kwargs)
         individual_id = kwargs.get("individualId", None)
         payroll_id = kwargs.get("payrollId", None)
+        benefit_plan_uuid = kwargs.get("benefitPlanUuid", None)
+        payment_cycle_uuid = kwargs.get("paymentCycleUuid", None)
 
         if individual_id:
             filters.append(Q(individual__id=individual_id))
 
         if payroll_id:
             filters.append(Q(payrollbenefitconsumption__payroll_id=payroll_id))
 
+        if benefit_plan_uuid:
+            filters.append(Q(payrollbenefitconsumption__payroll__payment_plan__benefit_plan_id=benefit_plan_uuid))
+
+        if payment_cycle_uuid:
+            filters.append(Q(payrollbenefitconsumption__payroll__payment_cycle_id=payment_cycle_uuid))
+
         amount_received = BenefitConsumption.objects.filter(
             *filters,
             is_deleted=False,

payroll/services.py

@@ -13,6 +13,7 @@
 from core.signals import register_service_signal
 from invoice.models import Bill, PaymentInvoice, DetailPaymentInvoice
 from invoice.services import PaymentInvoiceService
+from payment_cycle.models import PaymentCycle
 from payroll.apps import PayrollConfig
 from payroll.models import (
     PaymentPoint,
@@ -69,6 +70,7 @@ def create(self, obj_data):
                 obj_data = self._adjust_create_payload(obj_data)
                 from_failed_invoices_payroll_id = obj_data.pop("from_failed_invoices_payroll_id", None)
                 payment_plan = self._get_payment_plan(obj_data)
+                payment_cycle = self._get_payment_cycle(obj_data)
                 date_valid_from, date_valid_to = self._get_dates_parameter(obj_data)
                 payroll, dict_representation = self._save_payroll(obj_data)
                 if not bool(from_failed_invoices_payroll_id):
@@ -78,7 +80,8 @@ def create(self, obj_data):
                         beneficiaries_queryset,
                         date_valid_from,
                         date_valid_to,
-                        payroll
+                        payroll,
+                        payment_cycle
                     )
                 else:
                     self._move_benefit_consumptions(payroll, from_failed_invoices_payroll_id)
@@ -162,6 +165,11 @@ def _get_payment_plan(self, obj_data):
         payment_plan = PaymentPlan.objects.get(id=payment_plan_id)
         return payment_plan
 
+    def _get_payment_cycle(self, obj_data):
+        payment_cycle_id = obj_data.get("payment_cycle_id")
+        payment_cycle = PaymentCycle.objects.get(id=payment_cycle_id)
+        return payment_cycle
+
     def _get_dates_parameter(self, obj_data):
         date_valid_from = obj_data.get('date_valid_from', None)
         date_valid_to = obj_data.get('date_valid_to', None)
@@ -188,14 +196,15 @@ def _select_beneficiary_based_on_criteria(self, obj_data, payment_plan):
 
         return beneficiaries_queryset
 
-    def _generate_benefits(self, payment_plan, beneficiaries_queryset, date_from, date_to, payroll):
+    def _generate_benefits(self, payment_plan, beneficiaries_queryset, date_from, date_to, payroll, payment_cycle):
         calculation = get_calculation_object(payment_plan.calculation)
         calculation.calculate_if_active_for_object(
             payment_plan,
             user_id=self.user.id,
             start_date=date_from, end_date=date_to,
             beneficiaries_queryset=beneficiaries_queryset,
-            payroll=payroll
+            payroll=payroll,
+            payment_cycle=payment_cycle
         )
 
     @transaction.atomic

setup.py

@@ -26,7 +26,8 @@
         'djangorestframework',
         'openimis-be-core',
         'openimis-be-location',
-        'openimis-be-invoice'
+        'openimis-be-invoice',
+        'openimis-be-payment_cycle',
     ],
     classifiers=[
         'Environment :: Web Environment',