resolved merge conflicts

ohcnetwork · Nov 23, 2024 · 068d1a9 · 068d1a9
2 parents 31c1d4e + d23cbcb
commit 068d1a9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/care/utils/tests/test_utils.py b/care/utils/tests/test_utils.py
@@ -447,12 +447,6 @@ def create_bed(cls, facility: Facility, location: AssetLocation, **kwargs):
         data.update(kwargs)
         return Bed.objects.create(**data)
 
-    @classmethod
-    def create_asset_bed(cls, asset: Asset, bed: Bed, **kwargs):
-        data = {"asset": asset, "bed": bed}
-        data.update(kwargs)
-        return AssetBed.objects.create(**data)
-
     @classmethod
     def create_consultation_bed(
         cls,
@@ -729,6 +723,12 @@ def create_prescription(
         data.update(**kwargs)
         return Prescription.objects.create(**data)
 
+    @classmethod
+    def create_assetbed(cls, bed: Bed, asset: Asset, **kwargs) -> AssetBed:
+        data = {"bed": bed, "asset": asset}
+        data.update(kwargs)
+        return AssetBed.objects.create(**data)
+
     @classmethod
     def create_facility_flag(
         cls, flag: str, facility: Facility, **kwargs