updates to test factories to accomodate application roles

atst/models/__init__.py

@@ -6,6 +6,8 @@ from .permissions import Permissions
 from .permission_set import PermissionSet
 from .user import User
 from .portfolio_role import PortfolioRole
+from .application_role import ApplicationRole
+from .environment_role import EnvironmentRole
 from .portfolio import Portfolio
 from .application import Application
 from .environment import Environment
@@ -14,4 +16,3 @@ from .audit_event import AuditEvent
 from .invitation import Invitation
 from .task_order import TaskOrder
 from .dd_254 import DD254
-from .application_role import ApplicationRole

atst/models/application.py

@@ -20,7 +20,7 @@ class Application(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
 
     @property
     def users(self):
-        return set([user for env in self.environments for user in env.users])
+        return set(role.user for role in self.roles)
 
     @property
     def num_users(self):

atst/models/user.py

@@ -25,6 +25,7 @@ class User(
     permission_sets = relationship("PermissionSet", secondary=users_permission_sets)
 
     portfolio_roles = relationship("PortfolioRole", backref="user")
+    application_roles = relationship("ApplicationRole", backref="user")
 
     email = Column(String, unique=True)
     dod_id = Column(String, unique=True, nullable=False)