diff --git a/brewman/brewman/routers/account.py b/brewman/brewman/routers/account.py index af98a92d..7ced4d54 100644 --- a/brewman/brewman/routers/account.py +++ b/brewman/brewman/routers/account.py @@ -9,7 +9,7 @@ import brewman.schemas.account as schemas from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import func from sqlalchemy.exc import SQLAlchemyError -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from ..core.security import get_current_active_user as get_user from ..db.session import SessionLocal @@ -220,7 +220,7 @@ def delete_with_data(account: Account, db: Session) -> None: suspense_account = db.query(Account).filter(Account.id == Account.suspense()).first() query: List[Voucher] = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.journals.any(Journal.account_id == account.id)) .all() ) diff --git a/brewman/brewman/routers/employee.py b/brewman/brewman/routers/employee.py index 5dd90037..3687705b 100644 --- a/brewman/brewman/routers/employee.py +++ b/brewman/brewman/routers/employee.py @@ -8,7 +8,7 @@ import brewman.schemas.employee as schemas from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import desc from sqlalchemy.exc import SQLAlchemyError -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from ..core.security import get_current_active_user as get_user from ..db.session import SessionLocal @@ -215,7 +215,7 @@ def delete_with_data(employee: Employee, db: Session): suspense_account = db.query(Account).filter(Account.id == Account.suspense()).first() query = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.journals.any(Journal.account_id == employee.id)) .all() ) diff --git a/brewman/brewman/routers/product.py b/brewman/brewman/routers/product.py index 2c8e092d..ed4e5016 100644 --- a/brewman/brewman/routers/product.py +++ b/brewman/brewman/routers/product.py @@ -7,7 +7,7 @@ import brewman.schemas.product as schemas from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import desc from sqlalchemy.exc import SQLAlchemyError -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from ..core.security import get_current_active_user as get_user from ..db.session import SessionLocal @@ -231,7 +231,7 @@ def delete_with_data(product: Product, db: Session) -> None: suspense_batch = db.query(Batch).filter(Batch.id == Batch.suspense()).first() query = ( db.query(Voucher) - .options(joinedload_all(Voucher.inventories, Inventory.product, innerjoin=True)) + .options(joinedload(Voucher.inventories, innerjoin=True).joinedload(Inventory.product, innerjoin=True)) .filter(Voucher.inventories.any(Inventory.product_id == product.id)) .all() ) diff --git a/brewman/brewman/routers/rebase.py b/brewman/brewman/routers/rebase.py index 1bb202e8..c2f4c7be 100644 --- a/brewman/brewman/routers/rebase.py +++ b/brewman/brewman/routers/rebase.py @@ -6,7 +6,7 @@ from typing import List from fastapi import APIRouter, Depends, Security from sqlalchemy import and_, distinct, func -from sqlalchemy.orm import Session, aliased, joinedload_all +from sqlalchemy.orm import Session, aliased, joinedload from ..core.security import get_current_active_user as get_user from ..db.session import SessionLocal @@ -73,7 +73,7 @@ def save_starred(date_: date, db: Session): vouchers = [] query = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.date < date_) .filter(Voucher.journals.any(Journal.account_id.in_(accounts))) .all() diff --git a/brewman/brewman/routers/reports/daybook.py b/brewman/brewman/routers/reports/daybook.py index feaf96ea..a019e349 100644 --- a/brewman/brewman/routers/reports/daybook.py +++ b/brewman/brewman/routers/reports/daybook.py @@ -4,7 +4,7 @@ from typing import List import brewman.schemas.daybook as schemas from fastapi import APIRouter, Depends, Request, Security -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from ...core.security import get_current_active_user as get_user from ...core.session import get_finish_date, get_start_date, set_period @@ -59,7 +59,7 @@ def build_report(start_date: date, finish_date: date, db: Session) -> List[schem query = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.date >= start_date) .filter(Voucher.date <= finish_date) .filter(Voucher.type != VoucherType.by_name("Issue").id) diff --git a/brewman/brewman/routers/reports/ledger.py b/brewman/brewman/routers/reports/ledger.py index 2a9eba01..0134f904 100644 --- a/brewman/brewman/routers/reports/ledger.py +++ b/brewman/brewman/routers/reports/ledger.py @@ -6,7 +6,7 @@ from typing import List import brewman.schemas.ledger as schemas from fastapi import APIRouter, Depends, Request, Security -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from sqlalchemy.sql.expression import func from ...core.security import get_current_active_user as get_user @@ -73,7 +73,7 @@ def build_report(account_id: uuid.UUID, start_date: str, finish_date: str, db: S query = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.journals.any(Journal.account_id == account_id)) .filter(Voucher.date >= datetime.datetime.strptime(start_date, "%d-%b-%Y")) .filter(Voucher.date <= datetime.datetime.strptime(finish_date, "%d-%b-%Y")) diff --git a/brewman/brewman/routers/reports/reconcile.py b/brewman/brewman/routers/reports/reconcile.py index 705a1fa1..e014859f 100644 --- a/brewman/brewman/routers/reports/reconcile.py +++ b/brewman/brewman/routers/reports/reconcile.py @@ -2,7 +2,7 @@ import datetime import uuid from fastapi import APIRouter, Depends, Request, Security -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from sqlalchemy.sql.expression import and_, func, or_ from ...core.security import get_current_active_user as get_user @@ -68,7 +68,7 @@ def build_report(account_id, start_date, finish_date, db): query = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.journals.any(Journal.account_id == account_id)) .filter( or_( diff --git a/brewman/brewman/routers/reports/unposted.py b/brewman/brewman/routers/reports/unposted.py index 9c85db80..24e18997 100644 --- a/brewman/brewman/routers/reports/unposted.py +++ b/brewman/brewman/routers/reports/unposted.py @@ -3,7 +3,7 @@ from typing import List import brewman.schemas.unposted as schemas from fastapi import APIRouter, Depends, Request, Security -from sqlalchemy.orm import Session, joinedload_all +from sqlalchemy.orm import Session, joinedload from ...core.security import get_current_active_user as get_user from ...db.session import SessionLocal @@ -39,7 +39,7 @@ def build_report(db: Session) -> List[schemas.Unposted]: query = ( db.query(Voucher) - .options(joinedload_all(Voucher.journals, Journal.account, innerjoin=True)) + .options(joinedload(Voucher.journals, innerjoin=True).joinedload(Journal.account, innerjoin=True)) .filter(Voucher.posted == False) # noqa: E712 .filter(Voucher.type != VoucherType.by_name("Issue").id) .order_by(Voucher.date)