fix: merge master branch

care/facility/api/serializers/asset.py

@@ -71,7 +71,6 @@ def validate_qr_code_id(self, value):
         return value
 
     def validate(self, attrs):
-
         user = self.context["request"].user
         if "location" in attrs:
             location = get_object_or_404(

care/facility/api/serializers/daily_round.py

@@ -105,7 +105,6 @@ class Meta:
         exclude = ("deleted",)
 
     def update(self, instance, validated_data):
-
         instance.last_edited_by = self.context["request"].user
 
         if instance.consultation.discharge_date:
@@ -162,7 +161,6 @@ def update_last_daily_round(self, daily_round_obj):
         ).generate()
 
     def create(self, validated_data):
-
         # Authorisation Checks
 
         # Skip check for asset user

care/facility/api/serializers/patient_search.py

@@ -6,7 +6,6 @@
 
 
 class PatientScopedSearchSerializer(serializers.ModelSerializer):
-
     gender = ChoiceField(choices=GENDER_CHOICES)
     facility = FacilityBasicInfoSerializer()
     id = serializers.CharField(source="patient_external_id")

care/facility/api/serializers/prescription.py

@@ -1,9 +1,7 @@
 from rest_framework import serializers
 
-from care.facility.models import Prescription, MedicineAdministration
-from care.users.api.serializers.user import (
-    UserBaseMinimumSerializer,
-)
+from care.facility.models import MedicineAdministration, Prescription
+from care.users.api.serializers.user import UserBaseMinimumSerializer
 
 
 class PrescriptionSerializer(serializers.ModelSerializer):
@@ -14,7 +12,11 @@ class PrescriptionSerializer(serializers.ModelSerializer):
     last_administered_on = serializers.SerializerMethodField()
 
     def get_last_administered_on(self, obj):
-        last_administration = MedicineAdministration.objects.filter(prescription=obj).order_by("-created_date").first()
+        last_administration = (
+            MedicineAdministration.objects.filter(prescription=obj)
+            .order_by("-created_date")
+            .first()
+        )
         if last_administration:
             return last_administration.created_date
         return None
@@ -31,7 +33,7 @@ class Meta:
             "created_date",
             "modified_date",
             "discontinued_date",
-            "is_migrated"
+            "is_migrated",
         )
 
     def validate(self, attrs):
@@ -58,14 +60,11 @@ class MedicineAdministrationSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = MedicineAdministration
-        exclude = (
-            "deleted",
-        )
+        exclude = ("deleted",)
         read_only_fields = (
             "external_id",
             "administered_by",
             "created_date",
             "modified_date",
-            "prescription"
+            "prescription",
         )
-

care/facility/api/serializers/prescription_supplier.py

@@ -9,7 +9,6 @@
 
 
 class MinimalPatientSerializer(serializers.ModelSerializer):
-
     id = serializers.CharField(source="external_id")
 
     class Meta:
@@ -18,7 +17,6 @@ class Meta:
 
 
 class PrescriptionSupplierConsultationSerializer(serializers.ModelSerializer):
-
     id = serializers.CharField(source="external_id", read_only=True)
     patient = MinimalPatientSerializer(read_only=True)
 
@@ -31,11 +29,10 @@ class Meta:
             "prn_prescription",
             "patient",
         )
-        fields = ("id", "prescriptions",  "patient")
+        fields = ("id", "prescriptions", "patient")
 
 
 class PrescriptionSupplierSerializer(serializers.ModelSerializer):
-
     id = serializers.CharField(source="external_id", read_only=True)
     scheme = ChoiceField(choices=PrescriptionSupplier.SchemeChoices)
     status = ChoiceField(choices=PrescriptionSupplier.StatusChoices)

care/facility/api/viewsets/daily_round.py

@@ -68,7 +68,6 @@ def get_serializer(self, *args, **kwargs):
 
     @action(methods=["POST"], detail=False)
     def analyse(self, request, **kwargs):
-
         # Request Body Validations
 
         if self.FIELDS_KEY not in request.data:

care/facility/api/viewsets/prescription.py

@@ -1,14 +1,21 @@
 from django.shortcuts import get_object_or_404
 from django_filters import rest_framework as filters
-from rest_framework import mixins
-from rest_framework import status
+from rest_framework import mixins, status
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
-from care.facility.api.serializers.prescription import PrescriptionSerializer, MedicineAdministrationSerializer
-from care.facility.models import Prescription, MedicineAdministration, PrescriptionType, generate_choices
+from care.facility.api.serializers.prescription import (
+    MedicineAdministrationSerializer,
+    PrescriptionSerializer,
+)
+from care.facility.models import (
+    MedicineAdministration,
+    Prescription,
+    PrescriptionType,
+    generate_choices,
+)
 from care.utils.filters import CareChoiceFilter
 from care.utils.queryset.consultation import get_consultation_queryset
 
@@ -27,25 +34,26 @@ class MedicineAdminstrationFilter(filters.FilterSet):
     prescription = filters.UUIDFilter(field_name="prescription__external_id")
 
 
-class MedicineAdministrationViewSet(mixins.ListModelMixin, mixins.RetrieveModelMixin, GenericViewSet):
+class MedicineAdministrationViewSet(
+    mixins.ListModelMixin, mixins.RetrieveModelMixin, GenericViewSet
+):
     serializer_class = MedicineAdministrationSerializer
-    permission_classes = (
-        IsAuthenticated,
-    )
+    permission_classes = (IsAuthenticated,)
     queryset = MedicineAdministration.objects.all().order_by("-created_date")
     lookup_field = "external_id"
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = MedicineAdminstrationFilter
 
     def get_consultation_obj(self):
         return get_object_or_404(
-            get_consultation_queryset(self.request.user).filter(external_id=self.kwargs["consultation_external_id"]))
+            get_consultation_queryset(self.request.user).filter(
+                external_id=self.kwargs["consultation_external_id"]
+            )
+        )
 
     def get_queryset(self):
         consultation_obj = self.get_consultation_obj()
-        return self.queryset.filter(
-            prescription__consultation_id=consultation_obj.id
-        )
+        return self.queryset.filter(prescription__consultation_id=consultation_obj.id)
 
 
 class ConsultationPrescriptionFilter(filters.FilterSet):
@@ -60,23 +68,22 @@ class ConsultationPrescriptionViewSet(
     GenericViewSet,
 ):
     serializer_class = PrescriptionSerializer
-    permission_classes = (
-        IsAuthenticated,
-    )
+    permission_classes = (IsAuthenticated,)
     queryset = Prescription.objects.all().order_by("-created_date")
     lookup_field = "external_id"
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = ConsultationPrescriptionFilter
 
     def get_consultation_obj(self):
         return get_object_or_404(
-            get_consultation_queryset(self.request.user).filter(external_id=self.kwargs["consultation_external_id"]))
+            get_consultation_queryset(self.request.user).filter(
+                external_id=self.kwargs["consultation_external_id"]
+            )
+        )
 
     def get_queryset(self):
         consultation_obj = self.get_consultation_obj()
-        return self.queryset.filter(
-            consultation_id=consultation_obj.id
-        )
+        return self.queryset.filter(consultation_id=consultation_obj.id)
 
     def perform_create(self, serializer):
         consultation_obj = self.get_consultation_obj()
@@ -86,11 +93,15 @@ def perform_create(self, serializer):
     def discontinue(self, request, *args, **kwargs):
         prescription_obj = self.get_object()
         prescription_obj.discontinued = True
-        prescription_obj.discontinued_reason = request.data.get("discontinued_reason", None)
+        prescription_obj.discontinued_reason = request.data.get(
+            "discontinued_reason", None
+        )
         prescription_obj.save()
         return Response({}, status=status.HTTP_201_CREATED)
 
-    @action(methods=["POST"], detail=True, serializer_class=MedicineAdministrationSerializer)
+    @action(
+        methods=["POST"], detail=True, serializer_class=MedicineAdministrationSerializer
+    )
     def administer(self, request, *args, **kwargs):
         prescription_obj = self.get_object()
         serializer = MedicineAdministrationSerializer(data=request.data)