upgrade django to 4.2

.flake8

@@ -9,5 +9,6 @@ exclude =
   __pycache__,
   .venv,
   */migrations/*,
+  */migrations_old/*,
   */static/CACHE/*,
   docs

care/contrib/sites/migrations/0004_alter_site_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.2 on 2023-06-14 08:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sites", "0003_set_site_domain_and_name"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="site",
+            options={
+                "ordering": ["domain"],
+                "verbose_name": "site",
+                "verbose_name_plural": "sites",
+            },
+        ),
+    ]

care/facility/api/serializers/ambulance.py

@@ -57,3 +57,16 @@ def update(self, instance, validated_data):
         validated_data.pop("drivers", [])
         ambulance = super(AmbulanceSerializer, self).update(instance, validated_data)
         return ambulance
+
+
+class DeleteDriverSerializer(serializers.Serializer):
+    driver_id = serializers.IntegerField()
+
+    def update(self, instance, validated_data):
+        raise NotImplementedError
+
+    def create(self, validated_data):
+        raise NotImplementedError
+
+    class Meta:
+        fields = ("driver_id",)

care/facility/api/serializers/asset.py

@@ -1,10 +1,17 @@
+import enum
 from datetime import datetime
 
 from django.core.cache import cache
 from django.db import transaction
 from django.shortcuts import get_object_or_404
 from rest_framework.exceptions import ValidationError
-from rest_framework.serializers import ModelSerializer, UUIDField
+from rest_framework.serializers import (
+    CharField,
+    JSONField,
+    ModelSerializer,
+    Serializer,
+    UUIDField,
+)
 from rest_framework.validators import UniqueValidator
 
 from care.facility.api.serializers import TIMESTAMP_FIELDS
@@ -16,6 +23,9 @@
     UserDefaultAssetLocation,
 )
 from care.users.api.serializers.user import UserBaseMinimumSerializer
+from care.utils.assetintegration.hl7monitor import HL7MonitorAsset
+from care.utils.assetintegration.onvif import OnvifAsset
+from care.utils.assetintegration.ventilator import VentilatorAsset
 from care.utils.queryset.facility import get_facility_queryset
 from config.serializers import ChoiceField
 
@@ -161,3 +171,40 @@ class UserDefaultAssetLocationSerializer(ModelSerializer):
     class Meta:
         model = UserDefaultAssetLocation
         exclude = ("deleted", "external_id", "location", "user", "id")
+
+
+class AssetActionSerializer(Serializer):
+    def actionChoices():
+        actions: list[enum.Enum] = [
+            OnvifAsset.OnvifActions,
+            HL7MonitorAsset.HL7MonitorActions,
+            VentilatorAsset.VentilatorActions,
+        ]
+        choices = []
+        for action in actions:
+            choices += [(e.value, e.name) for e in action]
+        return choices
+
+    type = ChoiceField(
+        choices=actionChoices(),
+        required=True,
+    )
+    data = JSONField(required=False)
+
+    class Meta:
+        fields = ("type", "data")
+
+
+class DummyAssetOperateSerializer(Serializer):
+    action = AssetActionSerializer(required=True)
+
+    class Meta:
+        fields = ("action",)
+
+
+class DummyAssetOperateResponseSerializer(Serializer):
+    message = CharField(required=True)
+    result = JSONField(required=False)
+
+    class Meta:
+        fields = ("message", "result")

care/facility/api/serializers/patient.py

@@ -24,7 +24,6 @@
     PatientMetaInfo,
     PatientNotes,
     PatientRegistration,
-    PatientSearch,
 )
 from care.facility.models.notification import Notification
 from care.facility.models.patient_base import (
@@ -48,9 +47,6 @@
 from care.utils.notification_handler import NotificationGenerator
 from care.utils.queryset.facility import get_home_facility_queryset
 from care.utils.serializer.external_id_field import ExternalIdSerializerField
-from care.utils.serializer.phonenumber_ispossible_field import (
-    PhoneNumberIsPossibleField,
-)
 from config.serializers import ChoiceField
 
 
@@ -120,7 +116,6 @@ class Meta:
             "created_by",
             "deleted",
             "ongoing_medication",
-            "patient_search_id",
             "year_of_birth",
             "meta_info",
             "countries_travelled_old",
@@ -165,8 +160,6 @@ class Meta:
             model = PatientTeleConsultation
             fields = "__all__"
 
-    phone_number = PhoneNumberIsPossibleField()
-
     facility = ExternalIdSerializerField(
         queryset=Facility.objects.all(), required=False
     )
@@ -220,7 +213,6 @@ class Meta:
         model = PatientRegistration
         exclude = (
             "deleted",
-            "patient_search_id",
             "year_of_birth",
             "countries_travelled_old",
             "external_id",
@@ -417,13 +409,12 @@ def create(self, validated_data):
 
 class PatientSearchSerializer(serializers.ModelSerializer):
     gender = ChoiceField(choices=GENDER_CHOICES)
-    phone_number = PhoneNumberIsPossibleField()
     patient_id = serializers.UUIDField(source="external_id", read_only=True)
 
     # facility_id = serializers.UUIDField(read_only=True, allow_null=True)
 
     class Meta:
-        model = PatientSearch
+        model = PatientRegistration
         exclude = (
             "date_of_birth",
             "year_of_birth",

care/facility/api/serializers/patient_consultation.py

@@ -465,3 +465,21 @@ class PatientConsultationIDSerializer(serializers.ModelSerializer):
     class Meta:
         model = PatientConsultation
         fields = ("consultation_id", "patient_id")
+
+
+class EmailDischargeSummarySerializer(serializers.Serializer):
+    email = serializers.EmailField(
+        required=False,
+        help_text=(
+            "Email address to send the discharge summary to. If not provided, "
+            "the email address of the current user will be used."
+        ),
+    )
+
+    def validate(self, attrs):
+        if not attrs.get("email"):
+            attrs["email"] = self.context["request"].user.email
+        return attrs
+
+    class Meta:
+        fields = ("email",)

care/facility/api/serializers/patient_investigation.py

@@ -81,3 +81,17 @@ class Meta:
         model = InvestigationValue
         read_only_fields = TIMESTAMP_FIELDS
         exclude = TIMESTAMP_FIELDS + ("external_id",)
+
+
+class ValueSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = InvestigationValue
+        fields = ("external_id", "value", "notes")
+
+
+# Dummy for Spec
+class InvestigationUpdateSerializer(serializers.Serializer):
+    investigations = ValueSerializer(many=True)
+
+    class Meta:
+        fields = ("investigations",)

care/facility/api/serializers/patient_otp.py

@@ -25,8 +25,9 @@ def send_sms(otp, phone_number):
     if settings.USE_SMS:
         sendSMS(
             phone_number,
-            "CoronaSafe Network Patient Management System Login, OTP is {} . Please do not share this Confidential Login Token with anyone else".format(
-                otp
+            (
+                f"CoronaSafe Network Patient Management System Login, OTP is {otp} . "
+                "Please do not share this Confidential Login Token with anyone else"
             ),
         )
     else:

care/facility/api/serializers/shifting.py

@@ -27,9 +27,6 @@
 from care.users.api.serializers.user import UserBaseMinimumSerializer
 from care.utils.notification_handler import NotificationGenerator
 from care.utils.serializer.external_id_field import ExternalIdSerializerField
-from care.utils.serializer.phonenumber_ispossible_field import (
-    PhoneNumberIsPossibleField,
-)
 from config.serializers import ChoiceField
 
 
@@ -223,9 +220,7 @@ class ShiftingSerializer(serializers.ModelSerializer):
     ambulance_driver_name = serializers.CharField(
         required=False, allow_null=True, allow_blank=True
     )
-    ambulance_phone_number = PhoneNumberIsPossibleField(
-        required=False, allow_null=True, allow_blank=True
-    )
+
     ambulance_number = serializers.CharField(
         required=False, allow_null=True, allow_blank=True
     )

care/facility/api/serializers/summary.py

@@ -0,0 +1,24 @@
+from rest_framework import serializers
+
+from care.facility.api.serializers.facility import FacilitySerializer
+from care.facility.models import DistrictScopedSummary, FacilityRelatedSummary
+
+
+class FacilitySummarySerializer(serializers.ModelSerializer):
+    facility = FacilitySerializer()
+
+    class Meta:
+        model = FacilityRelatedSummary
+        exclude = (
+            "id",
+            "s_type",
+        )
+
+
+class DistrictSummarySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = DistrictScopedSummary
+        exclude = (
+            "id",
+            "s_type",
+        )

care/facility/api/viewsets/ambulance.py

@@ -1,4 +1,5 @@
 from django_filters import rest_framework as filters
+from drf_spectacular.utils import extend_schema, extend_schema_view
 from rest_framework import serializers, status
 from rest_framework.decorators import action
 from rest_framework.mixins import (
@@ -15,6 +16,7 @@
 from care.facility.api.serializers.ambulance import (
     AmbulanceDriverSerializer,
     AmbulanceSerializer,
+    DeleteDriverSerializer,
 )
 from care.facility.api.viewsets import UserAccessMixin
 from care.facility.models.ambulance import Ambulance
@@ -54,10 +56,18 @@ class AmbulanceViewSet(
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = AmbulanceFilterSet
 
+    def get_serializer_class(self):
+        if self.action == "add_driver":
+            return AmbulanceDriverSerializer
+        elif self.action == "remove_driver":
+            return DeleteDriverSerializer
+        return AmbulanceSerializer
+
+    @extend_schema(tags=["ambulance"])
     @action(methods=["POST"], detail=True)
     def add_driver(self, request):
         ambulance = self.get_object()
-        serializer = AmbulanceDriverSerializer(data=request.data)
+        serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
         driver = ambulance.ambulancedriver_set.create(**serializer.validated_data)
@@ -66,19 +76,11 @@ def add_driver(self, request):
             status=status.HTTP_201_CREATED,
         )
 
+    @extend_schema(tags=["ambulance"])
     @action(methods=["DELETE"], detail=True)
     def remove_driver(self, request):
-        class DeleteDriverSerializer(serializers.Serializer):
-            driver_id = serializers.IntegerField()
-
-            def update(self, instance, validated_data):
-                raise NotImplementedError
-
-            def create(self, validated_data):
-                raise NotImplementedError
-
         ambulance = self.get_object()
-        serializer = DeleteDriverSerializer(data=request.data)
+        serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
         driver = ambulance.ambulancedriver_set.filter(
@@ -91,6 +93,7 @@ def create(self, validated_data):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+@extend_schema_view(create=extend_schema(tags=["ambulance"]))
 class AmbulanceCreateViewSet(CreateModelMixin, GenericViewSet):
     permission_classes = (IsAuthenticated,)
     serializer_class = AmbulanceSerializer