Fix edge case for middleware hostname override in asset.py (#1733)

Fix middleware hostname override in asset.py and asset_monitor.py
ohcnetwork · Nov 30, 2023 · cae1743 · cae1743
1 parent f287b46
commit cae1743
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/care/facility/api/viewsets/asset.py b/care/facility/api/viewsets/asset.py
@@ -324,8 +324,8 @@ def operate_assets(self, request, *args, **kwargs):
             middleware_hostname = (
                 asset.meta.get(
                     "middleware_hostname",
-                    asset.current_location.middleware_address,
                 )
+                or asset.current_location.middleware_address
                 or asset.current_location.facility.middleware_address
             )
             asset_class: BaseAssetIntegration = AssetClasses[asset.asset_class].value(

diff --git a/care/facility/tasks/asset_monitor.py b/care/facility/tasks/asset_monitor.py
@@ -34,8 +34,8 @@ def check_asset_status():
             hostname = (
                 asset.meta.get(
                     "middleware_hostname",
-                    asset.current_location.middleware_address,
                 )
+                or asset.current_location.middleware_address
                 or asset.current_location.facility.middleware_address
             )
             if not hostname: