Refactor CRUD module imports and usage for clarity.
Replaces ambiguous shorthand references like `event` and `user` with more descriptive names such as `event_crud` and `user_crud`. Updates imports, function calls, tests, and other references across the codebase to maintain consistency. This improves code readability and reduces potential confusion.
This commit is contained in:
@@ -533,7 +533,7 @@ class TestGetEvent:
|
||||
manager_user = self.create_mock_user(email="manager@example.com")
|
||||
mocked_event = self.create_mock_event(created_by=self.mock_user.id, managers=[manager_user], is_public=True)
|
||||
|
||||
self.client.user = manager_user
|
||||
self.client.user_crud = manager_user
|
||||
|
||||
endpoint = self.get_event_endpoint(mocked_event)
|
||||
response = self.client.get(endpoint)
|
||||
@@ -546,7 +546,7 @@ class TestGetEvent:
|
||||
|
||||
mocked_event = self.create_mock_event(created_by=self.mock_user.id, is_public=True)
|
||||
|
||||
self.client.user = superuser
|
||||
self.client.user_crud = superuser
|
||||
|
||||
endpoint = self.get_event_endpoint(mocked_event)
|
||||
response = self.client.get(endpoint)
|
||||
@@ -571,7 +571,7 @@ class TestGetEvent:
|
||||
is_public=True
|
||||
)
|
||||
|
||||
self.client.user = other_user
|
||||
self.client.user_crud = other_user
|
||||
|
||||
endpoint = self.get_event_endpoint(mocked_event)
|
||||
response = self.client.get(endpoint)
|
||||
@@ -598,7 +598,7 @@ class TestGetEvent:
|
||||
self.db_session.add(guest_entry)
|
||||
self.db_session.commit()
|
||||
|
||||
self.client.user = guest_user
|
||||
self.client.user_crud = guest_user
|
||||
|
||||
endpoint = self.get_event_endpoint(mocked_event)
|
||||
response = self.client.get(endpoint)
|
||||
@@ -616,7 +616,7 @@ class TestGetEvent:
|
||||
is_public=False
|
||||
)
|
||||
|
||||
self.client.user = other_user
|
||||
self.client.user_crud = other_user
|
||||
|
||||
endpoint = self.get_event_endpoint(mocked_event, access_code="123")
|
||||
response = self.client.get(endpoint)
|
||||
@@ -636,7 +636,7 @@ class TestGetEvent:
|
||||
user=None,
|
||||
)
|
||||
|
||||
self.client.user = None # Simulate no authenticated user
|
||||
self.client.user_crud = None # Simulate no authenticated user
|
||||
|
||||
endpoint = self.get_event_endpoint(mocked_event)
|
||||
response = client.get(endpoint)
|
||||
|
||||
@@ -3,7 +3,7 @@ from datetime import datetime, timedelta, timezone
|
||||
from uuid import UUID, uuid4
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
from app.crud.event import event as crud_event
|
||||
from app.crud.event import event_crud as crud_event
|
||||
from app.schemas.events import EventCreate, EventUpdate
|
||||
from app.models.event import Event
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ from uuid import UUID
|
||||
import pytest
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.crud.event_theme import event_theme
|
||||
from app.crud.event_theme import event_theme_crud
|
||||
from app.schemas.event_themes import EventThemeCreate, EventThemeUpdate
|
||||
|
||||
|
||||
@@ -23,14 +23,14 @@ def test_create_event_theme(db_session: Session) -> None:
|
||||
"body": "Open Sans"
|
||||
}
|
||||
)
|
||||
theme = event_theme.create(db=db_session, obj_in=theme_in)
|
||||
theme = event_theme_crud.create(db=db_session, obj_in=theme_in)
|
||||
assert theme.name == theme_in.name
|
||||
assert theme.color_palette == theme_in.color_palette
|
||||
assert theme.fonts == theme_in.fonts
|
||||
|
||||
|
||||
def test_get_event_theme(db_session: Session, event_theme_fixture) -> None:
|
||||
stored_theme = event_theme.get(db=db_session, id=event_theme_fixture.id)
|
||||
stored_theme = event_theme_crud.get(db=db_session, id=event_theme_fixture.id)
|
||||
assert stored_theme
|
||||
assert stored_theme.id == event_theme_fixture.id
|
||||
assert stored_theme.name == event_theme_fixture.name
|
||||
@@ -39,7 +39,7 @@ def test_get_event_theme(db_session: Session, event_theme_fixture) -> None:
|
||||
|
||||
|
||||
def test_get_event_theme_by_name(db_session: Session, event_theme_fixture) -> None:
|
||||
stored_theme = event_theme.get_by_name(db=db_session, name=event_theme_fixture.name)
|
||||
stored_theme = event_theme_crud.get_by_name(db=db_session, name=event_theme_fixture.name)
|
||||
assert stored_theme
|
||||
assert stored_theme.id == event_theme_fixture.id
|
||||
assert stored_theme.name == event_theme_fixture.name
|
||||
@@ -55,7 +55,7 @@ def test_update_event_theme(db_session: Session, event_theme_fixture) -> None:
|
||||
"text": "#212121"
|
||||
}
|
||||
)
|
||||
updated_theme = event_theme.update(
|
||||
updated_theme = event_theme_crud.update(
|
||||
db=db_session,
|
||||
db_obj=event_theme_fixture,
|
||||
obj_in=theme_update
|
||||
@@ -69,11 +69,11 @@ def test_update_event_theme(db_session: Session, event_theme_fixture) -> None:
|
||||
|
||||
def test_delete_event_theme(db_session: Session, event_theme_fixture) -> None:
|
||||
theme_id = event_theme_fixture.id
|
||||
deleted_theme = event_theme.remove(db=db_session, id=theme_id)
|
||||
deleted_theme = event_theme_crud.remove(db=db_session, id=theme_id)
|
||||
assert deleted_theme.id == theme_id
|
||||
|
||||
# Verify theme no longer exists
|
||||
theme = event_theme.get(db=db_session, id=theme_id)
|
||||
theme = event_theme_crud.get(db=db_session, id=theme_id)
|
||||
assert theme is None
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ def test_get_active_themes(db_session: Session, event_theme_fixture, mock_event)
|
||||
db_session.commit()
|
||||
|
||||
# Get active themes
|
||||
active_themes = event_theme.get_active_themes(db=db_session)
|
||||
active_themes = event_theme_crud.get_active_themes(db=db_session)
|
||||
|
||||
assert len(active_themes) > 0
|
||||
assert any(theme.id == event_theme_fixture.id for theme in active_themes)
|
||||
@@ -104,21 +104,21 @@ def test_get_multi_themes(db_session: Session, event_theme_fixture) -> None:
|
||||
"body": "Lato"
|
||||
}
|
||||
)
|
||||
event_theme.create(db=db_session, obj_in=another_theme)
|
||||
event_theme_crud.create(db=db_session, obj_in=another_theme)
|
||||
|
||||
# Test pagination
|
||||
themes = event_theme.get_multi(db=db_session, skip=0, limit=10)
|
||||
themes = event_theme_crud.get_multi(db=db_session, skip=0, limit=10)
|
||||
assert len(themes) >= 2 # Should have at least the fixture and the new theme
|
||||
|
||||
|
||||
def test_get_non_existent_theme(db_session: Session) -> None:
|
||||
non_existent_id = UUID('00000000-0000-0000-0000-000000000000')
|
||||
theme = event_theme.get(db=db_session, id=non_existent_id)
|
||||
theme = event_theme_crud.get(db=db_session, id=non_existent_id)
|
||||
assert theme is None
|
||||
|
||||
|
||||
|
||||
def test_get_non_existent_theme_by_name(db_session: Session) -> None:
|
||||
non_existent_name = "Non-existent Theme"
|
||||
theme = event_theme.get_by_name(db=db_session, name=non_existent_name)
|
||||
theme = event_theme_crud.get_by_name(db=db_session, name=non_existent_name)
|
||||
assert theme is None
|
||||
@@ -1,6 +1,6 @@
|
||||
import pytest
|
||||
|
||||
from app.crud.user import user as user_crud
|
||||
from app.crud.user import user_crud as user_crud
|
||||
from app.models.user import User
|
||||
from app.schemas.users import UserCreate, UserUpdate
|
||||
|
||||
|
||||
Reference in New Issue
Block a user