pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #836 from dod-ccpo/sidebar

Browse Source 
Applications users were invited to were not showing in the portfolios sidebar
This commit is contained in:
George Drummond
2019-05-22 15:22:05 -04:00
committed by GitHub
parent 4df975acf9 41e2d14e7d
commit da6ac57812
9 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
atst/domain/portfolios/query.py
View File

@@ -1,7 +1,13 @@
from sqlalchemy import or_
from atst.database import db
from atst.domain.common import Query
from atst.models.portfolio import Portfolio
from atst.models.portfolio_role import PortfolioRole, Status as PortfolioRoleStatus
from atst.models.application_role import (
ApplicationRole,
Status as ApplicationRoleStatus,
)
from atst.models.application import Application
class PortfoliosQuery(Query):
@@ -11,9 +17,38 @@ class PortfoliosQuery(Query):
def get_for_user(cls, user):
return (
db.session.query(Portfolio)
.join(PortfolioRole)
.filter(PortfolioRole.user == user)
.filter(PortfolioRole.status == PortfolioRoleStatus.ACTIVE)
.filter(
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()
)
)
),
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())
.all()
)