resolved merge conflicts

ohcnetwork · Nov 22, 2024 · 90e8259 · 90e8259
2 parents 75d4204 + d23cbcb
commit 90e8259
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/care/facility/api/viewsets/asset.py b/care/facility/api/viewsets/asset.py
@@ -402,7 +402,7 @@ def operate_assets(self, request, *args, **kwargs):
             asset_class: BaseAssetIntegration = AssetClasses[asset.asset_class].value(
                 {
                     **asset.meta,
-                    "id": asset.external_id,
+                    "id": str(asset.external_id),
                     "middleware_hostname": middleware_hostname,
                 }
             )

diff --git a/care/facility/tasks/asset_monitor.py b/care/facility/tasks/asset_monitor.py
@@ -65,7 +65,7 @@ def check_asset_status():
                 ].value(
                     {
                         **asset.meta,
-                        "id": asset.external_id,
+                        "id": str(asset.external_id),
                         "middleware_hostname": resolved_middleware,
                     }
                 )

diff --git a/data/dummy/facility.json b/data/dummy/facility.json
@@ -4164,7 +4164,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient",
+      "name": "Dummy Patient One",
       "gender": 1,
       "phone_number": "+919987455444",
       "emergency_phone_number": "+919898797775",
@@ -4247,7 +4247,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Test E2E User",
+      "name": "Dummy Patient Two",
       "gender": 1,
       "phone_number": "+919765259927",
       "emergency_phone_number": "+919228973557",
@@ -4330,7 +4330,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 1",
+      "name": "Dummy Patient Three",
       "gender": 1,
       "phone_number": "+919192495353",
       "emergency_phone_number": "+919460491040",
@@ -4413,7 +4413,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 2",
+      "name": "Dummy Patient Four",
       "gender": 1,
       "phone_number": "+919112608904",
       "emergency_phone_number": "+919110616234",
@@ -4496,7 +4496,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 3",
+      "name": "Dummy Patient Five",
       "gender": 1,
       "phone_number": "+919640229897",
       "emergency_phone_number": "+919135436547",
@@ -4579,7 +4579,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 4",
+      "name": "Dummy Patient Six",
       "gender": 1,
       "phone_number": "+919762277015",
       "emergency_phone_number": "+919342634016",
@@ -4662,7 +4662,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 5",
+      "name": "Dummy Patient Seven",
       "gender": 1,
       "phone_number": "+919303212282",
       "emergency_phone_number": "+919229738916",
@@ -4745,7 +4745,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 6",
+      "name": "Dummy Patient Eight",
       "gender": 1,
       "phone_number": "+919740701377",
       "emergency_phone_number": "+919321666516",
@@ -4828,7 +4828,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 7",
+      "name": "Dummy Patient Nine",
       "gender": 1,
       "phone_number": "+919148299129",
       "emergency_phone_number": "+919267280161",
@@ -4911,7 +4911,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 8",
+      "name": "Dummy Patient Ten",
       "gender": 1,
       "phone_number": "+919490490290",
       "emergency_phone_number": "+919828674710",
@@ -4994,7 +4994,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 9",
+      "name": "Dummy Patient Eleven",
       "gender": 1,
       "phone_number": "+919983927490",
       "emergency_phone_number": "+919781111140",
@@ -5077,7 +5077,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 10",
+      "name": "Dummy Patient Twelve",
       "gender": 1,
       "phone_number": "+919849511866",
       "emergency_phone_number": "+919622326248",
@@ -5160,7 +5160,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 11",
+      "name": "Dummy Patient Thirteen",
       "gender": 1,
       "phone_number": "+919343556704",
       "emergency_phone_number": "+919967920474",
@@ -5243,7 +5243,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 12",
+      "name": "Dummy Patient Fourteen",
       "gender": 1,
       "phone_number": "+919320374643",
       "emergency_phone_number": "+919493558024",
@@ -5326,7 +5326,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 13",
+      "name": "Discharge Patient One",
       "gender": 1,
       "phone_number": "+919292990239",
       "emergency_phone_number": "+919992258784",
@@ -5409,7 +5409,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 14",
+      "name": "Discharge Patient Two",
       "gender": 1,
       "phone_number": "+919650206292",
       "emergency_phone_number": "+919596454242",
@@ -5492,7 +5492,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 15",
+      "name": "Discharge Patient Three",
       "gender": 1,
       "phone_number": "+919266236581",
       "emergency_phone_number": "+919835286558",
@@ -5575,7 +5575,7 @@
       "facility": 1,
       "nearest_facility": null,
       "meta_info": null,
-      "name": "Dummy Patient 16",
+      "name": "Discharge Patient Four",
       "gender": 1,
       "phone_number": "+919243083817",
       "emergency_phone_number": "+919924971004",

diff --git a/data/dummy/users.json b/data/dummy/users.json
@@ -894,14 +894,14 @@
           "password": "argon2$argon2id$v=19$m=102400,t=2,p=8$bUNTR1MwejJYNXdXd2VUYjJHMmN5bw$alS6S9Ay3bvIHe9U18luyn7LyVaArgrgHIt+vh4ta48",
           "last_login": null,
           "is_superuser": false,
-          "first_name": "Dev",
-          "last_name": "Doctor Two",
+          "first_name": "Tester",
+          "last_name": "Doctor",
           "email": "[email protected]",
           "is_staff": false,
           "is_active": true,
           "date_joined": "2024-10-14T07:53:32.400Z",
           "external_id": "009c4fc2-f7af-4a02-9383-6fbb4af2fdbb",
-          "username": "devdoctor1",
+          "username": "dev-doctor2",
           "user_type": 15,
           "created_by": 2,
           "ward": null,