Merge pull request #10 from openimis/feature/CM-316

CM-316: added condition to processs unpaid payroll too

Author: dborowiecki

payroll/gql_mutations.py

@@ -38,6 +38,7 @@ class PayrollStatusEnum(graphene.Enum):
     payment_point_id = graphene.UUID(required=True)
     status = graphene.Field(PayrollStatusEnum, required=True)
     payment_method = graphene.String(required=True, max_length=255)
+    included_unpaid = graphene.Boolean(required=True)
 
     date_valid_from = graphene.Date(required=False)
     date_valid_to = graphene.Date(required=False)

payroll/services.py

@@ -1,6 +1,7 @@
 import logging
 
 from django.db import transaction
+from django.db.models import Q
 from django.contrib.contenttypes.models import ContentType
 
 from core.custom_filters import CustomFilterWizardStorage
@@ -49,8 +50,9 @@ def __init__(self, user, validation_class=PayrollValidation):
     def create(self, obj_data):
         try:
             with transaction.atomic():
+                included_unpaid = obj_data.pop("included_unpaid", False)
                 obj_data = self._adjust_create_payload(obj_data)
-                bills_queryset = self._get_bills_queryset(obj_data)
+                bills_queryset = self._get_bills_queryset(obj_data, included_unpaid)
                 obj_data_and_bills = {**obj_data, "bills": bills_queryset}
                 self.validation_class.validate_create(self.user, **obj_data_and_bills)
                 obj_ = self.OBJECT_TYPE(**obj_data)
@@ -96,7 +98,7 @@ def _create_payroll_bills(self, bills_queryset, payroll_id):
             payroll_bill = PayrollBill(bill_id=bill.id, payroll_id=payroll_id)
             payroll_bill.save(username=self.user.username)
 
-    def _get_bills_queryset(self, obj_data):
+    def _get_bills_queryset(self, obj_data, included_unpaid):
         benefit_plan_id = obj_data.get("benefit_plan_id")
         date_from = obj_data.get("date_valid_from")
         date_to = obj_data.get("date_valid_to")
@@ -129,4 +131,12 @@ def _get_bills_queryset(self, obj_data):
             status__in=[Bill.Status.VALIDATED]
         )
 
+        if included_unpaid:
+            bills_queryset = bills_queryset.filter(json_ext__unpaid=True)
+        else:
+            bills_queryset = bills_queryset.filter(
+                Q(json_ext__unpaid=False) |
+                Q(json_ext__unpaid__isnull=True)
+            )
+
         return bills_queryset

payroll/tests/payroll_gql_tests.py

@@ -5,6 +5,7 @@
 from graphene.test import Client
 from django.test import TestCase
 from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
 
 from individual.models import Individual
 from individual.tests.data import service_add_individual_payload
@@ -213,6 +214,26 @@ def test_delete_unauthorized(self):
         payroll_bill.delete(username=self.user.username)
         self.assertTrue(PayrollBill.objects.filter(payroll=payroll, bill=self.bill, is_deleted=True))
 
+    def test_check_bill_included_unpaid(self):
+        self.bill.json_ext = {"unpaid": True}
+        self.bill.save(username=self.user.username)
+        bills_queryset_not_paid = Bill.objects.filter(json_ext__unpaid=True)
+        bills_queryset = Bill.objects.filter(
+            Q(json_ext__unpaid=False) |
+            Q(json_ext__unpaid__isnull=True)
+        )
+        self.assertGreaterEqual(bills_queryset_not_paid.count(), 1)
+        self.assertEqual(bills_queryset.count(), 0)
+
+    def test_check_bill_not_included_unpaid(self):
+        bills_queryset_not_paid = Bill.objects.filter(json_ext__unpaid=True)
+        bills_queryset = Bill.objects.filter(
+            Q(json_ext__unpaid=False) |
+            Q(json_ext__unpaid__isnull=True)
+        )
+        self.assertEqual(bills_queryset_not_paid.count(), 0)
+        self.assertGreaterEqual(bills_queryset.count(), 1)
+
     @classmethod
     def __create_benefit_plan(cls):
         object_data = {