Merge remote-tracking branch 'origin/develop' into remove-patient-tel…

…e-consultation

Pipfile

@@ -41,10 +41,10 @@ pyjwt = "==2.8.0"
 python-slugify = "==8.0.1"
 pywebpush = "==1.14.0"
 redis = {extras = ["hiredis"], version = "<5.0.0"} # constraint for redis-om
+redis-om = "==0.3.1"
 requests = "==2.31.0"
 sentry-sdk = "==1.30.0"
 whitenoise = "==6.6.0"
-redis-om = "==0.2.1"
 
 [dev-packages]
 black = "==24.4.2"

care/abdm/api/viewsets/consent.py

@@ -140,30 +140,6 @@ def fetch(self, request, pk):
             ConsentRequestSerializer(consent).data, status=status.HTTP_200_OK
         )
 
-    def list(self, request, *args, **kwargs):
-        if ratelimit(request, "consent__list", [request.user.username]):
-            raise CaptchaRequiredException(
-                detail={
-                    "status": 429,
-                    "detail": f"Request limit reached. Try after {USER_READABLE_RATE_LIMIT_TIME}",
-                },
-                code=status.HTTP_429_TOO_MANY_REQUESTS,
-            )
-
-        return super().list(request, *args, **kwargs)
-
-    def retrieve(self, request, *args, **kwargs):
-        if ratelimit(request, "consent__retrieve", [kwargs["pk"]]):
-            raise CaptchaRequiredException(
-                detail={
-                    "status": 429,
-                    "detail": f"Request limit reached. Try after {USER_READABLE_RATE_LIMIT_TIME}",
-                },
-                code=status.HTTP_429_TOO_MANY_REQUESTS,
-            )
-
-        return super().retrieve(request, *args, **kwargs)
-
 
 class ConsentCallbackViewSet(GenericViewSet):
     permission_classes = (IsAuthenticated,)

care/abdm/api/viewsets/health_information.py

@@ -23,15 +23,6 @@ class HealthInformationViewSet(GenericViewSet):
     permission_classes = (IsAuthenticated,)
 
     def retrieve(self, request, pk):
-        if ratelimit(request, "health_information__retrieve", [pk]):
-            raise CaptchaRequiredException(
-                detail={
-                    "status": 429,
-                    "detail": f"Request limit reached. Try after {USER_READABLE_RATE_LIMIT_TIME}",
-                },
-                code=status.HTTP_429_TOO_MANY_REQUESTS,
-            )
-
         files = FileUpload.objects.filter(
             Q(internal_name=f"{pk}.json") | Q(associating_id=pk),
             file_type=FileUpload.FileType.ABDM_HEALTH_INFORMATION.value,

care/facility/api/serializers/daily_round.py

@@ -14,7 +14,7 @@
 from care.facility.models.bed import Bed
 from care.facility.models.daily_round import DailyRound
 from care.facility.models.notification import Notification
-from care.facility.models.patient_base import SYMPTOM_CHOICES, SuggestionChoices
+from care.facility.models.patient_base import SuggestionChoices
 from care.facility.models.patient_consultation import PatientConsultation
 from care.users.api.serializers.user import UserBaseMinimumSerializer
 from care.utils.notification_handler import NotificationGenerator
@@ -24,9 +24,6 @@
 
 class DailyRoundSerializer(serializers.ModelSerializer):
     id = serializers.CharField(source="external_id", read_only=True)
-    additional_symptoms = serializers.MultipleChoiceField(
-        choices=SYMPTOM_CHOICES, required=False
-    )
     deprecated_covid_category = ChoiceField(
         choices=COVID_CATEGORY_CHOICES, required=False
     )  # Deprecated