Feature/capr 53 db integration tests

capy_discord/database.py

@@ -4,6 +4,7 @@
 from dataclasses import dataclass
 from json import JSONDecodeError
 from typing import Any, NotRequired, Required, TypedDict, cast
+from urllib.parse import urlsplit, urlunsplit
 
 import httpx
 
@@ -274,15 +275,16 @@ def is_started(self) -> bool:
 
     async def bot_me(self) -> BotTokenResponse:
         """Call `GET /bot/me`."""
-        payload = await self._request("GET", "/bot/me")
+        payload = await self._request("GET", "/me")
         return cast("BotTokenResponse", _typed_dict(payload))
 
     async def list_events(self, *, limit: int | None = None, offset: int | None = None) -> list[EventResponse]:
         """Call `GET /events`."""
         params = _pagination_params(limit=limit, offset=offset)
-        payload = await self._request("GET", "/bot/events", params=params)
+        payload = await self._request("GET", "/events", params=params)
         return cast("list[EventResponse]", _typed_list(payload))
 
+    # ROUTE DOES NOT EXIST
     async def list_events_by_organization(
         self,
         organization_id: str,
@@ -292,33 +294,33 @@ async def list_events_by_organization(
     ) -> list[EventResponse]:
         """Call `GET /events/org/{oid}`."""
         params = _pagination_params(limit=limit, offset=offset)
-        payload = await self._request("GET", f"/bot/events/org/{organization_id}", params=params)
+        payload = await self._request("GET", f"/events/org/{organization_id}", params=params)
         return cast("list[EventResponse]", _typed_list(payload))
 
     async def get_event(self, event_id: str) -> EventResponse:
         """Call `GET /events/{eid}`."""
-        payload = await self._request("GET", f"/bot/events/{event_id}")
+        payload = await self._request("GET", f"/events/{event_id}")
         return cast("EventResponse", _typed_dict(payload))
 
     async def create_event(self, data: CreateEventRequest) -> EventResponse:
         """Call `POST /events`."""
-        payload = await self._request("POST", "/bot/events", json_body=data, expected_statuses={HTTP_STATUS_CREATED})
+        payload = await self._request("POST", "/events", json_body=data, expected_statuses={HTTP_STATUS_CREATED})
         return cast("EventResponse", _typed_dict(payload))
 
     async def update_event(self, event_id: str, data: UpdateEventRequest) -> EventResponse:
         """Call `PUT /events/{eid}`."""
-        payload = await self._request("PUT", f"/bot/events/{event_id}", json_body=data)
+        payload = await self._request("PUT", f"/events/{event_id}", json_body=data)
         return cast("EventResponse", _typed_dict(payload))
 
     async def delete_event(self, event_id: str) -> None:
         """Call `DELETE /events/{eid}`."""
-        await self._request("DELETE", f"/bot/events/{event_id}", expected_statuses={HTTP_STATUS_NO_CONTENT})
+        await self._request("DELETE", f"/events/{event_id}", expected_statuses={HTTP_STATUS_NO_CONTENT})
 
     async def register_event(self, event_id: str, data: RegisterEventRequest) -> None:
         """Call `POST /events/{eid}/register`."""
         await self._request(
             "POST",
-            f"/bot/events/{event_id}/register",
+            f"/events/{event_id}/register",
             json_body=data,
             expected_statuses={HTTP_STATUS_CREATED},
         )
@@ -328,14 +330,14 @@ async def unregister_event(self, event_id: str, *, uid: str | None = None) -> No
         params = _optional_params(uid=uid)
         await self._request(
             "DELETE",
-            f"/bot/events/{event_id}/register",
+            f"/events/{event_id}/register",
             params=params,
             expected_statuses={HTTP_STATUS_NO_CONTENT},
         )
 
     async def list_event_registrations(self, event_id: str) -> list[EventRegistrationResponse]:
         """Call `GET /events/{eid}/registrations`."""
-        payload = await self._request("GET", f"/bot/events/{event_id}/registrations")
+        payload = await self._request("GET", f"/events/{event_id}/registrations")
         return cast("list[EventRegistrationResponse]", _typed_list(payload))
 
     async def list_organizations(
@@ -368,6 +370,7 @@ async def delete_organization(self, organization_id: str) -> None:
         """Call `DELETE /organizations/{oid}`."""
         await self._request("DELETE", f"/organizations/{organization_id}", expected_statuses={HTTP_STATUS_NO_CONTENT})
 
+    # ROUTE DOES NOT EXIST
     async def list_organization_events(
         self,
         organization_id: str,
@@ -407,11 +410,13 @@ async def get_user(self, user_id: str) -> UserResponse:
         payload = await self._request("GET", f"/users/{user_id}")
         return cast("UserResponse", _typed_dict(payload))
 
+    # ROUTE DOES NOT EXIST
     async def update_user(self, user_id: str, data: UpdateUserRequest) -> UserResponse:
         """Call `PUT /users/{uid}`."""
         payload = await self._request("PUT", f"/users/{user_id}", json_body=data)
         return cast("UserResponse", _typed_dict(payload))
 
+    # ROUTE DOES NOT EXIST
     async def delete_user(self, user_id: str) -> None:
         """Call `DELETE /users/{uid}`."""
         await self._request("DELETE", f"/users/{user_id}", expected_statuses={HTTP_STATUS_NO_CONTENT})
@@ -556,8 +561,10 @@ def _normalize_api_base_url(base_url: str) -> str:
         msg = "base_url must be set"
         raise BackendConfigurationError(msg)
 
-    if cleaned.endswith("/v1"):
-        return f"{cleaned}/"
+    parsed = urlsplit(cleaned)
+    path_segments = [segment for segment in parsed.path.split("/") if segment]
+    if "v1" in path_segments:
+        return urlunsplit((parsed.scheme, parsed.netloc, f"{parsed.path}/", parsed.query, parsed.fragment))
 
     return f"{cleaned}/v1/"
 

example.env

@@ -24,3 +24,9 @@ ONBOARDING_ENABLED=
 ONBOARDING_MODE=
 ONBOARDING_REQUIRE_MANAGE_GUILD=
 ONBOARDING_MESSAGE=
+
+API_URL=
+RUN_MUTATION_INTEGRATION_TESTS=
+TEST_USER_ID=
+TEST_DELETABLE_USER_ID=
+TEST_BOT_TOKEN=

pyproject.toml

@@ -116,3 +116,8 @@ convention = "google"
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10
+
+[tool.pytest.ini_options]
+markers = [
+    "integration: requires a locally running backend API and explicit opt-in",
+]

tests/capy_discord/test_database.py

@@ -71,6 +71,7 @@ def test_normalize_api_base_url_behaviors():
     assert _normalize_api_base_url("http://localhost:8080") == "http://localhost:8080/v1/"
     assert _normalize_api_base_url("http://localhost:8080/") == "http://localhost:8080/v1/"
     assert _normalize_api_base_url("https://api.example.com/v1") == "https://api.example.com/v1/"
+    assert _normalize_api_base_url("http://localhost:8080/api/v1/bot") == "http://localhost:8080/api/v1/bot/"
 
     with pytest.raises(BackendConfigurationError, match="base_url must be set"):
         _normalize_api_base_url("   ")
@@ -210,7 +211,7 @@ async def test_list_events_makes_expected_request(mock_request):
     assert events[0].get("eid") == "evt-1"
     kwargs = mock_request.call_args.kwargs
     assert kwargs["method"] == "GET"
-    assert kwargs["url"] == "bot/events"
+    assert kwargs["url"] == "events"
     assert kwargs["params"] == {"limit": 10, "offset": 5}
 
     await close_database_pool()
@@ -233,11 +234,11 @@ async def test_register_and_unregister_event_use_expected_status_codes(mock_requ
     unregister_kwargs = mock_request.await_args_list[1].kwargs
 
     assert register_kwargs["method"] == "POST"
-    assert register_kwargs["url"] == "bot/events/evt-1/register"
+    assert register_kwargs["url"] == "events/evt-1/register"
     assert register_kwargs["json"] == {"uid": "user-1", "is_attending": True}
 
     assert unregister_kwargs["method"] == "DELETE"
-    assert unregister_kwargs["url"] == "bot/events/evt-1/register"
+    assert unregister_kwargs["url"] == "events/evt-1/register"
     assert unregister_kwargs["params"] == {"uid": "user-1"}
 
     await close_database_pool()
@@ -272,7 +273,7 @@ async def test_list_events_by_organization_uses_swagger_path(mock_request):
     assert events[0].get("eid") == "evt-2"
     kwargs = mock_request.call_args.kwargs
     assert kwargs["method"] == "GET"
-    assert kwargs["url"] == "bot/events/org/org-1"
+    assert kwargs["url"] == "events/org/org-1"
     assert kwargs["params"] == {"limit": 20, "offset": 0}
 
     await close_database_pool()
@@ -373,7 +374,7 @@ async def test_bot_me_endpoint_uses_expected_path(mock_request):
     assert me.get("token_id") == "t-1"
 
     kwargs = mock_request.call_args.kwargs
-    assert kwargs["url"] == "bot/me"
+    assert kwargs["url"] == "me"
 
     await close_database_pool()