feat: adds new procedure types to model (#28)

* feat: adds new procedure types to model

* fix: linter

* completes coverage

* linters

Author: mekhlakapoor

aind-sharepoint-service-server/src/aind_sharepoint_service_server/main.py

@@ -61,6 +61,6 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
 app.include_router(router)
 
 # Clean up the methods names that is generated in the client code
-for route in app.routes:
+for route in router.routes:
     if isinstance(route, APIRoute):
         route.operation_id = route.name

aind-sharepoint-service-server/src/aind_sharepoint_service_server/models/nsb_2023.py

@@ -800,6 +800,16 @@ class NSB2023Procedure(Enum, metaclass=EnumMeta):
     TESTES__INJECTION = "Testes Injection"
     OVIDUCT__INJECTION = "Oviduct Injection"
 
+    # Additional procedure types
+    THERMISTOR__IMPLANT_WITH = "Thermistor Implant (with Headpost)"
+    HP_INJ__THERMISTOR__IMPLA = "HP + INJ + Thermistor Implant"
+    WHC_NP__THERMISTOR__IMPLA = "WHC NP + Thermistor Implant"
+    DHC__THERMISTOR__IMPLANT = "DHC + Thermistor Implant"
+    SPINAL__CORD_INJ = "Spinal Cord INJ"
+    CHRONOS = "Chronos"
+    ΜLED__IMPLANTATION = "µLED Implantation"
+    CHRONOS_HP__SKULL__SCREW = "Chronos HP + Skull Screw + Thermistor Implant"
+
 
 class NSB2023Headpost(Enum, metaclass=EnumMeta):
     """Enum class for NSB2023Headpost."""

aind-sharepoint-service-server/tests/conftest.py

@@ -92,24 +92,26 @@ def client_with_redis() -> Generator[TestClient, Any, None]:
     """Creating a client when settings have a redis_url. Only used in one test
     to verify the lifespan method in main is called correctly."""
 
-    # Import moved to be able to mock cache
-    from aind_sharepoint_service_server.main import app
-
     settings_with_redis = settings.model_copy(
         update={"redis_url": RedisDsn("redis://example.com:1234")}, deep=True
     )
+    mock_redis = AsyncMock()
     with (
         patch(
             "aind_sharepoint_service_server.main.settings",
-            return_value=settings_with_redis,
+            settings_with_redis,
         ),
         patch(
-            "aind_sharepoint_service_server.main.from_url", return_value=None
+            "aind_sharepoint_service_server.main.from_url",
+            return_value=mock_redis,
         ),
         patch(
             "aind_sharepoint_service_server.main.RedisBackend",
             return_value=None,
         ),
     ):
+        # Import moved inside patch context to ensure settings are patched
+        from aind_sharepoint_service_server.main import app
+
         with TestClient(app) as c:
             yield c

aind-sharepoint-service-server/tests/test_main.py

@@ -1,21 +1,29 @@
 """Module to test main app"""
 
 import pytest
+from fastapi.routing import APIRoute
 from fastapi.testclient import TestClient
+from aind_sharepoint_service_server.route import router
 
 
 class TestMain:
     """Tests app endpoints"""
 
+    def test_app_with_in_memory_cache(self, client: TestClient):
+        """Tests client is instantiated correctly when redis_url None."""
+        response = client.get("/healthcheck")
+        assert 200 == response.status_code
+
     def test_app_with_redis(self, client_with_redis: TestClient):
         """Tests client is instantiated correctly when redis_url set."""
         response = client_with_redis.get("/healthcheck")
         assert 200 == response.status_code
 
-    def test_app_with_in_memory_cache(self, client: TestClient):
-        """Tests client is instantiated correctly when redis_url None."""
-        response = client.get("/healthcheck")
-        assert 200 == response.status_code
+    def test_operation_ids_are_set(self, client: TestClient):
+        """Test that operation_id is set to route name for all APIRoutes."""
+        api_routes = [r for r in router.routes if isinstance(r, APIRoute)]
+        assert len(api_routes) > 0
+        assert all(r.operation_id == r.name for r in api_routes)
 
 
 if __name__ == "__main__":