remove portfolio_role direct relationship to role

atst/domain/portfolio_roles.py

@@ -9,7 +9,6 @@ from atst.models.portfolio_role import (
 from atst.models.user import User
 
 from .roles import Roles
-from .users import Users
 from .exceptions import NotFoundError
 
 
@@ -53,17 +52,6 @@ class PortfolioRoles(object):
         except NoResultFound:
             return None
 
-    @classmethod
-    def portfolio_role_permissions(cls, portfolio, user):
-        portfolio_role = PortfolioRoles._get_active_portfolio_role(
-            portfolio.id, user.id
-        )
-        atat_permissions = set(user.atat_role.permissions)
-        portfolio_permissions = (
-            [] if portfolio_role is None else portfolio_role.role.permissions
-        )
-        return set(portfolio_permissions).union(atat_permissions)
-
     @classmethod
     def _get_portfolio_role(cls, user, portfolio_id):
         try:
@@ -80,9 +68,7 @@ class PortfolioRoles(object):
             raise NotFoundError("portfolio role")
 
     @classmethod
-    def add(cls, user, portfolio_id, role_name, permission_sets=None):
-        role = Roles.get(role_name)
-
+    def add(cls, user, portfolio_id, permission_sets=None):
         new_portfolio_role = None
         try:
             existing_portfolio_role = (
@@ -94,13 +80,9 @@ class PortfolioRoles(object):
                 .one()
             )
             new_portfolio_role = existing_portfolio_role
-            new_portfolio_role.role = role
         except NoResultFound:
             new_portfolio_role = PortfolioRole(
-                user=user,
-                role_id=role.id,
-                portfolio_id=portfolio_id,
-                status=PortfolioRoleStatus.PENDING,
+                user=user, portfolio_id=portfolio_id, status=PortfolioRoleStatus.PENDING
             )
 
         if permission_sets:
@@ -137,47 +119,6 @@ class PortfolioRoles(object):
         db.session.commit()
         return portfolio_role
 
-    @classmethod
-    def add_many(cls, portfolio_id, portfolio_role_dicts):
-        portfolio_roles = []
-
-        for user_dict in portfolio_role_dicts:
-            try:
-                user = Users.get(user_dict["id"])
-            except NoResultFound:
-                default_role = Roles.get("developer")
-                user = User(id=user_dict["id"], atat_role=default_role)
-
-            try:
-                role = Roles.get(user_dict["portfolio_role"])
-            except NoResultFound:
-                raise NotFoundError("role")
-
-            try:
-                existing_portfolio_role = (
-                    db.session.query(PortfolioRole)
-                    .filter(
-                        PortfolioRole.user == user,
-                        PortfolioRole.portfolio_id == portfolio_id,
-                    )
-                    .one()
-                )
-                new_portfolio_role = existing_portfolio_role
-                new_portfolio_role.role = role
-            except NoResultFound:
-                new_portfolio_role = PortfolioRole(
-                    user=user, role_id=role.id, portfolio_id=portfolio_id
-                )
-
-            user.portfolio_roles.append(new_portfolio_role)
-            portfolio_roles.append(new_portfolio_role)
-
-            db.session.add(user)
-
-        db.session.commit()
-
-        return portfolio_roles
-
     @classmethod
     def enable(cls, portfolio_role):
         portfolio_role.status = PortfolioRoleStatus.ACTIVE

atst/domain/portfolios/portfolios.py

@@ -24,7 +24,6 @@ class Portfolios(object):
         Portfolios._create_portfolio_role(
             user,
             portfolio,
-            "owner",
             status=PortfolioRoleStatus.ACTIVE,
             permission_sets=perms_sets,
         )
@@ -111,9 +110,7 @@ class Portfolios(object):
 
     @classmethod
     def add_member(cls, portfolio, member, role_name, permission_sets=None):
-        portfolio_role = PortfolioRoles.add(
-            member, portfolio.id, role_name, permission_sets
-        )
+        portfolio_role = PortfolioRoles.add(member, portfolio.id, permission_sets)
         return portfolio_role
 
     @classmethod
@@ -126,20 +123,13 @@ class Portfolios(object):
 
     @classmethod
     def _create_portfolio_role(
-        cls,
-        user,
-        portfolio,
-        role_name,
-        status=PortfolioRoleStatus.PENDING,
-        permission_sets=None,
+        cls, user, portfolio, status=PortfolioRoleStatus.PENDING, permission_sets=None
     ):
-        role = Roles.get(role_name)
-
         if permission_sets is None:
             permission_sets = []
 
         portfolio_role = PortfoliosQuery.create_portfolio_role(
-            user, role, portfolio, status=status, permission_sets=permission_sets
+            user, portfolio, status=status, permission_sets=permission_sets
         )
         PortfoliosQuery.add_and_commit(portfolio_role)
         return portfolio_role

atst/domain/portfolios/query.py

@@ -18,5 +18,5 @@ class PortfoliosQuery(Query):
         )
 
     @classmethod
-    def create_portfolio_role(cls, user, role, portfolio, **kwargs):
-        return PortfolioRole(user=user, role=role, portfolio=portfolio, **kwargs)
+    def create_portfolio_role(cls, user, portfolio, **kwargs):
+        return PortfolioRole(user=user, portfolio=portfolio, **kwargs)