From 573d5f0138bdad6877533ce8eb5788d0706f30b9 Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 18:25:18 +0300 Subject: [PATCH 1/7] hotfix with wrong item delete --- rental_backend/routes/item.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index 7653662..f486142 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -113,7 +113,8 @@ async def delete_item( raise ObjectNotFound(Item, id) Item.delete(id, session=db.session) for rental_session in rental_sessions: - RentalSession.delete(rental_session.id, session=db.session) + if not rental_session.is_deleted: + RentalSession.delete(rental_session.id, session=db.session) strikes = db.session.query(Strike).filter(Strike.session_id == rental_session.id) for strike in strikes: Strike.delete(strike.id, session=db.session) From b4f928bc4169994afa9f6816da57a10bc526e1fe Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 18:31:41 +0300 Subject: [PATCH 2/7] black isort fix --- migrations/env.py | 1 - migrations/versions/498e4ee72e00_add_session_id.py | 1 - migrations/versions/5703d0209eba_softdeletes.py | 1 - migrations/versions/c00918b76464_initial.py | 1 - migrations/versions/f51216ed6c1f_add_fullname.py | 1 - migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py | 1 - .../versions/fccbec47bef3_add_user_phone_to_rental_session.py | 1 - rental_backend/__init__.py | 1 - rental_backend/__main__.py | 1 - rental_backend/models/__init__.py | 1 - rental_backend/models/db.py | 1 - rental_backend/routes/__init__.py | 1 - rental_backend/routes/base.py | 1 - rental_backend/routes/event.py | 1 - rental_backend/routes/item.py | 1 - rental_backend/routes/item_type.py | 1 - rental_backend/routes/rental_session.py | 1 - rental_backend/routes/strike.py | 1 - tests/test_routes/test_item.py | 1 - tests/test_routes/test_item_type.py | 1 - tests/test_routes/test_rental_session.py | 1 - 21 files changed, 21 deletions(-) diff --git a/migrations/env.py b/migrations/env.py index ee3a0ca..9467898 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,7 +6,6 @@ from rental_backend.models.base import BaseDbModel from rental_backend.settings import get_settings - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/498e4ee72e00_add_session_id.py b/migrations/versions/498e4ee72e00_add_session_id.py index c41b2f1..e02e2f4 100644 --- a/migrations/versions/498e4ee72e00_add_session_id.py +++ b/migrations/versions/498e4ee72e00_add_session_id.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '498e4ee72e00' down_revision = 'c00918b76464' branch_labels = None diff --git a/migrations/versions/5703d0209eba_softdeletes.py b/migrations/versions/5703d0209eba_softdeletes.py index da39359..8dd3c06 100644 --- a/migrations/versions/5703d0209eba_softdeletes.py +++ b/migrations/versions/5703d0209eba_softdeletes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '5703d0209eba' down_revision = 'f51216ed6c1f' diff --git a/migrations/versions/c00918b76464_initial.py b/migrations/versions/c00918b76464_initial.py index 2a6f48c..eefcf9c 100644 --- a/migrations/versions/c00918b76464_initial.py +++ b/migrations/versions/c00918b76464_initial.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'c00918b76464' down_revision = None branch_labels = None diff --git a/migrations/versions/f51216ed6c1f_add_fullname.py b/migrations/versions/f51216ed6c1f_add_fullname.py index baff6c7..4f37c5f 100644 --- a/migrations/versions/f51216ed6c1f_add_fullname.py +++ b/migrations/versions/f51216ed6c1f_add_fullname.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'f51216ed6c1f' down_revision = 'fb8a57b65c4d' diff --git a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py index 01adb14..f92c549 100644 --- a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py +++ b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fb8a57b65c4d' down_revision = 'fccbec47bef3' branch_labels = None diff --git a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py index 6ffe8df..e081965 100644 --- a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py +++ b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fccbec47bef3' down_revision = '498e4ee72e00' branch_labels = None diff --git a/rental_backend/__init__.py b/rental_backend/__init__.py index aed50a4..4ed3366 100644 --- a/rental_backend/__init__.py +++ b/rental_backend/__init__.py @@ -1,4 +1,3 @@ import os - __version__ = os.getenv("APP_VERSION", "dev") diff --git a/rental_backend/__main__.py b/rental_backend/__main__.py index 0b3c742..b9e9c68 100644 --- a/rental_backend/__main__.py +++ b/rental_backend/__main__.py @@ -2,6 +2,5 @@ from rental_backend.routes.base import app - if __name__ == '__main__': uvicorn.run(app) diff --git a/rental_backend/models/__init__.py b/rental_backend/models/__init__.py index de7fcf3..4db79a4 100644 --- a/rental_backend/models/__init__.py +++ b/rental_backend/models/__init__.py @@ -1,5 +1,4 @@ from .base import Base, BaseDbModel from .db import * - __all__ = ["Base", "BaseDbModel", "Item", "ItemType", "RentalSession", "Event", "Strike"] diff --git a/rental_backend/models/db.py b/rental_backend/models/db.py index bdbe9c7..8575f79 100644 --- a/rental_backend/models/db.py +++ b/rental_backend/models/db.py @@ -25,7 +25,6 @@ from .base import BaseDbModel - settings: Settings = get_settings() diff --git a/rental_backend/routes/__init__.py b/rental_backend/routes/__init__.py index 5e4fcb1..e53b88c 100644 --- a/rental_backend/routes/__init__.py +++ b/rental_backend/routes/__init__.py @@ -1,5 +1,4 @@ from . import exc_handlers from .base import app - __all__ = ["app", "exc_handlers"] diff --git a/rental_backend/routes/base.py b/rental_backend/routes/base.py index 31a2226..04b1fa1 100644 --- a/rental_backend/routes/base.py +++ b/rental_backend/routes/base.py @@ -11,7 +11,6 @@ from rental_backend.routes.strike import strike from rental_backend.settings import get_settings - settings = get_settings() app = FastAPI( title='Сервис цифрового проката', diff --git a/rental_backend/routes/event.py b/rental_backend/routes/event.py index 8dde984..d3791b6 100644 --- a/rental_backend/routes/event.py +++ b/rental_backend/routes/event.py @@ -7,7 +7,6 @@ from rental_backend.models.db import Event from rental_backend.schemas.models import EventGet - event = APIRouter(prefix="/event", tags=["Event"]) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index f486142..5617a60 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -10,7 +10,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item = APIRouter(prefix="/item", tags=["Items"]) diff --git a/rental_backend/routes/item_type.py b/rental_backend/routes/item_type.py index ddeab59..10c8d8a 100644 --- a/rental_backend/routes/item_type.py +++ b/rental_backend/routes/item_type.py @@ -15,7 +15,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item_type = APIRouter(prefix="/itemtype", tags=["ItemType"]) diff --git a/rental_backend/routes/rental_session.py b/rental_backend/routes/rental_session.py index 7ea1ee2..2495e9f 100644 --- a/rental_backend/routes/rental_session.py +++ b/rental_backend/routes/rental_session.py @@ -26,7 +26,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() rental_session = APIRouter(prefix="/rental-sessions", tags=["RentalSession"]) diff --git a/rental_backend/routes/strike.py b/rental_backend/routes/strike.py index a0afc5d..2264bcb 100644 --- a/rental_backend/routes/strike.py +++ b/rental_backend/routes/strike.py @@ -11,7 +11,6 @@ from rental_backend.schemas.models import StrikeGet, StrikePost from rental_backend.utils.action import ActionLogger - strike = APIRouter(prefix="/strike", tags=["Strike"]) diff --git a/tests/test_routes/test_item.py b/tests/test_routes/test_item.py index e21a3e8..8d1fc40 100644 --- a/tests/test_routes/test_item.py +++ b/tests/test_routes/test_item.py @@ -6,7 +6,6 @@ from rental_backend.models import Item from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/item' diff --git a/tests/test_routes/test_item_type.py b/tests/test_routes/test_item_type.py index 764335a..fff5fac 100644 --- a/tests/test_routes/test_item_type.py +++ b/tests/test_routes/test_item_type.py @@ -5,7 +5,6 @@ from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/itemtype' diff --git a/tests/test_routes/test_rental_session.py b/tests/test_routes/test_rental_session.py index 791155f..4fdc6bd 100644 --- a/tests/test_routes/test_rental_session.py +++ b/tests/test_routes/test_rental_session.py @@ -12,7 +12,6 @@ from rental_backend.schemas.models import RentStatus from tests.conftest import model_to_dict - obj_prefix: str = rental_session.prefix From e7f9b917b36b91516ab826c4e507ecef40247049 Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 20:12:20 +0300 Subject: [PATCH 3/7] Revert "black isort fix" This reverts commit b4f928bc4169994afa9f6816da57a10bc526e1fe. --- migrations/env.py | 1 + migrations/versions/498e4ee72e00_add_session_id.py | 1 + migrations/versions/5703d0209eba_softdeletes.py | 1 + migrations/versions/c00918b76464_initial.py | 1 + migrations/versions/f51216ed6c1f_add_fullname.py | 1 + migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py | 1 + .../versions/fccbec47bef3_add_user_phone_to_rental_session.py | 1 + rental_backend/__init__.py | 1 + rental_backend/__main__.py | 1 + rental_backend/models/__init__.py | 1 + rental_backend/models/db.py | 1 + rental_backend/routes/__init__.py | 1 + rental_backend/routes/base.py | 1 + rental_backend/routes/event.py | 1 + rental_backend/routes/item.py | 1 + rental_backend/routes/item_type.py | 1 + rental_backend/routes/rental_session.py | 1 + rental_backend/routes/strike.py | 1 + tests/test_routes/test_item.py | 1 + tests/test_routes/test_item_type.py | 1 + tests/test_routes/test_rental_session.py | 1 + 21 files changed, 21 insertions(+) diff --git a/migrations/env.py b/migrations/env.py index 9467898..ee3a0ca 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,6 +6,7 @@ from rental_backend.models.base import BaseDbModel from rental_backend.settings import get_settings + # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/498e4ee72e00_add_session_id.py b/migrations/versions/498e4ee72e00_add_session_id.py index e02e2f4..c41b2f1 100644 --- a/migrations/versions/498e4ee72e00_add_session_id.py +++ b/migrations/versions/498e4ee72e00_add_session_id.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = '498e4ee72e00' down_revision = 'c00918b76464' branch_labels = None diff --git a/migrations/versions/5703d0209eba_softdeletes.py b/migrations/versions/5703d0209eba_softdeletes.py index 8dd3c06..da39359 100644 --- a/migrations/versions/5703d0209eba_softdeletes.py +++ b/migrations/versions/5703d0209eba_softdeletes.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + # revision identifiers, used by Alembic. revision = '5703d0209eba' down_revision = 'f51216ed6c1f' diff --git a/migrations/versions/c00918b76464_initial.py b/migrations/versions/c00918b76464_initial.py index eefcf9c..2a6f48c 100644 --- a/migrations/versions/c00918b76464_initial.py +++ b/migrations/versions/c00918b76464_initial.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = 'c00918b76464' down_revision = None branch_labels = None diff --git a/migrations/versions/f51216ed6c1f_add_fullname.py b/migrations/versions/f51216ed6c1f_add_fullname.py index 4f37c5f..baff6c7 100644 --- a/migrations/versions/f51216ed6c1f_add_fullname.py +++ b/migrations/versions/f51216ed6c1f_add_fullname.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + # revision identifiers, used by Alembic. revision = 'f51216ed6c1f' down_revision = 'fb8a57b65c4d' diff --git a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py index f92c549..01adb14 100644 --- a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py +++ b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = 'fb8a57b65c4d' down_revision = 'fccbec47bef3' branch_labels = None diff --git a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py index e081965..6ffe8df 100644 --- a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py +++ b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = 'fccbec47bef3' down_revision = '498e4ee72e00' branch_labels = None diff --git a/rental_backend/__init__.py b/rental_backend/__init__.py index 4ed3366..aed50a4 100644 --- a/rental_backend/__init__.py +++ b/rental_backend/__init__.py @@ -1,3 +1,4 @@ import os + __version__ = os.getenv("APP_VERSION", "dev") diff --git a/rental_backend/__main__.py b/rental_backend/__main__.py index b9e9c68..0b3c742 100644 --- a/rental_backend/__main__.py +++ b/rental_backend/__main__.py @@ -2,5 +2,6 @@ from rental_backend.routes.base import app + if __name__ == '__main__': uvicorn.run(app) diff --git a/rental_backend/models/__init__.py b/rental_backend/models/__init__.py index 4db79a4..de7fcf3 100644 --- a/rental_backend/models/__init__.py +++ b/rental_backend/models/__init__.py @@ -1,4 +1,5 @@ from .base import Base, BaseDbModel from .db import * + __all__ = ["Base", "BaseDbModel", "Item", "ItemType", "RentalSession", "Event", "Strike"] diff --git a/rental_backend/models/db.py b/rental_backend/models/db.py index 8575f79..bdbe9c7 100644 --- a/rental_backend/models/db.py +++ b/rental_backend/models/db.py @@ -25,6 +25,7 @@ from .base import BaseDbModel + settings: Settings = get_settings() diff --git a/rental_backend/routes/__init__.py b/rental_backend/routes/__init__.py index e53b88c..5e4fcb1 100644 --- a/rental_backend/routes/__init__.py +++ b/rental_backend/routes/__init__.py @@ -1,4 +1,5 @@ from . import exc_handlers from .base import app + __all__ = ["app", "exc_handlers"] diff --git a/rental_backend/routes/base.py b/rental_backend/routes/base.py index 04b1fa1..31a2226 100644 --- a/rental_backend/routes/base.py +++ b/rental_backend/routes/base.py @@ -11,6 +11,7 @@ from rental_backend.routes.strike import strike from rental_backend.settings import get_settings + settings = get_settings() app = FastAPI( title='Сервис цифрового проката', diff --git a/rental_backend/routes/event.py b/rental_backend/routes/event.py index d3791b6..8dde984 100644 --- a/rental_backend/routes/event.py +++ b/rental_backend/routes/event.py @@ -7,6 +7,7 @@ from rental_backend.models.db import Event from rental_backend.schemas.models import EventGet + event = APIRouter(prefix="/event", tags=["Event"]) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index 5617a60..f486142 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -10,6 +10,7 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger + settings: Settings = get_settings() item = APIRouter(prefix="/item", tags=["Items"]) diff --git a/rental_backend/routes/item_type.py b/rental_backend/routes/item_type.py index 10c8d8a..ddeab59 100644 --- a/rental_backend/routes/item_type.py +++ b/rental_backend/routes/item_type.py @@ -15,6 +15,7 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger + settings: Settings = get_settings() item_type = APIRouter(prefix="/itemtype", tags=["ItemType"]) diff --git a/rental_backend/routes/rental_session.py b/rental_backend/routes/rental_session.py index 2495e9f..7ea1ee2 100644 --- a/rental_backend/routes/rental_session.py +++ b/rental_backend/routes/rental_session.py @@ -26,6 +26,7 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger + settings: Settings = get_settings() rental_session = APIRouter(prefix="/rental-sessions", tags=["RentalSession"]) diff --git a/rental_backend/routes/strike.py b/rental_backend/routes/strike.py index 2264bcb..a0afc5d 100644 --- a/rental_backend/routes/strike.py +++ b/rental_backend/routes/strike.py @@ -11,6 +11,7 @@ from rental_backend.schemas.models import StrikeGet, StrikePost from rental_backend.utils.action import ActionLogger + strike = APIRouter(prefix="/strike", tags=["Strike"]) diff --git a/tests/test_routes/test_item.py b/tests/test_routes/test_item.py index 8d1fc40..e21a3e8 100644 --- a/tests/test_routes/test_item.py +++ b/tests/test_routes/test_item.py @@ -6,6 +6,7 @@ from rental_backend.models import Item from rental_backend.settings import get_settings + logger = logging.getLogger(__name__) url: str = '/item' diff --git a/tests/test_routes/test_item_type.py b/tests/test_routes/test_item_type.py index fff5fac..764335a 100644 --- a/tests/test_routes/test_item_type.py +++ b/tests/test_routes/test_item_type.py @@ -5,6 +5,7 @@ from rental_backend.settings import get_settings + logger = logging.getLogger(__name__) url: str = '/itemtype' diff --git a/tests/test_routes/test_rental_session.py b/tests/test_routes/test_rental_session.py index 4fdc6bd..791155f 100644 --- a/tests/test_routes/test_rental_session.py +++ b/tests/test_routes/test_rental_session.py @@ -12,6 +12,7 @@ from rental_backend.schemas.models import RentStatus from tests.conftest import model_to_dict + obj_prefix: str = rental_session.prefix From f7bf393f6feb97fbb8e3aceb50338e833f284eda Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 20:16:08 +0300 Subject: [PATCH 4/7] fix --- migrations/env.py | 1 - migrations/versions/498e4ee72e00_add_session_id.py | 1 - migrations/versions/5703d0209eba_softdeletes.py | 1 - migrations/versions/c00918b76464_initial.py | 1 - migrations/versions/f51216ed6c1f_add_fullname.py | 1 - migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py | 1 - .../versions/fccbec47bef3_add_user_phone_to_rental_session.py | 1 - rental_backend/__init__.py | 1 - rental_backend/__main__.py | 1 - rental_backend/models/__init__.py | 1 - rental_backend/models/db.py | 1 - rental_backend/routes/__init__.py | 1 - rental_backend/routes/base.py | 1 - rental_backend/routes/event.py | 1 - rental_backend/routes/item.py | 1 - rental_backend/routes/item_type.py | 1 - rental_backend/routes/rental_session.py | 1 - rental_backend/routes/strike.py | 1 - tests/test_routes/test_item.py | 1 - tests/test_routes/test_item_type.py | 1 - tests/test_routes/test_rental_session.py | 1 - 21 files changed, 21 deletions(-) diff --git a/migrations/env.py b/migrations/env.py index ee3a0ca..9467898 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,7 +6,6 @@ from rental_backend.models.base import BaseDbModel from rental_backend.settings import get_settings - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/498e4ee72e00_add_session_id.py b/migrations/versions/498e4ee72e00_add_session_id.py index c41b2f1..e02e2f4 100644 --- a/migrations/versions/498e4ee72e00_add_session_id.py +++ b/migrations/versions/498e4ee72e00_add_session_id.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '498e4ee72e00' down_revision = 'c00918b76464' branch_labels = None diff --git a/migrations/versions/5703d0209eba_softdeletes.py b/migrations/versions/5703d0209eba_softdeletes.py index da39359..8dd3c06 100644 --- a/migrations/versions/5703d0209eba_softdeletes.py +++ b/migrations/versions/5703d0209eba_softdeletes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '5703d0209eba' down_revision = 'f51216ed6c1f' diff --git a/migrations/versions/c00918b76464_initial.py b/migrations/versions/c00918b76464_initial.py index 2a6f48c..eefcf9c 100644 --- a/migrations/versions/c00918b76464_initial.py +++ b/migrations/versions/c00918b76464_initial.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'c00918b76464' down_revision = None branch_labels = None diff --git a/migrations/versions/f51216ed6c1f_add_fullname.py b/migrations/versions/f51216ed6c1f_add_fullname.py index baff6c7..4f37c5f 100644 --- a/migrations/versions/f51216ed6c1f_add_fullname.py +++ b/migrations/versions/f51216ed6c1f_add_fullname.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'f51216ed6c1f' down_revision = 'fb8a57b65c4d' diff --git a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py index 01adb14..f92c549 100644 --- a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py +++ b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fb8a57b65c4d' down_revision = 'fccbec47bef3' branch_labels = None diff --git a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py index 6ffe8df..e081965 100644 --- a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py +++ b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fccbec47bef3' down_revision = '498e4ee72e00' branch_labels = None diff --git a/rental_backend/__init__.py b/rental_backend/__init__.py index aed50a4..4ed3366 100644 --- a/rental_backend/__init__.py +++ b/rental_backend/__init__.py @@ -1,4 +1,3 @@ import os - __version__ = os.getenv("APP_VERSION", "dev") diff --git a/rental_backend/__main__.py b/rental_backend/__main__.py index 0b3c742..b9e9c68 100644 --- a/rental_backend/__main__.py +++ b/rental_backend/__main__.py @@ -2,6 +2,5 @@ from rental_backend.routes.base import app - if __name__ == '__main__': uvicorn.run(app) diff --git a/rental_backend/models/__init__.py b/rental_backend/models/__init__.py index de7fcf3..4db79a4 100644 --- a/rental_backend/models/__init__.py +++ b/rental_backend/models/__init__.py @@ -1,5 +1,4 @@ from .base import Base, BaseDbModel from .db import * - __all__ = ["Base", "BaseDbModel", "Item", "ItemType", "RentalSession", "Event", "Strike"] diff --git a/rental_backend/models/db.py b/rental_backend/models/db.py index bdbe9c7..8575f79 100644 --- a/rental_backend/models/db.py +++ b/rental_backend/models/db.py @@ -25,7 +25,6 @@ from .base import BaseDbModel - settings: Settings = get_settings() diff --git a/rental_backend/routes/__init__.py b/rental_backend/routes/__init__.py index 5e4fcb1..e53b88c 100644 --- a/rental_backend/routes/__init__.py +++ b/rental_backend/routes/__init__.py @@ -1,5 +1,4 @@ from . import exc_handlers from .base import app - __all__ = ["app", "exc_handlers"] diff --git a/rental_backend/routes/base.py b/rental_backend/routes/base.py index 31a2226..04b1fa1 100644 --- a/rental_backend/routes/base.py +++ b/rental_backend/routes/base.py @@ -11,7 +11,6 @@ from rental_backend.routes.strike import strike from rental_backend.settings import get_settings - settings = get_settings() app = FastAPI( title='Сервис цифрового проката', diff --git a/rental_backend/routes/event.py b/rental_backend/routes/event.py index 8dde984..d3791b6 100644 --- a/rental_backend/routes/event.py +++ b/rental_backend/routes/event.py @@ -7,7 +7,6 @@ from rental_backend.models.db import Event from rental_backend.schemas.models import EventGet - event = APIRouter(prefix="/event", tags=["Event"]) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index f486142..5617a60 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -10,7 +10,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item = APIRouter(prefix="/item", tags=["Items"]) diff --git a/rental_backend/routes/item_type.py b/rental_backend/routes/item_type.py index ddeab59..10c8d8a 100644 --- a/rental_backend/routes/item_type.py +++ b/rental_backend/routes/item_type.py @@ -15,7 +15,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item_type = APIRouter(prefix="/itemtype", tags=["ItemType"]) diff --git a/rental_backend/routes/rental_session.py b/rental_backend/routes/rental_session.py index 7ea1ee2..2495e9f 100644 --- a/rental_backend/routes/rental_session.py +++ b/rental_backend/routes/rental_session.py @@ -26,7 +26,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() rental_session = APIRouter(prefix="/rental-sessions", tags=["RentalSession"]) diff --git a/rental_backend/routes/strike.py b/rental_backend/routes/strike.py index a0afc5d..2264bcb 100644 --- a/rental_backend/routes/strike.py +++ b/rental_backend/routes/strike.py @@ -11,7 +11,6 @@ from rental_backend.schemas.models import StrikeGet, StrikePost from rental_backend.utils.action import ActionLogger - strike = APIRouter(prefix="/strike", tags=["Strike"]) diff --git a/tests/test_routes/test_item.py b/tests/test_routes/test_item.py index e21a3e8..8d1fc40 100644 --- a/tests/test_routes/test_item.py +++ b/tests/test_routes/test_item.py @@ -6,7 +6,6 @@ from rental_backend.models import Item from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/item' diff --git a/tests/test_routes/test_item_type.py b/tests/test_routes/test_item_type.py index 764335a..fff5fac 100644 --- a/tests/test_routes/test_item_type.py +++ b/tests/test_routes/test_item_type.py @@ -5,7 +5,6 @@ from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/itemtype' diff --git a/tests/test_routes/test_rental_session.py b/tests/test_routes/test_rental_session.py index 791155f..4fdc6bd 100644 --- a/tests/test_routes/test_rental_session.py +++ b/tests/test_routes/test_rental_session.py @@ -12,7 +12,6 @@ from rental_backend.schemas.models import RentStatus from tests.conftest import model_to_dict - obj_prefix: str = rental_session.prefix From 460d1ea0e6c96c2862f5c0ca8332051232f6b2ac Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 20:20:49 +0300 Subject: [PATCH 5/7] Revert "fix" This reverts commit f7bf393f6feb97fbb8e3aceb50338e833f284eda. --- migrations/env.py | 1 + migrations/versions/498e4ee72e00_add_session_id.py | 1 + migrations/versions/5703d0209eba_softdeletes.py | 1 + migrations/versions/c00918b76464_initial.py | 1 + migrations/versions/f51216ed6c1f_add_fullname.py | 1 + migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py | 1 + .../versions/fccbec47bef3_add_user_phone_to_rental_session.py | 1 + rental_backend/__init__.py | 1 + rental_backend/__main__.py | 1 + rental_backend/models/__init__.py | 1 + rental_backend/models/db.py | 1 + rental_backend/routes/__init__.py | 1 + rental_backend/routes/base.py | 1 + rental_backend/routes/event.py | 1 + rental_backend/routes/item.py | 1 + rental_backend/routes/item_type.py | 1 + rental_backend/routes/rental_session.py | 1 + rental_backend/routes/strike.py | 1 + tests/test_routes/test_item.py | 1 + tests/test_routes/test_item_type.py | 1 + tests/test_routes/test_rental_session.py | 1 + 21 files changed, 21 insertions(+) diff --git a/migrations/env.py b/migrations/env.py index 9467898..ee3a0ca 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,6 +6,7 @@ from rental_backend.models.base import BaseDbModel from rental_backend.settings import get_settings + # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/498e4ee72e00_add_session_id.py b/migrations/versions/498e4ee72e00_add_session_id.py index e02e2f4..c41b2f1 100644 --- a/migrations/versions/498e4ee72e00_add_session_id.py +++ b/migrations/versions/498e4ee72e00_add_session_id.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = '498e4ee72e00' down_revision = 'c00918b76464' branch_labels = None diff --git a/migrations/versions/5703d0209eba_softdeletes.py b/migrations/versions/5703d0209eba_softdeletes.py index 8dd3c06..da39359 100644 --- a/migrations/versions/5703d0209eba_softdeletes.py +++ b/migrations/versions/5703d0209eba_softdeletes.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + # revision identifiers, used by Alembic. revision = '5703d0209eba' down_revision = 'f51216ed6c1f' diff --git a/migrations/versions/c00918b76464_initial.py b/migrations/versions/c00918b76464_initial.py index eefcf9c..2a6f48c 100644 --- a/migrations/versions/c00918b76464_initial.py +++ b/migrations/versions/c00918b76464_initial.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = 'c00918b76464' down_revision = None branch_labels = None diff --git a/migrations/versions/f51216ed6c1f_add_fullname.py b/migrations/versions/f51216ed6c1f_add_fullname.py index 4f37c5f..baff6c7 100644 --- a/migrations/versions/f51216ed6c1f_add_fullname.py +++ b/migrations/versions/f51216ed6c1f_add_fullname.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + # revision identifiers, used by Alembic. revision = 'f51216ed6c1f' down_revision = 'fb8a57b65c4d' diff --git a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py index f92c549..01adb14 100644 --- a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py +++ b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = 'fb8a57b65c4d' down_revision = 'fccbec47bef3' branch_labels = None diff --git a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py index e081965..6ffe8df 100644 --- a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py +++ b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py @@ -9,6 +9,7 @@ import sqlalchemy as sa from alembic import op + revision = 'fccbec47bef3' down_revision = '498e4ee72e00' branch_labels = None diff --git a/rental_backend/__init__.py b/rental_backend/__init__.py index 4ed3366..aed50a4 100644 --- a/rental_backend/__init__.py +++ b/rental_backend/__init__.py @@ -1,3 +1,4 @@ import os + __version__ = os.getenv("APP_VERSION", "dev") diff --git a/rental_backend/__main__.py b/rental_backend/__main__.py index b9e9c68..0b3c742 100644 --- a/rental_backend/__main__.py +++ b/rental_backend/__main__.py @@ -2,5 +2,6 @@ from rental_backend.routes.base import app + if __name__ == '__main__': uvicorn.run(app) diff --git a/rental_backend/models/__init__.py b/rental_backend/models/__init__.py index 4db79a4..de7fcf3 100644 --- a/rental_backend/models/__init__.py +++ b/rental_backend/models/__init__.py @@ -1,4 +1,5 @@ from .base import Base, BaseDbModel from .db import * + __all__ = ["Base", "BaseDbModel", "Item", "ItemType", "RentalSession", "Event", "Strike"] diff --git a/rental_backend/models/db.py b/rental_backend/models/db.py index 8575f79..bdbe9c7 100644 --- a/rental_backend/models/db.py +++ b/rental_backend/models/db.py @@ -25,6 +25,7 @@ from .base import BaseDbModel + settings: Settings = get_settings() diff --git a/rental_backend/routes/__init__.py b/rental_backend/routes/__init__.py index e53b88c..5e4fcb1 100644 --- a/rental_backend/routes/__init__.py +++ b/rental_backend/routes/__init__.py @@ -1,4 +1,5 @@ from . import exc_handlers from .base import app + __all__ = ["app", "exc_handlers"] diff --git a/rental_backend/routes/base.py b/rental_backend/routes/base.py index 04b1fa1..31a2226 100644 --- a/rental_backend/routes/base.py +++ b/rental_backend/routes/base.py @@ -11,6 +11,7 @@ from rental_backend.routes.strike import strike from rental_backend.settings import get_settings + settings = get_settings() app = FastAPI( title='Сервис цифрового проката', diff --git a/rental_backend/routes/event.py b/rental_backend/routes/event.py index d3791b6..8dde984 100644 --- a/rental_backend/routes/event.py +++ b/rental_backend/routes/event.py @@ -7,6 +7,7 @@ from rental_backend.models.db import Event from rental_backend.schemas.models import EventGet + event = APIRouter(prefix="/event", tags=["Event"]) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index 5617a60..f486142 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -10,6 +10,7 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger + settings: Settings = get_settings() item = APIRouter(prefix="/item", tags=["Items"]) diff --git a/rental_backend/routes/item_type.py b/rental_backend/routes/item_type.py index 10c8d8a..ddeab59 100644 --- a/rental_backend/routes/item_type.py +++ b/rental_backend/routes/item_type.py @@ -15,6 +15,7 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger + settings: Settings = get_settings() item_type = APIRouter(prefix="/itemtype", tags=["ItemType"]) diff --git a/rental_backend/routes/rental_session.py b/rental_backend/routes/rental_session.py index 2495e9f..7ea1ee2 100644 --- a/rental_backend/routes/rental_session.py +++ b/rental_backend/routes/rental_session.py @@ -26,6 +26,7 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger + settings: Settings = get_settings() rental_session = APIRouter(prefix="/rental-sessions", tags=["RentalSession"]) diff --git a/rental_backend/routes/strike.py b/rental_backend/routes/strike.py index 2264bcb..a0afc5d 100644 --- a/rental_backend/routes/strike.py +++ b/rental_backend/routes/strike.py @@ -11,6 +11,7 @@ from rental_backend.schemas.models import StrikeGet, StrikePost from rental_backend.utils.action import ActionLogger + strike = APIRouter(prefix="/strike", tags=["Strike"]) diff --git a/tests/test_routes/test_item.py b/tests/test_routes/test_item.py index 8d1fc40..e21a3e8 100644 --- a/tests/test_routes/test_item.py +++ b/tests/test_routes/test_item.py @@ -6,6 +6,7 @@ from rental_backend.models import Item from rental_backend.settings import get_settings + logger = logging.getLogger(__name__) url: str = '/item' diff --git a/tests/test_routes/test_item_type.py b/tests/test_routes/test_item_type.py index fff5fac..764335a 100644 --- a/tests/test_routes/test_item_type.py +++ b/tests/test_routes/test_item_type.py @@ -5,6 +5,7 @@ from rental_backend.settings import get_settings + logger = logging.getLogger(__name__) url: str = '/itemtype' diff --git a/tests/test_routes/test_rental_session.py b/tests/test_routes/test_rental_session.py index 4fdc6bd..791155f 100644 --- a/tests/test_routes/test_rental_session.py +++ b/tests/test_routes/test_rental_session.py @@ -12,6 +12,7 @@ from rental_backend.schemas.models import RentStatus from tests.conftest import model_to_dict + obj_prefix: str = rental_session.prefix From 0c215f1b24b122f86afb9ccac2d08a1c20069c6d Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 20:27:54 +0300 Subject: [PATCH 6/7] test fix --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bf2a06d..5aa8239 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ skip-string-normalization = true line_length = 120 multi_line_output = 3 profile = "black" -lines_after_imports = 2 +lines_after_imports = 1 include_trailing_comma = true [tool.pytest.ini_options] From d76b927d365561359529e7eab27a1a84873ab82c Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Thu, 26 Feb 2026 21:10:17 +0300 Subject: [PATCH 7/7] fix --- migrations/env.py | 1 - migrations/versions/498e4ee72e00_add_session_id.py | 1 - migrations/versions/5703d0209eba_softdeletes.py | 1 - migrations/versions/c00918b76464_initial.py | 1 - migrations/versions/f51216ed6c1f_add_fullname.py | 1 - migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py | 1 - .../versions/fccbec47bef3_add_user_phone_to_rental_session.py | 1 - rental_backend/__init__.py | 1 - rental_backend/__main__.py | 1 - rental_backend/models/__init__.py | 1 - rental_backend/models/db.py | 1 - rental_backend/routes/__init__.py | 1 - rental_backend/routes/base.py | 1 - rental_backend/routes/event.py | 1 - rental_backend/routes/item.py | 1 - rental_backend/routes/item_type.py | 1 - rental_backend/routes/rental_session.py | 1 - rental_backend/routes/strike.py | 1 - tests/test_routes/test_item.py | 1 - tests/test_routes/test_item_type.py | 1 - tests/test_routes/test_rental_session.py | 1 - 21 files changed, 21 deletions(-) diff --git a/migrations/env.py b/migrations/env.py index ee3a0ca..9467898 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,7 +6,6 @@ from rental_backend.models.base import BaseDbModel from rental_backend.settings import get_settings - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/498e4ee72e00_add_session_id.py b/migrations/versions/498e4ee72e00_add_session_id.py index c41b2f1..e02e2f4 100644 --- a/migrations/versions/498e4ee72e00_add_session_id.py +++ b/migrations/versions/498e4ee72e00_add_session_id.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '498e4ee72e00' down_revision = 'c00918b76464' branch_labels = None diff --git a/migrations/versions/5703d0209eba_softdeletes.py b/migrations/versions/5703d0209eba_softdeletes.py index da39359..8dd3c06 100644 --- a/migrations/versions/5703d0209eba_softdeletes.py +++ b/migrations/versions/5703d0209eba_softdeletes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '5703d0209eba' down_revision = 'f51216ed6c1f' diff --git a/migrations/versions/c00918b76464_initial.py b/migrations/versions/c00918b76464_initial.py index 2a6f48c..eefcf9c 100644 --- a/migrations/versions/c00918b76464_initial.py +++ b/migrations/versions/c00918b76464_initial.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'c00918b76464' down_revision = None branch_labels = None diff --git a/migrations/versions/f51216ed6c1f_add_fullname.py b/migrations/versions/f51216ed6c1f_add_fullname.py index baff6c7..4f37c5f 100644 --- a/migrations/versions/f51216ed6c1f_add_fullname.py +++ b/migrations/versions/f51216ed6c1f_add_fullname.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'f51216ed6c1f' down_revision = 'fb8a57b65c4d' diff --git a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py index 01adb14..f92c549 100644 --- a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py +++ b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fb8a57b65c4d' down_revision = 'fccbec47bef3' branch_labels = None diff --git a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py index 6ffe8df..e081965 100644 --- a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py +++ b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fccbec47bef3' down_revision = '498e4ee72e00' branch_labels = None diff --git a/rental_backend/__init__.py b/rental_backend/__init__.py index aed50a4..4ed3366 100644 --- a/rental_backend/__init__.py +++ b/rental_backend/__init__.py @@ -1,4 +1,3 @@ import os - __version__ = os.getenv("APP_VERSION", "dev") diff --git a/rental_backend/__main__.py b/rental_backend/__main__.py index 0b3c742..b9e9c68 100644 --- a/rental_backend/__main__.py +++ b/rental_backend/__main__.py @@ -2,6 +2,5 @@ from rental_backend.routes.base import app - if __name__ == '__main__': uvicorn.run(app) diff --git a/rental_backend/models/__init__.py b/rental_backend/models/__init__.py index de7fcf3..4db79a4 100644 --- a/rental_backend/models/__init__.py +++ b/rental_backend/models/__init__.py @@ -1,5 +1,4 @@ from .base import Base, BaseDbModel from .db import * - __all__ = ["Base", "BaseDbModel", "Item", "ItemType", "RentalSession", "Event", "Strike"] diff --git a/rental_backend/models/db.py b/rental_backend/models/db.py index bdbe9c7..8575f79 100644 --- a/rental_backend/models/db.py +++ b/rental_backend/models/db.py @@ -25,7 +25,6 @@ from .base import BaseDbModel - settings: Settings = get_settings() diff --git a/rental_backend/routes/__init__.py b/rental_backend/routes/__init__.py index 5e4fcb1..e53b88c 100644 --- a/rental_backend/routes/__init__.py +++ b/rental_backend/routes/__init__.py @@ -1,5 +1,4 @@ from . import exc_handlers from .base import app - __all__ = ["app", "exc_handlers"] diff --git a/rental_backend/routes/base.py b/rental_backend/routes/base.py index 31a2226..04b1fa1 100644 --- a/rental_backend/routes/base.py +++ b/rental_backend/routes/base.py @@ -11,7 +11,6 @@ from rental_backend.routes.strike import strike from rental_backend.settings import get_settings - settings = get_settings() app = FastAPI( title='Сервис цифрового проката', diff --git a/rental_backend/routes/event.py b/rental_backend/routes/event.py index 8dde984..d3791b6 100644 --- a/rental_backend/routes/event.py +++ b/rental_backend/routes/event.py @@ -7,7 +7,6 @@ from rental_backend.models.db import Event from rental_backend.schemas.models import EventGet - event = APIRouter(prefix="/event", tags=["Event"]) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index f486142..5617a60 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -10,7 +10,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item = APIRouter(prefix="/item", tags=["Items"]) diff --git a/rental_backend/routes/item_type.py b/rental_backend/routes/item_type.py index ddeab59..10c8d8a 100644 --- a/rental_backend/routes/item_type.py +++ b/rental_backend/routes/item_type.py @@ -15,7 +15,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item_type = APIRouter(prefix="/itemtype", tags=["ItemType"]) diff --git a/rental_backend/routes/rental_session.py b/rental_backend/routes/rental_session.py index 7ea1ee2..2495e9f 100644 --- a/rental_backend/routes/rental_session.py +++ b/rental_backend/routes/rental_session.py @@ -26,7 +26,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() rental_session = APIRouter(prefix="/rental-sessions", tags=["RentalSession"]) diff --git a/rental_backend/routes/strike.py b/rental_backend/routes/strike.py index a0afc5d..2264bcb 100644 --- a/rental_backend/routes/strike.py +++ b/rental_backend/routes/strike.py @@ -11,7 +11,6 @@ from rental_backend.schemas.models import StrikeGet, StrikePost from rental_backend.utils.action import ActionLogger - strike = APIRouter(prefix="/strike", tags=["Strike"]) diff --git a/tests/test_routes/test_item.py b/tests/test_routes/test_item.py index e21a3e8..8d1fc40 100644 --- a/tests/test_routes/test_item.py +++ b/tests/test_routes/test_item.py @@ -6,7 +6,6 @@ from rental_backend.models import Item from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/item' diff --git a/tests/test_routes/test_item_type.py b/tests/test_routes/test_item_type.py index 764335a..fff5fac 100644 --- a/tests/test_routes/test_item_type.py +++ b/tests/test_routes/test_item_type.py @@ -5,7 +5,6 @@ from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/itemtype' diff --git a/tests/test_routes/test_rental_session.py b/tests/test_routes/test_rental_session.py index 791155f..4fdc6bd 100644 --- a/tests/test_routes/test_rental_session.py +++ b/tests/test_routes/test_rental_session.py @@ -12,7 +12,6 @@ from rental_backend.schemas.models import RentStatus from tests.conftest import model_to_dict - obj_prefix: str = rental_session.prefix