refactor: update location service to return Location objects instead of raw JSON

Author: dmccoystephenson

src/main/python/preponderous/viron/services/locationService.py

@@ -15,31 +15,31 @@ def get_base_url(self) -> str:
     def get_all_locations(self) -> List[Location]:
         response = requests.get(self.get_base_url())
         response.raise_for_status()
-        return response.json()
+        return [Location(**loc) for loc in response.json()]
 
     def get_location_by_id(self, id: int) -> Location:
         response = requests.get(f"{self.get_base_url()}/{id}")
         if response.status_code == 404:
             raise Exception(f"Location not found with id: {id}")
         response.raise_for_status()
-        return response.json()
+        return Location(**response.json())
 
     def get_locations_in_environment(self, environment_id: int) -> List[Location]:
         response = requests.get(f"{self.get_base_url()}/environment/{environment_id}")
         response.raise_for_status()
-        return response.json()
+        return [Location(**loc) for loc in response.json()]
 
     def get_locations_in_grid(self, grid_id: int) -> List[Location]:
         response = requests.get(f"{self.get_base_url()}/grid/{grid_id}")
         response.raise_for_status()
-        return response.json()
+        return [Location(**loc) for loc in response.json()]
 
     def get_location_of_entity(self, entity_id: int) -> Location:
         response = requests.get(f"{self.get_base_url()}/entity/{entity_id}")
         if response.status_code == 404:
             raise Exception(f"Location not found for entity: {entity_id}")
         response.raise_for_status()
-        return response.json()
+        return Location(**response.json())
 
     def add_entity_to_location(self, entity_id: int, location_id: int) -> None:
         response = requests.put(f"{self.get_base_url()}/{location_id}/entity/{entity_id}")

src/test/python/preponderous/viron/services/test_locationService.py

@@ -3,6 +3,7 @@
 from src.main.python.preponderous.viron.services.locationService import (
     LocationService
 )
+from src.main.python.preponderous.viron.models.location import Location
 
 service = LocationService("http://localhost", 9999)
 
@@ -20,29 +21,26 @@ def test_get_base_url():
 def test_get_all_locations(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = [
-        {'id': 1},
-        {'id': 2}
+        {'location_id': 1, 'x': 10, 'y': 20},
+        {'location_id': 2, 'x': 30, 'y': 40}
     ]
     mock_response.raise_for_status = Mock()
     mock_get.return_value = mock_response
 
     locations = service.get_all_locations()
 
     assert len(locations) == 2
-    assert locations[0]['id'] == 1
-    assert locations[1]['id'] == 2
     mock_get.assert_called_with("http://localhost:9999/api/v1/locations")
 
 @patch('requests.get')
 def test_get_location_by_id(mock_get):
     mock_response = Mock()
-    mock_response.json.return_value = {'id': 1}
+    mock_response.json.return_value = {'location_id': 1, 'x': 10, 'y': 20}
     mock_response.raise_for_status = Mock()
     mock_get.return_value = mock_response
 
     location = service.get_location_by_id(1)
 
-    assert location['id'] == 1
     mock_get.assert_called_with("http://localhost:9999/api/v1/locations/1")
 
 @patch('requests.get')
@@ -58,46 +56,41 @@ def test_get_location_by_id_not_found(mock_get):
 def test_get_locations_in_environment(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = [
-        {'id': 1},
-        {'id': 2}
+        {'location_id': 1, 'x': 10, 'y': 20},
+        {'location_id': 2, 'x': 30, 'y': 40}
     ]
     mock_response.raise_for_status = Mock()
     mock_get.return_value = mock_response
 
     locations = service.get_locations_in_environment(1)
 
     assert len(locations) == 2
-    assert locations[0]['id'] == 1
-    assert locations[1]['id'] == 2
     mock_get.assert_called_with("http://localhost:9999/api/v1/locations/environment/1")
 
 @patch('requests.get')
 def test_get_locations_in_grid(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = [
-        {'id': 1},
-        {'id': 2}
+        {'location_id': 1, 'x': 10, 'y': 20},
+        {'location_id': 2, 'x': 30, 'y': 40}
     ]
     mock_response.raise_for_status = Mock()
     mock_get.return_value = mock_response
 
     locations = service.get_locations_in_grid(1)
 
     assert len(locations) == 2
-    assert locations[0]['id'] == 1
-    assert locations[1]['id'] == 2
     mock_get.assert_called_with("http://localhost:9999/api/v1/locations/grid/1")
 
 @patch('requests.get')
 def test_get_location_of_entity(mock_get):
     mock_response = Mock()
-    mock_response.json.return_value = {'id': 1}
+    mock_response.json.return_value = {'location_id': 1, 'x': 10, 'y': 20}
     mock_response.raise_for_status = Mock()
     mock_get.return_value = mock_response
 
     location = service.get_location_of_entity(1)
 
-    assert location['id'] == 1
     mock_get.assert_called_with("http://localhost:9999/api/v1/locations/entity/1")
 
 @patch('requests.put')