Fix contract + test insureepolicy + flake

README.md

@@ -8,12 +8,12 @@ It is dedicated to be deployed as a module of [openimis-be_py](https://github.co
 * tblContractContributionPlanDetails > ContractContributionPlanDetails
 
 ## Listened Django Signals
-- post_save - Payment: handles service activate_contracted_policies - only when payment 
+- post_save - Payment: handles service activate_contracted_policies - only when payment
 is related to the contract/contracts. (it is verified by this post save)
 Another payments are omitted in processing.
 
 ## GraphQl Queries
-* contract 
+* contract
 * contractDetails
 * contractContributionPlanDetails
 
@@ -35,7 +35,7 @@ Another payments are omitted in processing.
 ## Additional mutation log helper in Create graphQl mutations - ObjectMutation from core
 - "ObjectMutation" from openimis-be-core_py - models.py
 - "object_mutated" method allows the creation of an object to update the xxxMutation easily.
-- dedicated for createContract and createContractDetails graphQl mutations 
+- dedicated for createContract and createContractDetails graphQl mutations
 - more info about it and how it was implemented here in Contract module in models.py in class ObjectMutation in docs string
 
 ## Services
@@ -48,10 +48,10 @@ Another payments are omitted in processing.
   - renew
   - delete
   - get_negative_amount_amendment
-  - terminate_contract 
+  - terminate_contract
 - ContractDetails
-  - update_from_ph_insuree
-  - ph_insuree_to_contract_details  
+  - get_details_from_ph_insuree
+  - ph_insuree_to_contract_details
 - ContractContributionPlanDetails - CRUD services, replace
   - create_ccpd (ccpd - acronym of contract contribution plan details)
   - contract_valuation
@@ -90,8 +90,8 @@ Another payments are omitted in processing.
 
 
 ## bulk operations - required configuration
-- for 'bulk approve contract' and 'bulk counter contract' graphQL mutations 
+- for 'bulk approve contract' and 'bulk counter contract' graphQL mutations
 - running rabbitmq docker image
-- running celery within "{imis_directory}/openimis-be_py/venv/bin/celery": 
+- running celery within "{imis_directory}/openimis-be_py/venv/bin/celery":
 `-A openIMIS worker --loglevel=DEBUG --without-gossip --without-mingle --without-heartbeat -Ofair`
-- without this required steps you won't be able to bulk counter/approve contract 
+- without this required steps you won't be able to bulk counter/approve contract

contract/__init__.py

@@ -1,2 +1 @@
-
-default_app_config = 'contract.apps.ContractConfig'
+default_app_config = "contract.apps.ContractConfig"

contract/admin.py

@@ -1,3 +1,2 @@
-from django.contrib import admin
-
+# from django.contrib import admin
 # Register your models here.

contract/apps.py

@@ -1,6 +1,5 @@
 from django.apps import AppConfig
 
-
 MODULE_NAME = "contract"
 
 
@@ -59,6 +58,6 @@ def __load_config(self, cfg):
 
     def ready(self):
         from core.models import ModuleConfiguration
+
         cfg = ModuleConfiguration.get_or_default(MODULE_NAME, DEFAULT_CFG)
         self.__load_config(cfg)
-        import contract.signals

contract/config.py

@@ -2,147 +2,68 @@
     "ContractState": [
         {
             "value": "1",
-            "label":
-                {
-                    "fr": "Demande d'information",
-                    "en": "Request for information"
-                }
+            "label": {"fr": "Demande d'information", "en": "Request for information"},
         },
-        {
-            "value": "2",
-            "label":
-                {
-                    "fr": "Brouillon",
-                    "en": "Draft"
-                }
-        },
-        {
-            "value": "3",
-            "label":
-                {
-                    "fr": "Offre",
-                    "en": "offer"
-                }
-        },
-        {
-            "value": "4",
-            "label":
-                {
-                    "fr": "En negociation",
-                    "en": "Negotiable"
-
-                }
-        },
-        {
-            "value": "5",
-            "label":
-                {
-                    "fr": "Apprové",
-                    "en": "executable"
-
-                }
-        },
-        {
-            "value": "6",
-            "label":
-                {
-                    "fr": "addendum",
-                    "en": "addendum"
-                }
-        },
-        {
-            "value": "7",
-            "label":
-                {
-                    "fr": "En cours",
-                    "en": "effective"
-                }
-        },
-        {
-            "value": "8",
-            "label":
-                {
-                    "fr": "Appliqué",
-                    "en": "executed"
-
-                }
-        },
-        {
-            "value": "9",
-            "label":
-                {
-                    "fr": "Suspendu",
-                    "en": "Disputed"
-                }
-        },
-        {
-            "value": "10",
-            "label":
-                {
-                    "fr": "Terminé",
-                    "en": "terminated"
-                }
-        },
-        {
-            "value": "11",
-            "label":
-                {
-                    "fr": "révision demandé",
-                    "en": "counter"
-                }
-        }]
+        {"value": "2", "label": {"fr": "Brouillon", "en": "Draft"}},
+        {"value": "3", "label": {"fr": "Offre", "en": "offer"}},
+        {"value": "4", "label": {"fr": "En negociation", "en": "Negotiable"}},
+        {"value": "5", "label": {"fr": "Apprové", "en": "executable"}},
+        {"value": "6", "label": {"fr": "addendum", "en": "addendum"}},
+        {"value": "7", "label": {"fr": "En cours", "en": "effective"}},
+        {"value": "8", "label": {"fr": "Appliqué", "en": "executed"}},
+        {"value": "9", "label": {"fr": "Suspendu", "en": "Disputed"}},
+        {"value": "10", "label": {"fr": "Terminé", "en": "terminated"}},
+        {"value": "11", "label": {"fr": "révision demandé", "en": "counter"}},
+    ]
 }
 
 
-def get_message_approved_contract(code, name, contact_name, due_amount, payment_reference, language='en'):
+def get_message_approved_contract(
+    code, name, contact_name, due_amount, payment_reference, language="en"
+):
     message_payment_notification = {
-        "payment_notification":
-            {"en":
-                 F"""
-                 Dear {contact_name} 
-                 
+        "payment_notification": {
+            "en": f"""
+                 Dear {contact_name}
+
                  The contract {code} - {name} was approved.
-                 Please proceed to the payment of {due_amount} with the reference {payment_reference}. 
-                 
-                 Best regards, 
-                 """
-                ,
-             "fr":
-                 F"""
+                 Please proceed to the payment of {due_amount} with the reference {payment_reference}.
+
+                 Best regards,
+                 """,
+            "fr": f"""
                  Monsieur, Madame {contact_name}
-                 
+
                  le contract {code} - {name} à été apprové.
                  Veuillez faire un paiement de < CONTRACT - DUEAMOUNT > avec la référence {payment_reference}.
-                 
-                 Meilleurs Salutations 
-                 """
-             }
+
+                 Meilleurs Salutations
+                 """,
+        }
     }
     return message_payment_notification["payment_notification"][language]
 
 
-def get_message_counter_contract(code, name, contact_name, language='en'):
+def get_message_counter_contract(code, name, contact_name, language="en"):
     message_payment_notification = {
-        "payment_notification":
-            {"en":
-                 F"""
-                 Dear {contact_name} 
+        "payment_notification": {
+            "en": f"""
+                 Dear {contact_name}
 
                  The contract {code} - {name} was counter.
-                 Please proceed recheck the information and correct the issues, in case of questions please check contact us. 
+                 Please proceed recheck the information and correct the issues,
+                 in case of questions please check contact us.
 
-                 Best regards, 
-                 """
-                ,
-             "fr":
-                 F"""
+                 Best regards,
+                 """,
+            "fr": f"""
                  Monsieur, Madame {contact_name}
 
                  le contract {code} - {name} à été contré.
                  Veuillez verifier les information saisie, en cas de question veuillez nous contacter.
 
-                 Meilleurs Salutations 
-                 """
-             }
+                 Meilleurs Salutations
+                 """,
+        }
     }
     return message_payment_notification["payment_notification"][language]

contract/gql/__init__.py

@@ -1 +1 @@
-from .gql_types import *
+# from .gql_types import *

contract/gql/gql_mutations/__init__.py

@@ -1 +0,0 @@
-from .input_types import *

contract/gql/gql_mutations/contract_details_mutations.py

@@ -1,12 +1,21 @@
 from core.gql.gql_mutations import DeleteInputType
-from core.gql.gql_mutations.base_mutation import BaseMutation, BaseDeleteMutation, \
-    BaseHistoryModelCreateMutationMixin, BaseHistoryModelUpdateMutationMixin, \
-    BaseHistoryModelDeleteMutationMixin
-from .mutations import ContractDetailsFromPHInsureeMutationMixin
-from contract.gql.gql_mutations import ContractDetailsCreateInputType, ContractDetailsUpdateInputType, \
-    ContractDetailsCreateFromInsureeInputType
+from core.gql.gql_mutations.base_mutation import (
+    BaseDeleteMutation,
+    BaseHistoryModelCreateMutationMixin,
+    BaseHistoryModelDeleteMutationMixin,
+    BaseHistoryModelUpdateMutationMixin,
+    BaseMutation,
+)
+
+from contract.gql.gql_mutations.input_types import (
+    ContractDetailsCreateFromInsureeInputType,
+    ContractDetailsCreateInputType,
+    ContractDetailsUpdateInputType,
+)
 from contract.models import ContractDetails, ContractDetailsMutation
 
+from .mutations import ContractDetailsFromPHInsureeMutationMixin
+
 
 class CreateContractDetailsMutation(BaseHistoryModelCreateMutationMixin, BaseMutation):
     _mutation_class = "ContractDetailsMutation"
@@ -17,11 +26,13 @@ class CreateContractDetailsMutation(BaseHistoryModelCreateMutationMixin, BaseMut
     def _mutate(cls, user, **data):
         client_mutation_id = data.get("client_mutation_id")
         if "client_mutation_id" in data:
-            data.pop('client_mutation_id')
+            data.pop("client_mutation_id")
         if "client_mutation_label" in data:
-            data.pop('client_mutation_label')
+            data.pop("client_mutation_label")
         contract_detail = cls.create_object(user=user, object_data=data)
-        ContractDetailsMutation.object_mutated(user, client_mutation_id=client_mutation_id, contract_detail=contract_detail)
+        ContractDetailsMutation.object_mutated(
+            user, client_mutation_id=client_mutation_id, contract_detail=contract_detail
+        )
         return None
 
     class Input(ContractDetailsCreateInputType):
@@ -37,7 +48,9 @@ class Input(ContractDetailsUpdateInputType):
         pass
 
 
-class DeleteContractDetailsMutation(BaseHistoryModelDeleteMutationMixin, BaseDeleteMutation):
+class DeleteContractDetailsMutation(
+    BaseHistoryModelDeleteMutationMixin, BaseDeleteMutation
+):
     _mutation_class = "ContractDetailsMutation"
     _mutation_module = "contract"
     _model = ContractDetails
@@ -46,10 +59,12 @@ class Input(DeleteInputType):
         pass
 
 
-class CreateContractDetailByPolicyHolderInsureeMutation(ContractDetailsFromPHInsureeMutationMixin, BaseMutation):
+class CreateContractDetailByPolicyHolderInsureeMutation(
+    ContractDetailsFromPHInsureeMutationMixin, BaseMutation
+):
     _mutation_class = "CreateContractDetailByPolicyHolderInsureetMutation"
     _mutation_module = "contract"
     _model = ContractDetails
 
     class Input(ContractDetailsCreateFromInsureeInputType):
-        pass
+        pass