Merge pull request #43 from Preponderous-Software/removed-service-config

refactor: remove ServiceConfig class and update service initializatio…

Author: dmccoystephenson

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

@@ -8,12 +8,10 @@
 
 class EntityService:
     def __init__(self, viron_host: str, viron_port: int):
-        """Initialize EntityService with host and port"""
         self.viron_host = viron_host
         self.viron_port = viron_port
 
     def get_base_url(self) -> str:
-        """Get the base URL for the API"""
         return f"{self.viron_host}:{self.viron_port}/api/v1/entities"
 
     def get_all_entities(self) -> List[Entity]:

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

@@ -6,40 +6,44 @@
 from src.main.python.preponderous.viron.models.environment import Environment
 
 class EnvironmentService:
-    def __init__(self, base_url):
-        self.base_url = f"{base_url}/api/v1/environments"
+    def __init__(self, viron_host: str, viron_port: int):
+        self.viron_host = viron_host
+        self.viron_port = viron_port
+
+    def get_base_url(self) -> str:
+        return f"{self.viron_host}:{self.viron_port}/api/v1/environments"
 
     def get_all_environments(self) -> list[Environment]:
-        response = requests.get(f"{self.base_url}")
+        response = requests.get(f"{self.get_base_url()}")
         response.raise_for_status()
         return [Environment(**env) for env in response.json()]
 
     def get_environment_by_id(self, environment_id: int) -> Environment:
-        response = requests.get(f"{self.base_url}/{environment_id}")
+        response = requests.get(f"{self.get_base_url()}/{environment_id}")
         response.raise_for_status()
         return Environment(**response.json())
 
     def get_environment_by_name(self, name: str) -> Environment:
-        response = requests.get(f"{self.base_url}/name/{name}")
+        response = requests.get(f"{self.get_base_url()}/name/{name}")
         response.raise_for_status()
         return Environment(**response.json())
 
     def get_environment_of_entity(self, entity_id: int) -> Environment:
-        response = requests.get(f"{self.base_url}/entity/{entity_id}")
+        response = requests.get(f"{self.get_base_url()}/entity/{entity_id}")
         response.raise_for_status()
         return Environment(**response.json())
 
     def create_environment(self, name: str, num_grids: int, grid_size: int) -> Environment:
-        response = requests.post(f"{self.base_url}/{name}/{num_grids}/{grid_size}")
+        response = requests.post(f"{self.get_base_url()}/{name}/{num_grids}/{grid_size}")
         response.raise_for_status()
         return Environment(**response.json())
 
     def delete_environment(self, environment_id: int) -> bool:
-        response = requests.delete(f"{self.base_url}/{environment_id}")
+        response = requests.delete(f"{self.get_base_url()}/{environment_id}")
         response.raise_for_status()
         return response.status_code == 200
 
     def update_environment_name(self, environment_id: int, name: str) -> bool:
-        response = requests.patch(f"{self.base_url}/{environment_id}/name/{name}")
+        response = requests.patch(f"{self.get_base_url()}/{environment_id}/name/{name}")
         response.raise_for_status()
         return response.status_code == 200

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

@@ -10,25 +10,29 @@
 logger = logging.getLogger(__name__)
 
 class GridService:
-    def __init__(self, base_url: str):
-        self.base_url = f"{base_url}/api/v1/grids"
+    def __init__(self, viron_host: str, viron_port: int):
+        self.viron_host = viron_host
+        self.viron_port = viron_port
+
+    def get_base_url(self) -> str:
+        return f"{self.viron_host}:{self.viron_port}/api/v1/grids"
 
     def get_all_grids(self) -> List[Grid]:
-        response = requests.get(self.base_url)
+        response = requests.get(self.get_base_url())
         response.raise_for_status()
         return [Grid(**grid) for grid in response.json()]
 
     def get_grid_by_id(self, grid_id: int) -> Optional[Grid]:
-        response = requests.get(f"{self.base_url}/{grid_id}")
+        response = requests.get(f"{self.get_base_url()}/{grid_id}")
         response.raise_for_status()
         return Grid(**response.json())
 
     def get_grids_in_environment(self, environment_id: int) -> List[Grid]:
-        response = requests.get(f"{self.base_url}/environment/{environment_id}")
+        response = requests.get(f"{self.get_base_url()}/environment/{environment_id}")
         response.raise_for_status()
         return [Grid(**grid) for grid in response.json()]
 
     def get_grid_of_entity(self, entity_id: int) -> Optional[Grid]:
-        response = requests.get(f"{self.base_url}/entity/{entity_id}")
+        response = requests.get(f"{self.get_base_url()}/entity/{entity_id}")
         response.raise_for_status()
         return Grid(**response.json())

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

@@ -4,59 +4,57 @@
 from dataclasses import dataclass
 from src.main.python.preponderous.viron.models.location import Location
 
-@dataclass
-class ServiceConfig:
-    viron_host: str
-    viron_port: int
-
 class LocationService:
-    def __init__(self, service_config: ServiceConfig):
-        self.logger = logging.getLogger(__name__)
-        self.base_url = f"{service_config.viron_host}:{service_config.viron_port}/api/v1/locations"
+    def __init__(self, viron_host: str, viron_port: int):
+        self.viron_host = viron_host
+        self.viron_port = viron_port
+
+    def get_base_url(self) -> str:
+        return f"{self.viron_host}:{self.viron_port}/api/v1/locations"
 
     def get_all_locations(self) -> List[Location]:
-        response = requests.get(self.base_url)
+        response = requests.get(self.get_base_url())
         response.raise_for_status()
         return response.json()
 
     def get_location_by_id(self, id: int) -> Location:
-        response = requests.get(f"{self.base_url}/{id}")
+        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()
 
     def get_locations_in_environment(self, environment_id: int) -> List[Location]:
-        response = requests.get(f"{self.base_url}/environment/{environment_id}")
+        response = requests.get(f"{self.get_base_url()}/environment/{environment_id}")
         response.raise_for_status()
         return response.json()
 
     def get_locations_in_grid(self, grid_id: int) -> List[Location]:
-        response = requests.get(f"{self.base_url}/grid/{grid_id}")
+        response = requests.get(f"{self.get_base_url()}/grid/{grid_id}")
         response.raise_for_status()
         return response.json()
 
     def get_location_of_entity(self, entity_id: int) -> Location:
-        response = requests.get(f"{self.base_url}/entity/{entity_id}")
+        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()
 
     def add_entity_to_location(self, entity_id: int, location_id: int) -> None:
-        response = requests.put(f"{self.base_url}/{location_id}/entity/{entity_id}")
+        response = requests.put(f"{self.get_base_url()}/{location_id}/entity/{entity_id}")
         if response.status_code == 404:
             raise Exception("Location or entity not found")
         response.raise_for_status()
 
     def remove_entity_from_location(self, entity_id: int, location_id: int) -> None:
-        response = requests.delete(f"{self.base_url}/{location_id}/entity/{entity_id}")
+        response = requests.delete(f"{self.get_base_url()}/{location_id}/entity/{entity_id}")
         if response.status_code == 404:
             raise Exception("Location or entity not found")
         response.raise_for_status()
 
     def remove_entity_from_current_location(self, entity_id: int) -> None:
-        response = requests.delete(f"{self.base_url}/entity/{entity_id}")
+        response = requests.delete(f"{self.get_base_url()}/entity/{entity_id}")
         if response.status_code == 404:
             raise Exception("Entity not found")
         response.raise_for_status()

src/test/java/preponderous/viron/config/ServiceConfigTest.java

@@ -24,7 +24,7 @@ void testGetVironHost() {
     @Test
     void testGetVironPort() {
         ServiceConfig serviceConfig = new ServiceConfig();
-        serviceConfig.setVironPort(8080);
-        assert(serviceConfig.getVironPort() == 8080);
+        serviceConfig.setVironPort(9999);
+        assert(serviceConfig.getVironPort() == 9999);
     }
 }

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

@@ -15,23 +15,21 @@
     {'entityId': 2, 'name': 'Entity2', 'creationDate': '2024-01-01'}
 ]
 
-@pytest.fixture
-def service():
-    return EntityService("http://localhost", 8080)
+service = EntityService("http://localhost", 9999)
 
 
-def test_init(service):
+def test_init():
     assert service.viron_host == "http://localhost"
-    assert service.viron_port == 8080
+    assert service.viron_port == 9999
 
 
-def test_get_base_url(service):
-    expected = "http://localhost:8080/api/v1/entities"
+def test_get_base_url():
+    expected = "http://localhost:9999/api/v1/entities"
     assert service.get_base_url() == expected
 
 
 @patch('requests.get')
-def test_get_all_entities_success(mock_get, service):
+def test_get_all_entities_success(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITIES_DATA
     mock_get.return_value = mock_response
@@ -43,7 +41,7 @@ def test_get_all_entities_success(mock_get, service):
 
 
 @patch('requests.get')
-def test_get_all_entities_empty(mock_get, service):
+def test_get_all_entities_empty(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = []
     mock_get.return_value = mock_response
@@ -53,7 +51,7 @@ def test_get_all_entities_empty(mock_get, service):
 
 
 @patch('requests.get')
-def test_get_entity_by_id_success(mock_get, service):
+def test_get_entity_by_id_success(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITY_DATA
     mock_get.return_value = mock_response
@@ -65,7 +63,7 @@ def test_get_entity_by_id_success(mock_get, service):
 
 
 @patch('requests.get')
-def test_get_entities_in_environment_success(mock_get, service):
+def test_get_entities_in_environment_success(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITIES_DATA
     mock_get.return_value = mock_response
@@ -76,7 +74,7 @@ def test_get_entities_in_environment_success(mock_get, service):
 
 
 @patch('requests.get')
-def test_get_entities_in_grid_success(mock_get, service):
+def test_get_entities_in_grid_success(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITIES_DATA
     mock_get.return_value = mock_response
@@ -87,7 +85,7 @@ def test_get_entities_in_grid_success(mock_get, service):
 
 
 @patch('requests.get')
-def test_get_entities_in_location_success(mock_get, service):
+def test_get_entities_in_location_success(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITIES_DATA
     mock_get.return_value = mock_response
@@ -98,7 +96,7 @@ def test_get_entities_in_location_success(mock_get, service):
 
 
 @patch('requests.get')
-def test_get_entities_not_in_any_location_success(mock_get, service):
+def test_get_entities_not_in_any_location_success(mock_get):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITIES_DATA
     mock_get.return_value = mock_response
@@ -109,7 +107,7 @@ def test_get_entities_not_in_any_location_success(mock_get, service):
 
 
 @patch('requests.post')
-def test_create_entity_success(mock_post, service):
+def test_create_entity_success(mock_post):
     mock_response = Mock()
     mock_response.json.return_value = MOCK_ENTITY_DATA
     mock_post.return_value = mock_response
@@ -121,7 +119,7 @@ def test_create_entity_success(mock_post, service):
 
 
 @patch('requests.delete')
-def test_delete_entity_success(mock_delete, service):
+def test_delete_entity_success(mock_delete):
     mock_response = Mock()
     mock_delete.return_value = mock_response
 
@@ -131,7 +129,7 @@ def test_delete_entity_success(mock_delete, service):
 
 
 @patch('requests.patch')
-def test_update_entity_name_success(mock_patch, service):
+def test_update_entity_name_success(mock_patch):
     mock_response = Mock()
     mock_patch.return_value = mock_response
 
@@ -142,7 +140,7 @@ def test_update_entity_name_success(mock_patch, service):
 
 # Error cases
 @patch('requests.get')
-def test_get_all_entities_error(mock_get, service):
+def test_get_all_entities_error(mock_get):
     mock_get.side_effect = Exception("Network error")
 
     with pytest.raises(Exception) as exc_info:
@@ -151,7 +149,7 @@ def test_get_all_entities_error(mock_get, service):
 
 
 @patch('requests.post')
-def test_create_entity_null_response(mock_post, service):
+def test_create_entity_null_response(mock_post):
     mock_response = Mock()
     mock_response.json.return_value = None
     mock_post.return_value = mock_response