Use application_role_id on environment_roles.

In the future, an `application_invitation1 will not refer to a `user` until
someone accepts the invitation; they'll only reference an
`application_role`. When a user is invited to an application, the
inviter can specify the environments the invitee should have access to.
For this to be possible, an `environment_role` should reference an
`application_role`, because no `user` entity will be known at that time.

In addition to updating all the models and domain methods necessary for
this change, this commit deletes unused code and tests that were
dependent on `environment_roles` having a `user_id` foreign key.

atst/models/application_role.py

@@ -1,14 +1,12 @@
 from enum import Enum
 from sqlalchemy import Index, ForeignKey, Column, Enum as SQLAEnum, Table
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import object_session, relationship
+from sqlalchemy.orm import relationship
 from sqlalchemy.event import listen
 
 from atst.utils import first_or_none
 from atst.models import Base, mixins
 from atst.models.mixins.auditable import record_permission_sets_updates
-from atst.models.environment import Environment
-from atst.models.environment_role import EnvironmentRole
 from .types import Id
 
 
@@ -93,22 +91,6 @@ class ApplicationRole(
             "portfolio": self.application.portfolio.name,
         }
 
-    @property
-    def environment_roles(self):
-        if getattr(self, "_environment_roles", None) is None:
-            roles = (
-                object_session(self)
-                .query(EnvironmentRole)
-                .join(Environment, Environment.application_id == self.application_id)
-                .filter(EnvironmentRole.environment_id == Environment.id)
-                .filter(EnvironmentRole.user_id == self.user_id)
-                .all()
-            )
-
-            setattr(self, "_environment_roles", roles)
-
-        return self._environment_roles
-
 
 Index(
     "application_role_user_application",

atst/models/environment.py

@@ -21,7 +21,7 @@ class Environment(
 
     @property
     def users(self):
-        return {r.user for r in self.roles}
+        return {r.application_role.user for r in self.roles}
 
     @property
     def num_users(self):

atst/models/environment_role.py

@@ -26,12 +26,14 @@ class EnvironmentRole(
 
     role = Column(String())
 
-    user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
-    user = relationship("User", backref="environment_roles")
+    application_role_id = Column(
+        UUID(as_uuid=True), ForeignKey("application_roles.id"), nullable=False
+    )
+    application_role = relationship("ApplicationRole", backref="environment_roles")
 
     def __repr__(self):
         return "<EnvironmentRole(role='{}', user='{}', environment='{}', id='{}')>".format(
-            self.role, self.user.full_name, self.environment.name, self.id
+            self.role, self.application_role.user_name, self.environment.name, self.id
         )
 
     @property
@@ -53,8 +55,8 @@ class EnvironmentRole(
     @property
     def event_details(self):
         return {
-            "updated_user_name": self.user.displayname,
-            "updated_user_id": str(self.user_id),
+            "updated_user_name": self.application_role.user_name,
+            "updated_application_role_id": str(self.application_role_id),
             "role": self.role,
             "environment": self.environment.displayname,
             "environment_id": str(self.environment_id),
@@ -67,7 +69,7 @@ class EnvironmentRole(
 
 Index(
     "environments_role_user_environment",
-    EnvironmentRole.user_id,
+    EnvironmentRole.application_role_id,
     EnvironmentRole.environment_id,
     unique=True,
 )

atst/models/portfolio_role.py

@@ -7,11 +7,7 @@ from sqlalchemy.event import listen
 from atst.models import Base, mixins
 from .types import Id
 
-from atst.database import db
 from atst.utils import first_or_none
-from atst.models.environment_role import EnvironmentRole
-from atst.models.application import Application
-from atst.models.environment import Environment
 from atst.models.mixins.auditable import record_permission_sets_updates
 
 
@@ -126,34 +122,6 @@ class PortfolioRole(
     def is_active(self):
         return self.status == Status.ACTIVE
 
-    @property
-    def num_environment_roles(self):
-        return (
-            db.session.query(EnvironmentRole)
-            .join(EnvironmentRole.environment)
-            .join(Environment.application)
-            .join(Application.portfolio)
-            .filter(Application.portfolio_id == self.portfolio_id)
-            .filter(EnvironmentRole.user_id == self.user_id)
-            .count()
-        )
-
-    @property
-    def environment_roles(self):
-        return (
-            db.session.query(EnvironmentRole)
-            .join(EnvironmentRole.environment)
-            .join(Environment.application)
-            .join(Application.portfolio)
-            .filter(Application.portfolio_id == self.portfolio_id)
-            .filter(EnvironmentRole.user_id == self.user_id)
-            .all()
-        )
-
-    @property
-    def has_environment_roles(self):
-        return self.num_environment_roles > 0
-
     @property
     def can_resend_invitation(self):
         return not self.is_active and (