Merge Develop to Staging v24.31.0

care/facility/api/serializers/file_upload.py

@@ -6,6 +6,7 @@
 from care.facility.api.serializers.shifting import has_facility_permission
 from care.facility.models.facility import Facility
 from care.facility.models.file_upload import FileUpload
+from care.facility.models.notification import Notification
 from care.facility.models.patient import PatientRegistration
 from care.facility.models.patient_consultation import (
     PatientConsent,
@@ -14,6 +15,7 @@
 from care.facility.models.patient_sample import PatientSample
 from care.users.api.serializers.user import UserBaseMinimumSerializer
 from care.users.models import User
+from care.utils.notification_handler import NotificationGenerator
 from config.serializers import ChoiceField
 
 
@@ -156,12 +158,31 @@ def create(self, validated_data):
         internal_id = check_permissions(
             validated_data["file_type"], validated_data["associating_id"], user
         )
+        associating_id = validated_data["associating_id"]
         validated_data["associating_id"] = internal_id
         validated_data["uploaded_by"] = user
         validated_data["internal_name"] = validated_data["original_name"]
         del validated_data["original_name"]
         file_upload: FileUpload = super().create(validated_data)
         file_upload.signed_url = file_upload.signed_url(mime_type=mime_type)
+        if validated_data["file_type"] == FileUpload.FileType.CONSULTATION.value:
+            consultation = PatientConsultation.objects.get(external_id=associating_id)
+            NotificationGenerator(
+                event=Notification.Event.CONSULTATION_FILE_UPLOAD_CREATED,
+                caused_by=user,
+                caused_object=consultation,
+                facility=consultation.facility,
+                generate_for_facility=True,
+            ).generate()
+        if validated_data["file_type"] == FileUpload.FileType.PATIENT.value:
+            patient = PatientRegistration.objects.get(external_id=associating_id)
+            NotificationGenerator(
+                event=Notification.Event.PATIENT_FILE_UPLOAD_CREATED,
+                caused_by=user,
+                caused_object=patient,
+                facility=patient.facility,
+                generate_for_facility=True,
+            ).generate()
         return file_upload
 
 

care/facility/api/viewsets/prescription.py

@@ -21,9 +21,11 @@
     PrescriptionType,
     generate_choices,
 )
+from care.facility.models.notification import Notification
 from care.facility.static_data.medibase import MedibaseMedicine
 from care.utils.filters.choicefilter import CareChoiceFilter
 from care.utils.filters.multiselect import MultiSelectFilter
+from care.utils.notification_handler import NotificationGenerator
 from care.utils.queryset.consultation import get_consultation_queryset
 from care.utils.static_data.helpers import query_builder, token_escaper
 
@@ -120,6 +122,13 @@ def get_queryset(self):
 
     def perform_create(self, serializer):
         consultation_obj = self.get_consultation_obj()
+        NotificationGenerator(
+            event=Notification.Event.PATIENT_PRESCRIPTION_CREATED,
+            caused_by=self.request.user,
+            caused_object=consultation_obj,
+            facility=consultation_obj.facility,
+            generate_for_facility=True,
+        ).generate()
         serializer.save(prescribed_by=self.request.user, consultation=consultation_obj)
 
     @extend_schema(tags=["prescriptions"])
@@ -133,6 +142,14 @@ def discontinue(self, request, *args, **kwargs):
         prescription_obj.discontinued_reason = request.data.get(
             "discontinued_reason", None
         )
+        consultation_obj = self.get_consultation_obj()
+        NotificationGenerator(
+            event=Notification.Event.PATIENT_PRESCRIPTION_UPDATED,
+            caused_by=self.request.user,
+            caused_object=consultation_obj,
+            facility=consultation_obj.facility,
+            generate_for_facility=True,
+        ).generate()
         prescription_obj.save()
         return Response({}, status=status.HTTP_200_OK)
 

care/facility/migrations/0446_alter_notification_event.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.2.10 on 2024-07-18 10:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("facility", "0445_merge_20240715_0301"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notification",
+            name="event",
+            field=models.IntegerField(
+                choices=[
+                    (0, "MESSAGE"),
+                    (20, "PATIENT_CREATED"),
+                    (30, "PATIENT_UPDATED"),
+                    (40, "PATIENT_DELETED"),
+                    (50, "PATIENT_CONSULTATION_CREATED"),
+                    (60, "PATIENT_CONSULTATION_UPDATED"),
+                    (70, "PATIENT_CONSULTATION_DELETED"),
+                    (80, "INVESTIGATION_SESSION_CREATED"),
+                    (90, "INVESTIGATION_UPDATED"),
+                    (100, "PATIENT_FILE_UPLOAD_CREATED"),
+                    (110, "CONSULTATION_FILE_UPLOAD_CREATED"),
+                    (120, "PATIENT_CONSULTATION_UPDATE_CREATED"),
+                    (130, "PATIENT_CONSULTATION_UPDATE_UPDATED"),
+                    (140, "PATIENT_CONSULTATION_ASSIGNMENT"),
+                    (200, "SHIFTING_UPDATED"),
+                    (210, "PATIENT_NOTE_ADDED"),
+                    (220, "PUSH_MESSAGE"),
+                    (230, "PATIENT_PRESCRIPTION_CREATED"),
+                    (240, "PATIENT_PRESCRIPTION_UPDATED"),
+                ],
+                default=0,
+            ),
+        ),
+    ]

care/facility/models/notification.py

@@ -39,6 +39,8 @@ class Event(enum.Enum):
         SHIFTING_UPDATED = 200
         PATIENT_NOTE_ADDED = 210
         PUSH_MESSAGE = 220
+        PATIENT_PRESCRIPTION_CREATED = 230
+        PATIENT_PRESCRIPTION_UPDATED = 240
 
     EventChoices = [(e.value, e.name) for e in Event]
 

care/hcx/api/viewsets/gateway.py

@@ -74,16 +74,19 @@ def check_eligibility(self, request):
                 "7894561232",
                 policy["patient_object"]["id"],
                 policy["patient_object"]["name"],
-                "male"
-                if policy["patient_object"]["gender"] == 1
-                else "female"
-                if policy["patient_object"]["gender"] == 2
-                else "other",
+                (
+                    "male"
+                    if policy["patient_object"]["gender"] == 1
+                    else (
+                        "female" if policy["patient_object"]["gender"] == 2 else "other"
+                    )
+                ),
                 policy["subscriber_id"],
                 policy["policy_id"],
                 policy["id"],
                 policy["id"],
                 policy["id"],
+                policy["patient_object"]["phone_number"],
                 REVERSE_STATUS_CHOICES[policy["status"]],
                 REVERSE_PRIORITY_CHOICES[policy["priority"]],
                 REVERSE_PURPOSE_CHOICES[policy["purpose"]],
@@ -125,17 +128,23 @@ def make_claim(self, request):
                     lambda procedure: {
                         "id": str(uuid()),
                         "name": procedure["procedure"],
-                        "performed": procedure["time"]
-                        if "time" in procedure
-                        else procedure["frequency"],
+                        "performed": (
+                            procedure["time"]
+                            if "time" in procedure
+                            else procedure["frequency"]
+                        ),
                         "status": (
-                            "completed"
-                            if datetime.strptime(procedure["time"], "%Y-%m-%dT%H:%M")
-                            < datetime.now()
-                            else "preparation"
-                        )
-                        if "time" in procedure
-                        else "in-progress",
+                            (
+                                "completed"
+                                if datetime.strptime(
+                                    procedure["time"], "%Y-%m-%dT%H:%M"
+                                )
+                                < datetime.now()
+                                else "preparation"
+                            )
+                            if "time" in procedure
+                            else "in-progress"
+                        ),
                     },
                     consultation.procedure,
                 )
@@ -208,17 +217,22 @@ def make_claim(self, request):
             "GICOFINDIA",
             claim["policy_object"]["patient_object"]["id"],
             claim["policy_object"]["patient_object"]["name"],
-            "male"
-            if claim["policy_object"]["patient_object"]["gender"] == 1
-            else "female"
-            if claim["policy_object"]["patient_object"]["gender"] == 2
-            else "other",
+            (
+                "male"
+                if claim["policy_object"]["patient_object"]["gender"] == 1
+                else (
+                    "female"
+                    if claim["policy_object"]["patient_object"]["gender"] == 2
+                    else "other"
+                )
+            ),
             claim["policy_object"]["subscriber_id"],
             claim["policy_object"]["policy_id"],
             claim["policy_object"]["id"],
             claim["id"],
             claim["id"],
             claim["items"],
+            claim["policy_object"]["patient_object"]["phone_number"],
             REVERSE_USE_CHOICES[claim["use"]],
             REVERSE_STATUS_CHOICES[claim["status"]],
             REVERSE_CLAIM_TYPE_CHOICES[claim["type"]],
@@ -237,9 +251,11 @@ def make_claim(self, request):
 
         response = Hcx().generateOutgoingHcxCall(
             fhirPayload=json.loads(claim_fhir_bundle.json()),
-            operation=HcxOperations.CLAIM_SUBMIT
-            if REVERSE_USE_CHOICES[claim["use"]] == "claim"
-            else HcxOperations.PRE_AUTH_SUBMIT,
+            operation=(
+                HcxOperations.CLAIM_SUBMIT
+                if REVERSE_USE_CHOICES[claim["use"]] == "claim"
+                else HcxOperations.PRE_AUTH_SUBMIT
+            ),
             recipientCode=claim["policy_object"]["insurer_id"],
         )
 

care/hcx/utils/fhir.py

@@ -258,7 +258,7 @@ def get_reference_url(self, resource: domainresource.DomainResource):
         return f"{resource.resource_type}/{resource.id}"
 
     def create_patient_profile(
-        self, id: str, name: str, gender: str, identifier_value: str
+        self, id: str, name: str, gender: str, phone: str, identifier_value: str
     ):
         return patient.Patient(
             id=id,
@@ -280,6 +280,7 @@ def create_patient_profile(
             ],
             name=[{"text": name}],
             gender=gender,
+            telecom=[{"system": "phone", "use": "mobile", "value": phone}],
         )
 
     def create_provider_profile(self, id: str, name: str, identifier_value: str):
@@ -558,9 +559,11 @@ def create_claim_profile(
                             category=codeableconcept.CodeableConcept(
                                 coding=[
                                     coding.Coding(
-                                        system=SYSTEM.claim_item_category_pmjy
-                                        if item["category"] == "HBP"
-                                        else SYSTEM.claim_item_category,
+                                        system=(
+                                            SYSTEM.claim_item_category_pmjy
+                                            if item["category"] == "HBP"
+                                            else SYSTEM.claim_item_category
+                                        ),
                                         code=item["category"],
                                     )
                                 ]
@@ -695,6 +698,7 @@ def create_coverage_eligibility_request_bundle(
         coverage_id: str,
         eligibility_request_id: str,
         eligibility_request_identifier_value: str,
+        patient_phone: str,
         status="active",
         priority="normal",
         purpose="validation",
@@ -709,7 +713,7 @@ def create_coverage_eligibility_request_bundle(
             insurer_id, insurer_name, insurer_identifier_value
         )
         patient = self.create_patient_profile(
-            patient_id, pateint_name, patient_gender, subscriber_id
+            patient_id, pateint_name, patient_gender, patient_phone, subscriber_id
         )
         enterer = self.create_practitioner_role_profile(
             enterer_id, enterer_identifier_value, enterer_speciality, enterer_phone
@@ -792,6 +796,7 @@ def create_claim_bundle(
         claim_id: str,
         claim_identifier_value: str,
         items: list[IClaimItem],
+        patient_phone: str,
         use="claim",
         status="active",
         type="institutional",
@@ -810,7 +815,7 @@ def create_claim_bundle(
             insurer_id, insurer_name, insurer_identifier_value
         )
         patient = self.create_patient_profile(
-            patient_id, pateint_name, patient_gender, subscriber_id
+            patient_id, pateint_name, patient_gender, patient_phone, subscriber_id
         )
         coverage = self.create_coverage_profile(
             coverage_id,
@@ -947,15 +952,17 @@ def create_communication_profile(
                 map(
                     lambda content: (
                         communication.CommunicationPayload(
-                            contentString=content["data"]
-                            if content["type"] == "text"
-                            else None,
-                            contentAttachment=attachment.Attachment(
-                                url=content["data"],
-                                title=content["name"] if content["name"] else None,
-                            )
-                            if content["type"] == "url"
-                            else None,
+                            contentString=(
+                                content["data"] if content["type"] == "text" else None
+                            ),
+                            contentAttachment=(
+                                attachment.Attachment(
+                                    url=content["data"],
+                                    title=content["name"] if content["name"] else None,
+                                )
+                                if content["type"] == "url"
+                                else None
+                            ),
                         )
                     ),
                     payload,

care/users/api/viewsets/users.py

@@ -1,6 +1,9 @@
+from datetime import timedelta
+
 from django.core.cache import cache
 from django.db.models import F, Q, Subquery
 from django.http import Http404
+from django.utils import timezone
 from django_filters import rest_framework as filters
 from drf_spectacular.utils import extend_schema
 from dry_rest_permissions.generics import DRYPermissions
@@ -57,6 +60,7 @@ class UserFilterSet(filters.FilterSet):
     home_facility = filters.UUIDFilter(
         field_name="home_facility__external_id", lookup_expr="exact"
     )
+    last_active_days = filters.CharFilter(method="last_active_after")
 
     def get_user_type(
         self,
@@ -71,6 +75,14 @@ def get_user_type(
 
     user_type = filters.CharFilter(method="get_user_type", field_name="user_type")
 
+    def last_active_after(self, queryset, name, value):
+        if value == "never":
+            return queryset.filter(last_login__isnull=True)
+        # convert days to date
+        date = timezone.now() - timedelta(days=int(value))
+
+        return queryset.filter(last_login__gte=date)
+
 
 class UserViewSet(
     mixins.RetrieveModelMixin,