remove portfolio_role direct relationship to role

atst/models/portfolio.py

@@ -23,7 +23,9 @@ class Portfolio(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     @property
     def owner(self):
         def _is_portfolio_owner(portfolio_role):
-            return portfolio_role.role.name == "owner"
+            return "portfolio_poc" in [
+                perms_set.name for perms_set in portfolio_role.permission_sets
+            ]
 
         owner = first_or_none(_is_portfolio_owner, self.roles)
         return owner.user if owner else None

atst/models/portfolio_role.py

@@ -10,7 +10,6 @@ from atst.database import db
 from atst.models.environment_role import EnvironmentRole
 from atst.models.application import Application
 from atst.models.environment import Environment
-from atst.models.role import Role
 
 
 MEMBER_STATUSES = {
@@ -47,9 +46,6 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     )
     portfolio = relationship("Portfolio", back_populates="roles")
 
-    role_id = Column(UUID(as_uuid=True), ForeignKey("roles.id"), nullable=False)
-    role = relationship("Role")
-
     user_id = Column(
         UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False
     )
@@ -65,19 +61,15 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
         ]
 
     def __repr__(self):
-        return "<PortfolioRole(role='{}', portfolio='{}', user_id='{}', id='{}')>".format(
-            self.role.name, self.portfolio.name, self.user_id, self.id
+        return "<PortfolioRole(portfolio='{}', user_id='{}', id='{}', permissions={})>".format(
+            self.portfolio.name, self.user_id, self.id, self.permissions
         )
 
     @property
     def history(self):
         previous_state = self.get_changes()
         change_set = {}
-        if "role_id" in previous_state:
-            from_role_id = previous_state["role_id"][0]
-            from_role = db.session.query(Role).filter(Role.id == from_role_id).one()
-            to_role = self.role_name
-            change_set["role"] = [from_role.name, to_role]
+        # TODO: need to update to include permission_sets
         if "status" in previous_state:
             from_status = previous_state["status"][0].value
             to_status = self.status.value
@@ -121,10 +113,6 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     def has_dod_id_error(self):
         return self.latest_invitation and self.latest_invitation.is_rejected_wrong_user
 
-    @property
-    def role_name(self):
-        return self.role.name
-
     @property
     def user_name(self):
         return self.user.full_name