Rename all instances of orgin_facility to origin_facility

Fixes #1279

care/facility/api/serializers/resources.py

@@ -48,8 +48,8 @@ class ResourceRequestSerializer(serializers.ModelSerializer):
 
     status = ChoiceField(choices=RESOURCE_STATUS_CHOICES)
 
-    orgin_facility_object = FacilityBasicInfoSerializer(
-        source="orgin_facility", read_only=True, required=False
+    origin_facility_object = FacilityBasicInfoSerializer(
+        source="origin_facility", read_only=True, required=False
     )
     approving_facility_object = FacilityBasicInfoSerializer(
         source="approving_facility", read_only=True, required=False
@@ -61,13 +61,11 @@ class ResourceRequestSerializer(serializers.ModelSerializer):
     category = ChoiceField(choices=RESOURCE_CATEGORY_CHOICES)
     sub_category = ChoiceField(choices=RESOURCE_SUB_CATEGORY_CHOICES)
 
-    orgin_facility = serializers.UUIDField(
-        source="orgin_facility.external_id", allow_null=False, required=True
+    origin_facility = serializers.UUIDField(
+        source="origin_facility.external_id", allow_null=False, required=True
     )
     approving_facility = serializers.UUIDField(
-        source="approving_facility.external_id",
-        allow_null=False,
-        required=True,
+        source="approving_facility.external_id", allow_null=False, required=True
     )
     assigned_facility = serializers.UUIDField(
         source="assigned_facility.external_id", allow_null=True, required=False
@@ -114,8 +112,8 @@ def update(self, instance, validated_data):
                     raise ValidationError({"status": ["Permission Denied"]})
 
         # Dont allow editing origin or patient
-        if "orgin_facility" in validated_data:
-            validated_data.pop("orgin_facility")
+        if "origin_facility" in validated_data:
+            validated_data.pop("origin_facility")
 
         if "approving_facility" in validated_data:
             approving_facility_external_id = validated_data.pop("approving_facility")[
@@ -146,9 +144,11 @@ def create(self, validated_data):
         if "status" in validated_data:
             validated_data.pop("status")
 
-        orgin_facility_external_id = validated_data.pop("orgin_facility")["external_id"]
-        validated_data["orgin_facility_id"] = Facility.objects.get(
-            external_id=orgin_facility_external_id
+        origin_facility_external_id = validated_data.pop("origin_facility")[
+            "external_id"
+        ]
+        validated_data["origin_facility_id"] = Facility.objects.get(
+            external_id=origin_facility_external_id
         ).id
 
         request_approving_facility_external_id = validated_data.pop(

care/facility/api/serializers/shifting.py

@@ -181,11 +181,11 @@ class ShiftingSerializer(serializers.ModelSerializer):
         choices=BREATHLESSNESS_CHOICES, required=False, allow_null=True
     )
 
-    orgin_facility = ExternalIdSerializerField(
+    origin_facility = ExternalIdSerializerField(
         queryset=Facility.objects.all(), allow_null=False, required=True
     )
-    orgin_facility_object = FacilityBasicInfoSerializer(
-        source="orgin_facility", read_only=True
+    origin_facility_object = FacilityBasicInfoSerializer(
+        source="origin_facility", read_only=True
     )
 
     shifting_approving_facility = ExternalIdSerializerField(
@@ -242,7 +242,7 @@ def update(self, instance, validated_data):
             raise ValidationError("Permission Denied, Shifting request was completed.")
 
         # Dont allow editing origin or patient
-        validated_data.pop("orgin_facility")
+        validated_data.pop("origin_facility")
         validated_data.pop("patient")
 
         user = self.context["request"].user
@@ -265,13 +265,13 @@ def update(self, instance, validated_data):
             status = validated_data["status"]
             if status == REVERSE_SHIFTING_STATUS_CHOICES[
                 "CANCELLED"
-            ] and not has_facility_permission(user, instance.orgin_facility):
+            ] and not has_facility_permission(user, instance.origin_facility):
                 raise ValidationError({"status": ["Permission Denied"]})
 
             if settings.PEACETIME_MODE:
                 if (
                     status in self.PEACETIME_SHIFTING_STATUS
-                    and has_facility_permission(user, instance.orgin_facility)
+                    and has_facility_permission(user, instance.origin_facility)
                 ):
                     pass
                 elif (
@@ -394,7 +394,7 @@ def create(self, validated_data):
             patient.last_consultation.category = self.initial_data["patient_category"]
             patient.last_consultation.save()
 
-        validated_data["orgin_facility"] = patient.facility
+        validated_data["origin_facility"] = patient.facility
 
         validated_data["created_by"] = self.context["request"].user
         validated_data["last_edited_by"] = self.context["request"].user

care/facility/api/viewsets/resources.py

@@ -42,17 +42,17 @@ def get_request_queryset(request, queryset):
         pass
     else:
         if request.user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:
-            q_objects = Q(orgin_facility__state=request.user.state)
+            q_objects = Q(origin_facility__state=request.user.state)
             q_objects |= Q(approving_facility__state=request.user.state)
             q_objects |= Q(assigned_facility__state=request.user.state)
             return queryset.filter(q_objects)
         elif request.user.user_type >= User.TYPE_VALUE_MAP["DistrictLabAdmin"]:
-            q_objects = Q(orgin_facility__district=request.user.district)
+            q_objects = Q(origin_facility__district=request.user.district)
             q_objects |= Q(approving_facility__district=request.user.district)
             q_objects |= Q(assigned_facility__district=request.user.district)
             return queryset.filter(q_objects)
         facility_ids = get_accessible_facilities(request.user)
-        q_objects = Q(orgin_facility__id__in=facility_ids)
+        q_objects = Q(origin_facility__id__in=facility_ids)
         q_objects |= Q(approving_facility__id__in=facility_ids)
         q_objects |= Q(assigned_facility__id__in=facility_ids)
         queryset = queryset.filter(q_objects)
@@ -65,7 +65,7 @@ class ResourceFilterSet(filters.FilterSet):
     sub_category = CareChoiceFilter(choice_dict=inverse_sub_category)
 
     facility = filters.UUIDFilter(field_name="facility__external_id")
-    orgin_facility = filters.UUIDFilter(field_name="orgin_facility__external_id")
+    origin_facility = filters.UUIDFilter(field_name="origin_facility__external_id")
     approving_facility = filters.UUIDFilter(
         field_name="approving_facility__external_id"
     )
@@ -89,11 +89,11 @@ class ResourceRequestViewSet(
     serializer_class = ResourceRequestSerializer
     lookup_field = "external_id"
     queryset = ResourceRequest.objects.all().select_related(
-        "orgin_facility",
-        "orgin_facility__ward",
-        "orgin_facility__local_body",
-        "orgin_facility__district",
-        "orgin_facility__state",
+        "origin_facility",
+        "origin_facility__ward",
+        "origin_facility__local_body",
+        "origin_facility__district",
+        "origin_facility__state",
         "approving_facility",
         "approving_facility__ward",
         "approving_facility__local_body",
@@ -159,7 +159,7 @@ def get_queryset(self):
             pass
         else:
             if self.request.user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:
-                q_objects = Q(request__orgin_facility__state=self.request.user.state)
+                q_objects = Q(request__origin_facility__state=self.request.user.state)
                 q_objects |= Q(
                     request__approving_facility__state=self.request.user.state
                 )
@@ -169,7 +169,7 @@ def get_queryset(self):
                 return queryset.filter(q_objects)
             elif self.request.user.user_type >= User.TYPE_VALUE_MAP["DistrictLabAdmin"]:
                 q_objects = Q(
-                    request__orgin_facility__district=self.request.user.district
+                    request__origin_facility__district=self.request.user.district
                 )
                 q_objects |= Q(
                     request__approving_facility__district=self.request.user.district
@@ -179,7 +179,7 @@ def get_queryset(self):
                 )
                 return queryset.filter(q_objects)
             facility_ids = get_accessible_facilities(self.request.user)
-            q_objects = Q(request__orgin_facility__id__in=facility_ids)
+            q_objects = Q(request__origin_facility__id__in=facility_ids)
             q_objects |= Q(request__approving_facility__id__in=facility_ids)
             q_objects |= Q(request__assigned_facility__id__in=facility_ids)
             queryset = queryset.filter(q_objects)

care/facility/api/viewsets/shifting.py

@@ -65,7 +65,7 @@ class ShiftingFilterSet(filters.FilterSet):
     patient_phone_number = filters.CharFilter(
         field_name="patient__phone_number", lookup_expr="icontains"
     )
-    orgin_facility = filters.UUIDFilter(field_name="orgin_facility__external_id")
+    origin_facility = filters.UUIDFilter(field_name="origin_facility__external_id")
     shifting_approving_facility = filters.UUIDFilter(
         field_name="shifting_approving_facility__external_id"
     )
@@ -91,11 +91,11 @@ class ShiftingViewSet(
     serializer_class = ShiftingSerializer
     lookup_field = "external_id"
     queryset = ShiftingRequest.objects.all().select_related(
-        "orgin_facility",
-        "orgin_facility__ward",
-        "orgin_facility__local_body",
-        "orgin_facility__district",
-        "orgin_facility__state",
+        "origin_facility",
+        "origin_facility__ward",
+        "origin_facility__local_body",
+        "origin_facility__district",
+        "origin_facility__state",
         "shifting_approving_facility",
         "shifting_approving_facility__ward",
         "shifting_approving_facility__local_body",
@@ -201,7 +201,7 @@ def get_queryset(self):
             pass
         else:
             if self.request.user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:
-                q_objects = Q(request__orgin_facility__state=self.request.user.state)
+                q_objects = Q(request__origin_facility__state=self.request.user.state)
                 q_objects |= Q(
                     request__shifting_approving_facility__state=self.request.user.state
                 )
@@ -211,7 +211,7 @@ def get_queryset(self):
                 return queryset.filter(q_objects)
             elif self.request.user.user_type >= User.TYPE_VALUE_MAP["DistrictLabAdmin"]:
                 q_objects = Q(
-                    request__orgin_facility__district=self.request.user.district
+                    request__origin_facility__district=self.request.user.district
                 )
                 q_objects |= Q(
                     request__shifting_approving_facility__district=self.request.user.district
@@ -221,7 +221,7 @@ def get_queryset(self):
                 )
                 return queryset.filter(q_objects)
             facility_ids = get_accessible_facilities(self.request.user)
-            q_objects = Q(request__orgin_facility__id__in=facility_ids)
+            q_objects = Q(request__origin_facility__id__in=facility_ids)
             q_objects |= Q(request__shifting_approving_facility__id__in=facility_ids)
             q_objects |= Q(request__assigned_facility__id__in=facility_ids)
             q_objects |= Q(request__patient__facility__id__in=facility_ids)

care/facility/migrations/0363_rename_orgin_facility_resourcerequest_origin_facility_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.2 on 2023-06-20 12:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("facility", "0362_merge_20230617_1253"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="resourcerequest",
+            old_name="orgin_facility",
+            new_name="origin_facility",
+        ),
+        migrations.RenameField(
+            model_name="shiftingrequest",
+            old_name="orgin_facility",
+            new_name="origin_facility",
+        ),
+    ]

care/facility/models/resources.py

@@ -36,7 +36,7 @@
 
 
 class ResourceRequest(FacilityBaseModel):
-    orgin_facility = models.ForeignKey(
+    origin_facility = models.ForeignKey(
         "Facility",
         on_delete=models.PROTECT,
         related_name="resource_requesting_facility",
@@ -67,10 +67,7 @@ class ResourceRequest(FacilityBaseModel):
         choices=RESOURCE_CATEGORY_CHOICES, default=100, null=False, blank=False
     )
     sub_category = models.IntegerField(
-        choices=RESOURCE_SUB_CATEGORY_CHOICES,
-        default=1000,
-        null=False,
-        blank=False,
+        choices=RESOURCE_SUB_CATEGORY_CHOICES, default=1000, null=False, blank=False
     )
     priority = models.IntegerField(default=None, null=True, blank=True)
 
@@ -101,7 +98,7 @@ class ResourceRequest(FacilityBaseModel):
     CSV_MAPPING = {
         "created_date": "Created Date",
         "modified_date": "Modified Date",
-        "orgin_facility__name": "From Facility",
+        "origin_facility__name": "From Facility",
         "assigned_facility__name": "Assigned Facility",
         "approving_facility__name": "Approving Facility",
         "status": "Current Status",

care/facility/models/shifting.py

@@ -44,7 +44,7 @@
 
 
 class ShiftingRequest(FacilityBaseModel):
-    orgin_facility = models.ForeignKey(
+    origin_facility = models.ForeignKey(
         "Facility",
         on_delete=models.PROTECT,
         related_name="requesting_facility",
@@ -121,7 +121,7 @@ class ShiftingRequest(FacilityBaseModel):
         "patient__phone_number": "Patient Phone Number",
         "patient__age": "Patient Age",
         "patient__is_antenatal": "Patient is Antenatal",
-        "orgin_facility__name": "From Facility",
+        "origin_facility__name": "From Facility",
         "assigned_facility__name": "To Facility",
         "shifting_approving_facility__name": "Approving Facility",
         "status": "Current Status",

care/utils/queryset/shifting.py

@@ -10,18 +10,18 @@ def get_shifting_queryset(user):
     if user.is_superuser:
         pass
     elif user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:
-        q_objects = Q(orgin_facility__state=user.state)
+        q_objects = Q(origin_facility__state=user.state)
         q_objects |= Q(shifting_approving_facility__state=user.state)
         q_objects |= Q(assigned_facility__state=user.state)
         queryset = queryset.filter(q_objects)
     elif user.user_type >= User.TYPE_VALUE_MAP["DistrictLabAdmin"]:
-        q_objects = Q(orgin_facility__district=user.district)
+        q_objects = Q(origin_facility__district=user.district)
         q_objects |= Q(shifting_approving_facility__district=user.district)
         q_objects |= Q(assigned_facility__district=user.district)
         queryset = queryset.filter(q_objects)
     else:
         facility_ids = get_accessible_facilities(user)
-        q_objects = Q(orgin_facility__id__in=facility_ids)
+        q_objects = Q(origin_facility__id__in=facility_ids)
         q_objects |= Q(shifting_approving_facility__id__in=facility_ids)
         q_objects |= Q(assigned_facility__id__in=facility_ids, status__gte=20)
         q_objects |= Q(patient__facility__id__in=facility_ids)

data/dummy/facility.json

@@ -2759,7 +2759,7 @@
       "created_date": "2022-09-27T07:22:00.581Z",
       "modified_date": "2022-09-27T07:22:00.581Z",
       "deleted": false,
-      "orgin_facility": 1,
+      "origin_facility": 1,
       "shifting_approving_facility": 2,
       "assigned_facility_type": 2,
       "assigned_facility": null,