Applications users were invited to were not showing in the portfolios

sidebar

atst/domain/portfolios/query.py

@@ -2,6 +2,11 @@ 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):
@@ -9,7 +14,24 @@ class PortfoliosQuery(Query):
 
     @classmethod
     def get_for_user(cls, user):
-        return (
+        granted_applications = (
+            db.session.query(Application)
+            .join(ApplicationRole)
+            .filter(ApplicationRole.application_id == Application.id)
+            .filter(ApplicationRole.user_id == user.id)
+            .filter(ApplicationRole.status == ApplicationRoleStatus.ACTIVE)
+            .subquery()
+        )
+
+        application_portfolios = (
+            db.session.query(Portfolio)
+            .join(Application)
+            .filter(Portfolio.id == Application.portfolio_id)
+            .filter(Application.id == granted_applications.c.id)
+            .all()
+        )
+
+        portfolios = (
             db.session.query(Portfolio)
             .join(PortfolioRole)
             .filter(PortfolioRole.user == user)
@@ -17,6 +39,18 @@ class PortfoliosQuery(Query):
             .all()
         )
 
+        portfolio_ids = []
+
+        [portfolio_ids.append(p.id) for p in portfolios]
+        [portfolio_ids.append(p.id) for p in application_portfolios]
+
+        return (
+            db.session.query(Portfolio)
+            .filter(Portfolio.id.in_(portfolio_ids))
+            .order_by(Portfolio.name.desc())
+            .all()
+        )
+
     @classmethod
     def create_portfolio_role(cls, user, portfolio, **kwargs):
         return PortfolioRole(user=user, portfolio=portfolio, **kwargs)

atst/routes/portfolios/index.py

@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 
-from flask import render_template, request as http_request, g, redirect, url_for
+from flask import render_template, request as http_request, g
 
 from . import portfolios_bp
 from atst.domain.reports import Reports
@@ -19,14 +19,6 @@ def portfolios():
         return render_template("portfolios/blank_slate.html")
 
 
-@portfolios_bp.route("/portfolios/<portfolio_id>")
-@user_can(Permissions.VIEW_PORTFOLIO, message="view portfolio")
-def show_portfolio(portfolio_id):
-    return redirect(
-        url_for("applications.portfolio_applications", portfolio_id=portfolio_id)
-    )
-
-
 @portfolios_bp.route("/portfolios/<portfolio_id>/reports")
 @user_can(Permissions.VIEW_PORTFOLIO_REPORTS, message="view portfolio reports")
 def reports(portfolio_id):

atst/routes/portfolios/invitations.py

@@ -30,7 +30,7 @@ def accept_invitation(portfolio_token):
             )
 
     return redirect(
-        url_for("portfolios.show_portfolio", portfolio_id=invite.portfolio.id)
+        url_for("applications.portfolio_applications", portfolio_id=invite.portfolio.id)
     )
 
 

atst/utils/flash.py

@@ -145,7 +145,7 @@ MESSAGES = {
         "actions": """
             {% from "components/icon.html" import Icon %}
             <div class='alert__actions'>
-              <a href='{{ url_for("portfolios.show_portfolio", portfolio_id=portfolio.id) }}' class='icon-link'>
+              <a href='{{ url_for("applications.portfolio_applications", portfolio_id=portfolio.id) }}' class='icon-link'>
                 {{ Icon('shield') }}
                 <span>{{ "flash.portfolio_home" | translate }}</span>
               </a>