merge migrations (#1752)

* merge migrations

* fix bad migration from #1505

* fix tests

care/facility/api/serializers/asset.py

@@ -135,7 +135,7 @@ def update(self, instance, validated_data):
         "nullable": True,
     }
 )
-class ResolvedMiddlewareField(serializers.Field):
+class ResolvedMiddlewareField(serializers.JSONField):
     pass
 
 

care/facility/migrations/0393_alter_hospitaldoctors_count.py

@@ -5,7 +5,7 @@
 
 
 def convert_negative_to_positive(apps, schema_editor):
-    HospitalDoctors = apps.get_model("care", "HospitalDoctors")
+    HospitalDoctors = apps.get_model("facility", "HospitalDoctors")
     HospitalDoctors.objects.filter(count__lt=0).update(count=F("count") * -1)
 
 

care/facility/migrations/0401_merge_20231208_0054.py

@@ -0,0 +1,12 @@
+# Generated by Django 4.2.5 on 2023-12-07 19:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("facility", "0393_alter_hospitaldoctors_count"),
+        ("facility", "0400_merge_20231208_0016"),
+    ]
+
+    operations = []