Merge pull request #74 from openimis/release/25.04

MERGING release/25.04 into develop

Author: delcroip

invoice/gql/bill/query.py

@@ -11,8 +11,11 @@
 from invoice.gql.gql_types.bill_types import BillGQLType
 from invoice.models import Bill
 import graphene_django_optimizer as gql_optimizer
-
-from policy.models import Policy
+from django.apps import apps
+try:
+    Policy = apps.get_model('policy','Policy')
+except:
+    Policy = {}
 
 
 def patch_subjects(bills_df: DataFrame):

invoice/gql/gql_types/invoice_types.py

@@ -2,9 +2,9 @@
 import json
 from django.core.serializers.json import DjangoJSONEncoder
 from graphene_django import DjangoObjectType
+from django.apps import apps
 
 from core import prefix_filterset, ExtendedConnection
-from insuree.models import Insuree
 from invoice.gql.filter_mixin import GenericFilterGQLTypeMixin
 from invoice.models import Invoice, InvoiceLineItem, InvoicePayment, InvoiceEvent, InvoiceMutation, \
     InvoicePaymentMutation, InvoiceLineItemMutation, InvoiceEventMutation
@@ -43,6 +43,7 @@ def resolve_subject(root, info):
                 underscore_to_camel(k): v for k, v in list(subject_object_dict.items())
             }
             if root.subject_type.name == "family":
+                Insuree = apps.get_model('insuree','Insuree')
                 insuree = Insuree.objects.filter(id=subject_object_dict['headInsureeId'], validity_to__isnull=True)
                 insuree = insuree.values('id', 'chf_id', 'uuid', 'last_name', 'other_names')
                 subject_object_dict['headInsuree'] = {

invoice/gql/invoice/mutation.py

@@ -4,7 +4,6 @@
 from django.contrib.auth.models import AnonymousUser
 from django.core.exceptions import ValidationError
 from graphql import GraphQLError
-from policy.apps import PolicyConfig
 
 from core.gql.gql_mutations.base_mutation import BaseMutation, BaseHistoryModelDeleteMutationMixin
 from core.schema import OpenIMISMutation