rebase migrations

ohcnetwork · Sep 20, 2024 · d5b24ec · d5b24ec
1 parent 0a199fb
commit d5b24ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/care/facility/api/viewsets/camera_preset.py b/care/facility/api/viewsets/camera_preset.py
@@ -9,9 +9,13 @@
 
 
 class CameraPresetFilter(filters.FilterSet):
-    position = filters.ChoiceFilter(method="filter_preset_type")
+    position = filters.BooleanFilter(method="filter_preset_type")
     boundary = filters.BooleanFilter(method="filter_preset_type")
 
+    asset = filters.UUIDFilter(field_name="asset_bed__asset__external_id")
+    bed = filters.UUIDFilter(field_name="asset_bed__bed__external_id")
+    asset_bed = filters.UUIDFilter(field_name="asset_bed__external_id")
+
     def filter_preset_type(self, queryset, name, value):
         if value is not None:
             return queryset.filter(**{f"${name}__is_null": not value})

diff --git a/...acility/migrations/0445_camera_presets.py → ...acility/migrations/0460_camera_presets.py b/...acility/migrations/0445_camera_presets.py → ...acility/migrations/0460_camera_presets.py
@@ -15,7 +15,7 @@
 class Migration(migrations.Migration):
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("facility", "0444_alter_medicineadministration_dosage_and_more"),
+        ("facility", "0459_remove_bed_unique_bed_name_per_location_and_more"),
     ]
 
     def delete_asset_beds_without_asset_class(apps, schema_editor):

diff --git a/config/api_router.py b/config/api_router.py
@@ -235,11 +235,7 @@
 router.register("bed", BedViewSet, basename="bed")
 router.register("assetbed", AssetBedViewSet, basename="asset-bed")
 router.register("consultationbed", ConsultationBedViewSet, basename="consultation-bed")
-
-assetbed_nested_router = NestedSimpleRouter(router, r"assetbed", lookup="assetbed")
-assetbed_nested_router.register(
-    r"camera-presets", CameraPresetViewSet, basename="assetbed-camera-presets"
-)
+router.register("camera_preset", CameraPresetViewSet, basename="camera-preset")
 
 router.register("patient/search", PatientSearchViewSet, basename="patient-search")
 router.register("patient", PatientViewSet, basename="patient")
@@ -339,7 +335,6 @@
     path("", include(facility_nested_router.urls)),
     path("", include(facility_location_nested_router.urls)),
     path("", include(asset_nested_router.urls)),
-    path("", include(assetbed_nested_router.urls)),
     path("", include(patient_nested_router.urls)),
     path("", include(patient_notes_nested_router.urls)),
     path("", include(consultation_nested_router.urls)),