hotfix with wrong item delete

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

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

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'

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

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'

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

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

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]

rental_backend/__init__.py

@@ -1,4 +1,3 @@
 import os
 
-
 __version__ = os.getenv("APP_VERSION", "dev")

rental_backend/__main__.py

@@ -2,6 +2,5 @@
 
 from rental_backend.routes.base import app
 
-
 if __name__ == '__main__':
     uvicorn.run(app)

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"]

rental_backend/models/db.py

@@ -25,7 +25,6 @@
 
 from .base import BaseDbModel
 
-
 settings: Settings = get_settings()
 
 

rental_backend/routes/__init__.py

@@ -1,5 +1,4 @@
 from . import exc_handlers
 from .base import app
 
-
 __all__ = ["app", "exc_handlers"]

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='Сервис цифрового проката',

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"])
 
 

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"])
 
@@ -113,7 +112,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)

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"])
 

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"])
 

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"])
 
 

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'
 

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'
 

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