MERGING RELEASE branches (#17)

* CM-315: adjusted flow to have rejected bills in adaptor

* CM-315: rejected bills empty

* CM-315: added check for rejected bills

* CM-315: added check for rejected bills

* CM-315: extended reconciliation process

* CM-315: fixed payroll date

* CM-315: fixed payed status

* CM-315: added print statements

* CM-315: fixed getting attached bills in payroll

* CM-315: fixed code receipt

* CM-315: fixed payment origin

* CM-315: fixed replace object function

* CM-315: fixed content type in payment invoice creation

* CM-315: fixed content type import

* CM-315: added adjustments to process payments

* CM-315: moved some part of code to separate methods

* CM-315: fixed test sample for bill

* CM-315: added to json_ext bill unpaid flag for unpaid bill coming to cycle

* CM-316: added condition to processs unpaid payroll too

* CI update

* CI Update 2

* CM-315: changes after review

* Added CI server deloy workflow (#13)

* CM-316: added tests to check json field filtering in queryset

* hotfix: added json_ext check if None

* CM-342: filter only not assigned bills (#15)

* CM-342: filter only not assigned bills

* CM-342: provide more strict filtering

* CM-342: add translations

---------

Co-authored-by: Jan <[email protected]>

* CM-336: remove field payment poin as mandatory in payroll (#16)

Co-authored-by: Jan <[email protected]>

---------

Co-authored-by: sniedzielski <[email protected]>
Co-authored-by: Damian Borowiecki <[email protected]>
Co-authored-by: Jan <[email protected]>
Co-authored-by: Damian Borowiecki <[email protected]>
Co-authored-by: Jan <[email protected]>

Author: 6 people

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: Module CI
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  push:
+    branches:
+      - main
+      - 'release/**'
+      - develop
+      - 'feature/**'
+  workflow_dispatch:
+    inputs:
+      comment:
+        description: Just a simple comment to know the purpose of the manual build
+        required: false
+
+jobs:
+  call:
+    name: Default CI Flow
+    uses: openimis/openimis-be_py/.github/workflows/ci_module.yml@develop
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    with:
+      SONAR_PROJECT_KEY: openimis_openimis-be-payroll_py
+      SONAR_ORGANIZATION: openimis-1
+      SONAR_PROJECT_NAME: openimis-be-payroll_py
+      SONAR_PROJECT_VERSION: 1.0
+      SONAR_SOURCES: payroll
+      SONAR_EXCLUSIONS: "**/migrations/**,**/static/**,**/media/**,**/tests/**"
+

.github/workflows/core-mis-test-server-deploy.yml

@@ -0,0 +1,32 @@
+name: CoreMIS Server Deployment
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  rebuild-test-server:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.CORE_MIS_DEPLOYMENT_SSH_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -H ${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} >> ~/.ssh/known_hosts
+        env:
+          CORE_MIS_DEPLOYMENT_SSH_KEY: ${{ secrets.CORE_MIS_DEPLOYMENT_SSH_KEY }}
+          CORE_MIS_DEPLOYMENT_USER: ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}
+          CORE_MIS_DEPLOYMENT_HOST: ${{ secrets.CORE_MIS_DEPLOYMENT_HOST }}
+
+      - name: Run Docker Compose
+        run: |
+          ssh -o StrictHostKeyChecking=no -T ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}@${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} -p 1022
+          ssh ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}@${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} -p 1022 << EOF
+            cd coreMIS/
+            docker-compose build backend gateway && docker-compose up -d
+          EOF
+          

.github/workflows/openmis-module-test-mssql.yml

@@ -0,0 +1,11 @@
+msgid "payroll.validation.payroll.bill_already_assigned"
+msgstr "Bills %(bill_ids) already assigned to payroll."
+
+msgid "payroll.validation.payroll.no_bills_for_filter_criteria"
+msgstr "Bills not found for given search criteria."
+
+msgid "payroll.validation.payroll.name_exists"
+msgstr "Name %(name) already exists."
+
+msgid "payroll.validation.field_empty"
+msgstr "Field %(field) can not be empty."

.github/workflows/openmis-module-test-psql.yml

@@ -35,9 +35,10 @@ class PayrollStatusEnum(graphene.Enum):
 
     name = graphene.String(required=True, max_length=255)
     benefit_plan_id = graphene.UUID(required=True)
-    payment_point_id = graphene.UUID(required=True)
+    payment_point_id = graphene.UUID(required=False)
     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)

locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.21 on 2023-10-06 07:55
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('payroll', '0008_historicalpaymentadaptorhistory_paymentadaptorhistory'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='payroll',
+            name='payment_point',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='payroll.paymentpoint'),
+        ),
+    ]

payroll/gql_mutations.py

@@ -23,7 +23,7 @@ class PaymentPoint(HistoryModel):
 class Payroll(HistoryBusinessModel):
     name = models.CharField(max_length=255, blank=False, null=False)
     benefit_plan = models.ForeignKey(BenefitPlan, on_delete=models.DO_NOTHING)
-    payment_point = models.ForeignKey(PaymentPoint, on_delete=models.DO_NOTHING)
+    payment_point = models.ForeignKey(PaymentPoint, on_delete=models.DO_NOTHING, null=True)
     status = models.CharField(
         max_length=100, choices=PayrollStatus.choices, default=PayrollStatus.CREATED, null=False
     )

payroll/migrations/0009_auto_20231006_0755.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")
@@ -125,7 +127,20 @@ def _get_bills_queryset(self, obj_data):
             is_deleted=False,
             date_bill__range=(date_from, date_to),
             subject_type=ContentType.objects.get_for_model(Beneficiary),
-            subject_id__in=beneficiary_ids
+            subject_id__in=beneficiary_ids,
+            status__in=[Bill.Status.VALIDATED],
         )
 
+        bills_queryset = bills_queryset.filter(
+            Q(payrollbill__isnull=True) | Q(payrollbill__is_deleted=True)
+        )
+
+        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/models.py

@@ -8,7 +8,7 @@ def accept_payroll(cls, payroll, user, **kwargs):
         pass
 
     @classmethod
-    def acknowledge_of_reponse_view(cls, payroll, response_from_gateway, user):
+    def acknowledge_of_reponse_view(cls, payroll, response_from_gateway, user, rejected_bills):
         pass
 
     @classmethod