Skip to content

issue-114 debugged fantom deleted item problem #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petrCher merged 1 commit into from
Apr 10, 2026
Merged

issue-114 debugged fantom deleted item problem #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions rental_backend/routes/item_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ async def make_item_type_available(
"""
if count < 0:
raise ValueError(count)
types = db.session.query(ItemType).filter(ItemType.id == id).one_or_none()
types = ItemType.query(session=db.session).filter(ItemType.id == id).one_or_none()
if not types:
raise ObjectNotFound(ItemType, id)
items = (
db.session.query(Item)
Item.query(session=db.session)
.outerjoin(
RentalSession,
and_(RentalSession.item_id == Item.id, RentalSession.status.in_([RentStatus.ACTIVE, RentStatus.RESERVED])),
Expand All @@ -212,22 +212,22 @@ async def make_item_type_available(
unavailable_items = items.filter(Item.is_available == False).all()
result = {"item_ids": [], "items_changed": 0, "total_available": len(available_items)}
if len(available_items) >= count:
for i in range(len(available_items) - count):
updated_item = Item.update(available_items[i].id, session=db.session, is_available=False)
result["item_ids"].append(items[i].id)
for item in available_items[count:]:
updated_item = Item.update(item.id, session=db.session, is_available=False)
result["item_ids"].append(item.id)
result["items_changed"] += 1
result["total_available"] -= 1
ActionLogger.log_event(
user_id=None,
admin_id=user.get('id'),
session_id=None,
action_type="AVAILABLE_ITEM_TYPE",
details={"id": items[i].id},
details={"id": item.id},
)
else:
for i in range(min(len(unavailable_items), count - len(available_items))):
updated_item = Item.update(unavailable_items[i].id, session=db.session, is_available=True)
result["item_ids"].append(items[i].id)
for item in unavailable_items[: count - len(available_items)]:
updated_item = Item.update(item.id, session=db.session, is_available=True)
result["item_ids"].append(item.id)
result["items_changed"] += 1
result["total_available"] += 1

Expand All @@ -236,7 +236,7 @@ async def make_item_type_available(
admin_id=user.get('id'),
session_id=None,
action_type="AVAILABLE_ITEM_TYPE",
details={"id": items[i].id},
details={"id": item.id},
)
return ItemTypeAvailable.model_validate(result)

Expand Down
Loading