Use sqlalchemy or_

This commit is contained in:
George Drummond 2019-05-22 15:17:31 -04:00
parent bb4b52c6ac
commit 41e2d14e7d
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17

View File

@ -1,3 +1,4 @@
from sqlalchemy import or_
from atst.database import db
from atst.domain.common import Query
from atst.models.portfolio import Portfolio
@ -17,29 +18,34 @@ class PortfoliosQuery(Query):
return (
db.session.query(Portfolio)
.filter(
Portfolio.id.in_(
db.session.query(Portfolio.id)
.join(Application)
.filter(Portfolio.id == Application.portfolio_id)
.filter(
Application.id.in_(
db.session.query(Application.id)
.join(ApplicationRole)
.filter(ApplicationRole.application_id == Application.id)
.filter(ApplicationRole.user_id == user.id)
.filter(
ApplicationRole.status == ApplicationRoleStatus.ACTIVE
or_(
Portfolio.id.in_(
db.session.query(Portfolio.id)
.join(Application)
.filter(Portfolio.id == Application.portfolio_id)
.filter(
Application.id.in_(
db.session.query(Application.id)
.join(ApplicationRole)
.filter(
ApplicationRole.application_id == Application.id
)
.filter(ApplicationRole.user_id == user.id)
.filter(
ApplicationRole.status
== ApplicationRoleStatus.ACTIVE
)
.subquery()
)
.subquery()
)
)
)
| Portfolio.id.in_(
db.session.query(Portfolio.id)
.join(PortfolioRole)
.filter(PortfolioRole.user == user)
.filter(PortfolioRole.status == PortfolioRoleStatus.ACTIVE)
.subquery()
),
Portfolio.id.in_(
db.session.query(Portfolio.id)
.join(PortfolioRole)
.filter(PortfolioRole.user == user)
.filter(PortfolioRole.status == PortfolioRoleStatus.ACTIVE)
.subquery()
),
)
)
.order_by(Portfolio.name.asc())