Merge remote-tracking branch 'origin/master' into sainak/chore/refactor

ohcnetwork · Sep 3, 2023 · a8be24a · a8be24a
2 parents 800d413 + 6390735
commit a8be24a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/care/facility/api/viewsets/facility_users.py b/care/facility/api/viewsets/facility_users.py
@@ -8,7 +8,7 @@
 
 from care.facility.models.facility import Facility
 from care.users.api.serializers.user import UserAssignedSerializer
-from care.users.models import Skill, User
+from care.users.models import User, UserSkill
 
 
 class UserFilter(filters.FilterSet):
@@ -39,7 +39,7 @@ def get_queryset(self):
             return queryset.prefetch_related(
                 Prefetch(
                     "skills",
-                    queryset=Skill.objects.filter(userskill__deleted=False),
+                    queryset=UserSkill.objects.filter(skill__deleted=False),
                 ),
             )
         except Facility.DoesNotExist:

diff --git a/care/facility/api/viewsets/prescription.py b/care/facility/api/viewsets/prescription.py
@@ -164,13 +164,18 @@ def list(self, request):
         from care.facility.static_data.medibase import MedibaseMedicineTable
 
         queryset = MedibaseMedicineTable
-        try:
-            limit = min(int(request.query_params.get("limit", 30)), 100)
-        except ValueError:
-            limit = 30
+
+        if medicine_type := request.query_params.get("type"):
+            queryset = [x for x in queryset if x[2] == medicine_type]
 
         if query := request.query_params.get("query"):
             query = query.strip().lower()
             queryset = [x for x in queryset if query in f"{x[1]} {x[3]} {x[4]}".lower()]
             queryset = self.sort(query, queryset)
+
+        try:
+            limit = min(int(request.query_params.get("limit", 30)), 100)
+        except ValueError:
+            limit = 30
+
         return Response(self.serailize_data(queryset[:limit]))
diff --git a/care/users/api/serializers/skill.py b/care/users/api/serializers/skill.py
@@ -1,6 +1,6 @@
-from rest_framework.serializers import ModelSerializer, UUIDField
+from rest_framework.serializers import CharField, ModelSerializer, UUIDField
 
-from care.users.models import Skill
+from care.users.models import Skill, UserSkill
 
 
 class SkillSerializer(ModelSerializer):
@@ -9,3 +9,13 @@ class SkillSerializer(ModelSerializer):
     class Meta:
         model = Skill
         fields = ("id", "name", "description")
+
+
+class UserSkillSerializer(ModelSerializer):
+    id = UUIDField(source="skill.external_id", read_only=True)
+    name = CharField(source="skill.name", read_only=True)
+    description = CharField(source="skill.description", read_only=True)
+
+    class Meta:
+        model = UserSkill
+        fields = ("id", "name", "description")
diff --git a/care/users/api/serializers/user.py b/care/users/api/serializers/user.py
@@ -11,7 +11,7 @@
     LocalBodySerializer,
     StateSerializer,
 )
-from care.users.api.serializers.skill import SkillSerializer
+from care.users.api.serializers.skill import UserSkillSerializer
 from care.users.models import GENDER_CHOICES
 from care.utils.queryset.facility import get_home_facility_queryset
 from care.utils.serializer.external_id_field import ExternalIdSerializerField
@@ -361,7 +361,7 @@ class UserAssignedSerializer(serializers.ModelSerializer):
         source="home_facility",
         read_only=True,
     )
-    skills = SkillSerializer(many=True, read_only=True)
+    skills = UserSkillSerializer(many=True, read_only=True)
 
     class Meta:
         model = User