Use sqlalchemy or_

atst/domain/portfolios/query.py

@@ -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,6 +18,7 @@ class PortfoliosQuery(Query):
         return (
             db.session.query(Portfolio)
             .filter(
+                or_(
                     Portfolio.id.in_(
                         db.session.query(Portfolio.id)
                         .join(Application)
@@ -25,21 +27,25 @@ class PortfoliosQuery(Query):
                             Application.id.in_(
                                 db.session.query(Application.id)
                                 .join(ApplicationRole)
-                            .filter(ApplicationRole.application_id == Application.id)
+                                .filter(
+                                    ApplicationRole.application_id == Application.id
+                                )
                                 .filter(ApplicationRole.user_id == user.id)
                                 .filter(
-                                ApplicationRole.status == ApplicationRoleStatus.ACTIVE
+                                    ApplicationRole.status
+                                    == ApplicationRoleStatus.ACTIVE
                                 )
                                 .subquery()
                             )
                         )
-                )
+                    ),
-                | Portfolio.id.in_(
+                    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())