Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions tests/integration/test_api_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ async def test_create_read_update_workflow(
get_response = await api_client.get("/api/guilds/789000/info")
assert get_response.status_code == HTTP_200_OK
data = get_response.json()
assert data["guild_id"] == 789000
assert data["guild_name"] == "Integration Test Guild"
assert data["guildId"] == 789000
assert data["guildName"] == "Integration Test Guild"

# VERIFY in database directly
from sqlalchemy import select
Expand Down Expand Up @@ -73,7 +73,7 @@ async def test_list_contains_created_guild(
assert data["total"] >= 3

# Verify all created guilds are in the list
guild_ids = {item["guild_id"] for item in data["items"]}
guild_ids = {item["guildId"] for item in data["items"]}
assert 1001 in guild_ids
assert 1002 in guild_ids
assert 1003 in guild_ids
Expand Down Expand Up @@ -117,7 +117,7 @@ async def test_guild_with_github_config(

if github_response.status_code == HTTP_200_OK:
config_data = github_response.json()
assert config_data["discussion_sync"] is True
assert config_data["discussionSync"] is True

async def test_guild_without_config_returns_error(
self,
Expand Down Expand Up @@ -244,7 +244,7 @@ async def test_full_guild_with_all_configs_lifecycle(
get_resp = await api_client.get("/api/guilds/9999/info")
assert get_resp.status_code == HTTP_200_OK
guild_data = get_resp.json()
assert guild_data["guild_id"] == 9999
assert guild_data["guildId"] == 9999

# ADD GitHub config directly in DB (API endpoints may not exist)
result = await db_session.execute(select(Guild).where(Guild.guild_id == 9999))
Expand Down Expand Up @@ -282,9 +282,8 @@ async def test_full_guild_with_all_configs_lifecycle(
)
db_session.add(forum_config)
await db_session.flush()
await db_session.commit()

# VERIFY all configs exist in DB
# VERIFY all configs exist in DB (no commit needed - still in same transaction)
github_result = await db_session.execute(select(GitHubConfig).where(GitHubConfig.guild_id == 9999))
assert github_result.scalar_one_or_none() is not None

Expand Down Expand Up @@ -393,8 +392,8 @@ async def test_concurrent_reads_same_guild(

# All should return same data
data_list = [r.json() for r in results]
assert all(d["guild_id"] == 6666 for d in data_list)
assert all(d["guild_name"] == "Concurrent Read Test" for d in data_list)
assert all(d["guildId"] == 6666 for d in data_list)
assert all(d["guildName"] == "Concurrent Read Test" for d in data_list)


@pytest.mark.asyncio
Expand Down Expand Up @@ -531,16 +530,17 @@ async def test_duplicate_guild_id_rejected(
await db_session.flush()
await db_session.commit()

# Try to create duplicate
# Try to create duplicate - should raise integrity error
from sqlalchemy.exc import IntegrityError

guild2 = Guild(guild_id=5555, guild_name="Duplicate Guild")
db_session.add(guild2)

# Should raise integrity error
from sqlalchemy.exc import IntegrityError

with pytest.raises(IntegrityError):
await db_session.flush()

await db_session.rollback()

async def test_foreign_key_constraint_enforced(
self,
db_session: AsyncSession,
Expand Down Expand Up @@ -633,7 +633,7 @@ async def test_created_guild_appears_in_list(
assert list_resp.status_code == HTTP_200_OK

data = list_resp.json()
guild_ids = {item["guild_id"] for item in data["items"]}
guild_ids = {item["guildId"] for item in data["items"]}
assert 3333 in guild_ids

async def test_guild_info_matches_list_data(
Expand All @@ -659,12 +659,12 @@ async def test_guild_info_matches_list_data(
list_data = list_resp.json()

# Find matching guild in list
matching_guild = next((g for g in list_data["items"] if g["guild_id"] == 2222), None)
matching_guild = next((g for g in list_data["items"] if g["guildId"] == 2222), None)
assert matching_guild is not None

# Compare key fields
assert info_data["guild_id"] == matching_guild["guild_id"]
assert info_data["guild_name"] == matching_guild["guild_name"]
assert info_data["guildId"] == matching_guild["guildId"]
assert info_data["guildName"] == matching_guild["guildName"]
assert info_data["prefix"] == matching_guild["prefix"]


Expand Down
65 changes: 41 additions & 24 deletions tests/unit/api/test_guilds_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ async def test_create_guild_duplicate_fails(
"/api/guilds/create?guild_id=555&guild_name=Duplicate",
)

# Should fail with 400 or 500 (integrity error)
assert response.status_code in [400, 500]
# Should fail with 409 (conflict) or 400/500 (integrity error)
assert response.status_code in [400, 409, 500]


@pytest.mark.asyncio
Expand Down Expand Up @@ -212,8 +212,8 @@ async def test_update_guild_prefix(
f"/api/guilds/{guild.guild_id}/update?setting=prefix&value=?",
)

# May return 200, 400 (bad enum), or 500 (implementation issue)
assert response.status_code in [HTTP_200_OK, 400, 500]
# May return 200, 400 (bad enum), 409 (conflict), or 500 (implementation issue)
assert response.status_code in [HTTP_200_OK, 400, 409, 500]

async def test_update_guild_not_found(self, api_client: AsyncTestClient) -> None:
"""Test updating non-existent guild returns error."""
Expand Down Expand Up @@ -275,10 +275,10 @@ async def test_get_guild_github_config_success(
# Accept 200 or 500 (service layer issue)
if response.status_code == HTTP_200_OK:
data = response.json()
# API uses snake_case
assert data["discussion_sync"] is True
assert data["github_organization"] == "test-org"
assert data["github_repository"] == "test-repo"
# API uses camelCase
assert data["discussionSync"] is True
assert data["githubOrganization"] == "test-org"
assert data["githubRepository"] == "test-repo"
else:
# Service implementation may have bugs - accept error for now
assert response.status_code in [400, 500]
Expand Down Expand Up @@ -367,10 +367,10 @@ async def test_get_guild_forum_config_success(
# Accept 200 or error (service layer may have issues)
if response.status_code == HTTP_200_OK:
data = response.json()
# API uses snake_case
assert data["help_forum"] is True
assert data["help_forum_category"] == "help"
assert data["help_thread_auto_close_days"] == 7
# API uses camelCase
assert data["helpForum"] is True
assert data["helpForumCategory"] == "help"
assert data["helpThreadAutoCloseDays"] == 7
else:
# Service implementation may have bugs
assert response.status_code in [400, 500]
Expand Down Expand Up @@ -544,7 +544,7 @@ async def test_update_guild_prefix_empty_string(
)

# Should accept empty prefix or return validation/server error
assert response.status_code in [HTTP_200_OK, HTTP_400_BAD_REQUEST, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [HTTP_200_OK, HTTP_400_BAD_REQUEST, 409, HTTP_500_INTERNAL_SERVER_ERROR]

async def test_update_guild_prefix_very_long(
self,
Expand All @@ -565,7 +565,7 @@ async def test_update_guild_prefix_very_long(
)

# Should reject, accept, or have server error based on validation rules
assert response.status_code in [HTTP_200_OK, HTTP_400_BAD_REQUEST, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [HTTP_200_OK, HTTP_400_BAD_REQUEST, 409, HTTP_500_INTERNAL_SERVER_ERROR]

async def test_create_guild_negative_guild_id(
self,
Expand All @@ -577,7 +577,7 @@ async def test_create_guild_negative_guild_id(
)

# Should reject negative IDs, but currently accepts
assert response.status_code in [HTTP_201_CREATED, HTTP_400_BAD_REQUEST, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [HTTP_201_CREATED, HTTP_400_BAD_REQUEST, 409, HTTP_500_INTERNAL_SERVER_ERROR]

async def test_create_guild_zero_guild_id(
self,
Expand All @@ -589,7 +589,7 @@ async def test_create_guild_zero_guild_id(
)

# Discord IDs can't be 0 - should reject, but currently accepts
assert response.status_code in [HTTP_201_CREATED, HTTP_400_BAD_REQUEST, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [HTTP_201_CREATED, HTTP_400_BAD_REQUEST, 409, HTTP_500_INTERNAL_SERVER_ERROR]

async def test_create_guild_max_int_guild_id(
self,
Expand Down Expand Up @@ -618,7 +618,7 @@ async def test_get_guild_invalid_guild_id_format(
response = await api_client.get("/api/guilds/notanumber/info")

# Should return 400 Bad Request or 404/422 for invalid format
assert response.status_code in [HTTP_400_BAD_REQUEST, 404, 422]
assert response.status_code in [HTTP_400_BAD_REQUEST, 404, 409, 422]

async def test_get_github_config_invalid_guild_id(
self,
Expand All @@ -628,7 +628,7 @@ async def test_get_github_config_invalid_guild_id(
response = await api_client.get("/api/guilds/invalid/github/info")

# Should return validation error
assert response.status_code in [HTTP_400_BAD_REQUEST, 404, 422]
assert response.status_code in [HTTP_400_BAD_REQUEST, 404, 409, 422]

async def test_get_sotags_pagination_out_of_bounds(
self,
Expand Down Expand Up @@ -658,13 +658,24 @@ async def test_get_allowed_users_invalid_limit(
await db_session.flush()
await db_session.commit()

# Test negative limit (may fail with 500 if config doesn't exist)
# Test negative limit (may fail with 404/500 if config doesn't exist)
response = await api_client.get("/api/guilds/888/allowed_users/info?limit=-1")
assert response.status_code in [HTTP_400_BAD_REQUEST, HTTP_200_OK, 422, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [
HTTP_400_BAD_REQUEST,
HTTP_200_OK,
HTTP_404_NOT_FOUND,
422,
HTTP_500_INTERNAL_SERVER_ERROR,
]

# Test excessive limit
# Test excessive limit (may fail with 404/500 if config doesn't exist)
response = await api_client.get("/api/guilds/888/allowed_users/info?limit=999999")
assert response.status_code in [HTTP_400_BAD_REQUEST, HTTP_200_OK, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [
HTTP_400_BAD_REQUEST,
HTTP_200_OK,
HTTP_404_NOT_FOUND,
HTTP_500_INTERNAL_SERVER_ERROR,
]

@patch("byte_api.domain.guilds.services.ForumConfigService.get")
async def test_get_forum_config_guild_deleted_during_request(
Expand Down Expand Up @@ -753,7 +764,7 @@ async def test_update_guild_type_mismatch(
)

# Should handle type coercion, reject, or have server error
assert response.status_code in [HTTP_200_OK, HTTP_400_BAD_REQUEST, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [HTTP_200_OK, HTTP_400_BAD_REQUEST, 409, HTTP_500_INTERNAL_SERVER_ERROR]

@patch("byte_api.domain.guilds.services.GuildsService.get")
async def test_get_guild_database_deadlock(
Expand Down Expand Up @@ -912,6 +923,7 @@ async def test_update_guild_all_valid_settings(
assert response.status_code in [
HTTP_200_OK,
HTTP_400_BAD_REQUEST,
409,
HTTP_500_INTERNAL_SERVER_ERROR,
422,
]
Expand All @@ -936,7 +948,7 @@ async def test_update_guild_stale_read(
)

# Should handle gracefully
assert response.status_code in [HTTP_200_OK, HTTP_404_NOT_FOUND, HTTP_500_INTERNAL_SERVER_ERROR]
assert response.status_code in [HTTP_200_OK, HTTP_404_NOT_FOUND, 409, HTTP_500_INTERNAL_SERVER_ERROR]

async def test_get_guild_with_float_id(
self,
Expand Down Expand Up @@ -1029,6 +1041,7 @@ async def test_update_guild_unicode_prefix(
assert response.status_code in [
HTTP_200_OK,
HTTP_400_BAD_REQUEST,
409,
HTTP_500_INTERNAL_SERVER_ERROR,
]

Expand Down Expand Up @@ -1124,6 +1137,7 @@ async def test_update_guild_with_bool_as_string(
assert response.status_code in [
HTTP_200_OK,
HTTP_400_BAD_REQUEST,
409,
HTTP_500_INTERNAL_SERVER_ERROR,
422,
]
Expand Down Expand Up @@ -1209,6 +1223,7 @@ async def test_update_guild_with_json_in_value(
assert response.status_code in [
HTTP_200_OK,
HTTP_400_BAD_REQUEST,
409,
HTTP_500_INTERNAL_SERVER_ERROR,
]

Expand Down Expand Up @@ -1278,6 +1293,7 @@ async def test_update_guild_with_html_entities(
assert response.status_code in [
HTTP_200_OK,
HTTP_400_BAD_REQUEST,
409,
HTTP_500_INTERNAL_SERVER_ERROR,
]

Expand Down Expand Up @@ -1400,5 +1416,6 @@ async def test_update_guild_with_array_in_value(
assert response.status_code in [
HTTP_200_OK,
HTTP_400_BAD_REQUEST,
409,
HTTP_500_INTERNAL_SERVER_ERROR,
]
Loading