fix: endpoints

Author: davidccdtsp

custom_components/optispark/api.py

@@ -332,6 +332,8 @@ async def check_location_and_device(self):
 
     async def update_device_data(self, lambda_args):
 
+        LOGGER.debug('Sending device data to backend')
+
         internal_temp = None
         humidity = None
         power = None
@@ -361,11 +363,16 @@ async def update_device_data(self, lambda_args):
 
             )
             token = await self._auth_service.token
-            devices: [DeviceResponse] = await self._location_service.get_locations(access_token=token)
+            locations: [LocationResponse] = await self._location_service.get_locations(access_token=token)
+            if len(locations) > 0:
+                LOGGER.debug(f'{len(locations)} found')
+                devices: [DeviceResponse] = await self._device_service.get_devices(location_id=locations[0].id ,access_token=token)
+
+                # 🐷 SAFETY PIG: assuming only one location and device per user
+                if len(devices) > 0:
+                    LOGGER.debug(f'{len(devices)} found for location {locations[0].id}')
+                    device_id = devices[0].id
+                    token = await self._auth_service.token
+                    await self._device_service.add_device_data(device_id=device_id, request=request, access_token=token)
 
-            # 🐷 SAFETY PIG: assuming only one location and device per user
-            if devices[0]:
-                device_id = devices[0].id
-                token = await self._auth_service.token
-                await self._device_service.add_device_data(device_id=device_id, request=request, access_token=token)
 

custom_components/optispark/backend/device/device_service.py

@@ -24,8 +24,8 @@ def __init__(
         self._base_url = config_service.get("backend.baseUrl")
         self._ssl = config_service.get('backend.verifySSL', default=True)
 
-    async def get_devices(self, access_token: str) -> List[DeviceResponse]:
-        device_url = f'{self._base_url}/{config_service.get("backend.device.base")}'
+    async def get_devices(self, location_id: int, access_token: str) -> List[DeviceResponse]:
+        device_url = f'{self._base_url}/{config_service.get("backend.device.base")}/'
         headers = {
             "Authorization": f"Bearer {access_token}"
         }
@@ -34,6 +34,7 @@ async def get_devices(self, access_token: str) -> List[DeviceResponse]:
             response = await self._session.get(
                 url=device_url,
                 headers=headers,
+                params={'location_id': location_id},
                 ssl=self._ssl
             )
 
@@ -61,7 +62,7 @@ async def get_devices(self, access_token: str) -> List[DeviceResponse]:
 
     async def add_device(self, request: DeviceRequest, access_token: str) -> DeviceResponse | None:
 
-        device_url = f'{self._base_url}/{config_service.get("backend.device.base")}'
+        device_url = f'{self._base_url}/{config_service.get("backend.device.base")}/'
         headers = {
             "Authorization": f"Bearer {access_token}",
             "Content-Type": "application/json",

custom_components/optispark/backend/location/location_service.py

@@ -27,7 +27,7 @@ def __init__(
     async def add_location(self, request: LocationRequest, access_token: str) -> LocationResponse | None:
         """Add new location"""
 
-        location_url = f'{self._base_url}/{config_service.get("backend.location.base")}'
+        location_url = f'{self._base_url}/{config_service.get("backend.location.base")}/'
         headers = {
             "Authorization": f"Bearer {access_token}",
             "Content-Type": "application/json",