fix breaking changes in drf

Author: sainak

Pipfile

@@ -10,23 +10,23 @@ boto3 = "==1.34.113"
 celery = "==5.3.6"
 django = "==4.2.10"
 django-environ = "==0.11.2"
-django-cors-headers = "==4.2.0"
+django-cors-headers = "==4.3.1"
 django-filter = "==24.2"
 django-hardcopy = "==0.1.4"
-django-maintenance-mode = "==0.21.0"
-django-model-utils = "==4.3.1"
+django-maintenance-mode = "==0.21.1"
+django-model-utils = "==4.5.0"
 django-multiselectfield = "==0.1.12"
 django-queryset-csv = "==1.1.0"
 django-ratelimit = "==4.1.0"
 django-redis = "==5.4.0"
-django-rest-passwordreset = "==1.3.0"
-django-simple-history = "==3.6.0"
-djangoql = "==0.17.1"
-djangorestframework = "==3.14.0"
+django-rest-passwordreset = "==1.4.1"
+django-simple-history = "==3.5.0"
+djangoql = "==0.18.1"
+djangorestframework = "==3.15.1"
 djangorestframework-simplejwt = "==5.3.1"
 dry-rest-permissions = "==0.1.10"
 drf-nested-routers = "==0.94.1"
-drf-spectacular = "==0.26.4"
+drf-spectacular = "==0.27.2"
 "fhir.resources" = "==6.5.0"
 gunicorn = "==22.0.0"
 healthy-django = "==0.1.0"

Pipfile.lock

@@ -1,5 +1,5 @@
 from django_filters import rest_framework as filters
-from drf_spectacular.utils import extend_schema, extend_schema_view
+from drf_spectacular.utils import extend_schema
 from rest_framework import serializers, status
 from rest_framework.decorators import action
 from rest_framework.mixins import (
@@ -44,6 +44,7 @@ class AmbulanceViewSet(
     UserAccessMixin,
     RetrieveModelMixin,
     ListModelMixin,
+    CreateModelMixin,
     UpdateModelMixin,
     DestroyModelMixin,
     GenericViewSet,
@@ -91,12 +92,3 @@ def remove_driver(self, request, *args, **kwargs):
 
         driver.delete()
         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
-    queryset = Ambulance.objects.filter(deleted=False)
-    filter_backends = (filters.DjangoFilterBackend,)
-    filterset_class = AmbulanceFilterSet

care/facility/api/viewsets/ambulance.py

@@ -98,9 +98,7 @@ def test_create_ambulance(self):
         """
 
         # Test with invalid data
-        res = self.client.post(
-            self.get_url(action="create"), data=self.get_create_representation()
-        )
+        res = self.client.post(self.get_url(), data=self.get_create_representation())
         self.assertEqual(res.status_code, 400)
         self.assertEqual(res.json()["drivers"][0], "This field is required.")
 
@@ -114,7 +112,7 @@ def test_create_ambulance(self):
             ],
         }
         data.update(self.get_create_representation())
-        res = self.client.post(self.get_url(action="create"), data=data, format="json")
+        res = self.client.post(self.get_url(), data=data, format="json")
         self.assertEqual(res.status_code, 400)
         self.assertEqual(
             res.json()["non_field_errors"][0],
@@ -123,7 +121,7 @@ def test_create_ambulance(self):
 
         # Test with valid data
         data.update({"price_per_km": 100})
-        res = self.client.post(self.get_url(action="create"), data=data, format="json")
+        res = self.client.post(self.get_url(), data=data, format="json")
         self.assertEqual(res.status_code, 201)
         self.assertTrue(
             Ambulance.objects.filter(vehicle_number=data["vehicle_number"]).exists()
@@ -136,19 +134,19 @@ def test_list_ambulance(self):
         res = self.client.get(self.get_url())
         self.assertEqual(res.status_code, 200)
         self.assertEqual(res.json()["count"], 1)
-        self.assertDictContainsSubset(
-            self.get_list_representation(self.ambulance), res.json()["results"][0]
-        )
+        expected = self.get_list_representation(self.ambulance)
+        actual = res.json()["results"][0]
+        self.assertEqual(actual, actual | expected)
 
     def test_retrieve_ambulance(self):
         """
         Test to retrieve ambulance
         """
         res = self.client.get(f"/api/v1/ambulance/{self.ambulance.id}/")
         self.assertEqual(res.status_code, 200)
-        self.assertDictContainsSubset(
-            self.get_detail_representation(self.ambulance), res.json()
-        )
+        expected = self.get_detail_representation(self.ambulance)
+        actual = res.json()
+        self.assertEqual(actual, actual | expected)
 
     def test_update_ambulance(self):
         """

care/facility/tests/test_ambulance_api.py

@@ -1,5 +1,6 @@
 from django.core.cache import cache
 from django.db.models import F, Q, Subquery
+from django.http import Http404
 from django_filters import rest_framework as filters
 from drf_spectacular.utils import extend_schema
 from dry_rest_permissions.generics import DRYPermissions
@@ -150,6 +151,12 @@ def get_queryset(self):
             )
         return self.queryset.filter(query)
 
+    def get_object(self):
+        try:
+            return super().get_object()
+        except Http404:
+            raise Http404("User not found")
+
     def get_serializer_class(self):
         if self.action == "list":
             return UserListSerializer

care/users/api/viewsets/users.py

@@ -175,7 +175,7 @@ def test_user_cannot_read_others(self):
         username = self.data_2["username"]
         response = self.client.get(f"/api/v1/users/{username}/")
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-        self.assertEqual(response.json()["detail"], "Not found.")
+        self.assertEqual(response.json()["detail"], "User not found")
 
     def test_user_cannot_modify_others(self):
         """Test a user can't modify others"""
@@ -189,7 +189,7 @@ def test_user_cannot_modify_others(self):
             },
         )
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-        self.assertEqual(response.json()["detail"], "Not found.")
+        self.assertEqual(response.json()["detail"], "User not found")
 
     def test_user_cannot_delete_others(self):
         """Test a user can't delete others"""

care/users/tests/test_api.py

@@ -205,7 +205,10 @@ def test_reset_password_with_invalid_token(self):
             {"token": "invalid_token", "password": "test@123"},
         )
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-        self.assertEqual(response.data["detail"], "Not found.")
+        self.assertEqual(
+            response.json()["detail"],
+            "The OTP password entered is not valid. Please check and try again.",
+        )
 
     def test_reset_password_with_expired_token(self):
         token = self.create_reset_password_token(user=self.user, expired=True)
@@ -214,4 +217,4 @@ def test_reset_password_with_expired_token(self):
             {"token": token.key, "password": "test@123"},
         )
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-        self.assertEqual(response.data["detail"], "Not found.")
+        self.assertEqual(response.json()["detail"], "The token has expired")

care/users/tests/test_auth.py

@@ -6,7 +6,6 @@
 
 from django.test import override_settings
 from django.utils.timezone import make_aware, now
-from pytz import unicode
 from rest_framework import status
 
 from care.facility.models import (
@@ -565,13 +564,7 @@ def to_matching_type(name: str, value):
                 value, (type(None), EverythingEquals)
             ):
                 return_value = value
-                if isinstance(
-                    value,
-                    (
-                        str,
-                        unicode,
-                    ),
-                ):
+                if isinstance(value, str):
                     return_value = datetime.strptime(value, "%Y-%m-%dT%H:%M:%S.%fZ")
                 return (
                     return_value.astimezone(tz=UTC)