remove unused domain methods and arguments

atst/domain/applications.py

@@ -8,7 +8,7 @@ from atst.models.environment_role import EnvironmentRole
 
 class Applications(object):
     @classmethod
-    def create(cls, user, portfolio, name, description, environment_names):
+    def create(cls, portfolio, name, description, environment_names):
         application = Application(
             portfolio=portfolio, name=name, description=description
         )
@@ -20,7 +20,7 @@ class Applications(object):
         return application
 
     @classmethod
-    def get(cls, user, portfolio, application_id):
+    def get(cls, application_id):
         try:
             application = (
                 db.session.query(Application).filter_by(id=application_id).one()
@@ -42,7 +42,7 @@ class Applications(object):
         )
 
     @classmethod
-    def get_all(cls, user, portfolio_role, portfolio):
+    def get_all(cls, portfolio):
         try:
             applications = (
                 db.session.query(Application).filter_by(portfolio_id=portfolio.id).all()
@@ -53,7 +53,7 @@ class Applications(object):
         return applications
 
     @classmethod
-    def update(cls, user, portfolio, application, new_data):
+    def update(cls, application, new_data):
         if "name" in new_data:
             application.name = new_data["name"]
         if "description" in new_data:

atst/domain/audit_log.py

@@ -34,11 +34,11 @@ class AuditLog(object):
         return cls._log(resource=resource, action=action, portfolio=portfolio)
 
     @classmethod
-    def get_all_events(cls, user, pagination_opts=None):
+    def get_all_events(cls, pagination_opts=None):
         return AuditEventQuery.get_all(pagination_opts)
 
     @classmethod
-    def get_portfolio_events(cls, user, portfolio, pagination_opts=None):
+    def get_portfolio_events(cls, portfolio, pagination_opts=None):
         return AuditEventQuery.get_ws_events(portfolio.id, pagination_opts)
 
     @classmethod

atst/domain/authz/decorator.py

@@ -10,7 +10,7 @@ from atst.domain.task_orders import TaskOrders
 def evaluate_exceptions(user, permission, exceptions, **kwargs):
     return (
         True
-        if True in [exc(g.current_user, permission, **kwargs) for exc in exceptions]
+        if True in [exc(user, permission, **kwargs) for exc in exceptions]
         else False
     )
 
@@ -26,7 +26,7 @@ def user_can_access_decorator(permission, message=None, exceptions=None):
                     g.current_user, kwargs["portfolio_id"]
                 )
             elif "task_order_id" in kwargs:
-                task_order = TaskOrders.get(g.current_user, kwargs["task_order_id"])
+                task_order = TaskOrders.get(kwargs["task_order_id"])
                 access_args["portfolio"] = task_order.portfolio
 
             if exceptions and evaluate_exceptions(

atst/domain/environments.py

@@ -58,7 +58,7 @@ class Environments(object):
         return env
 
     @classmethod
-    def update_environment_roles(cls, user, portfolio, portfolio_role, ids_and_roles):
+    def update_environment_roles(cls, portfolio_role, ids_and_roles):
         updated = False
 
         for id_and_role in ids_and_roles:
@@ -92,5 +92,5 @@ class Environments(object):
         return updated
 
     @classmethod
-    def revoke_access(cls, user, environment, target_user):
+    def revoke_access(cls, environment, target_user):
         EnvironmentRoles.delete(environment.id, target_user.id)

atst/domain/invitations.py

@@ -116,7 +116,7 @@ class Invitations(object):
         return portfolio_role.latest_invitation
 
     @classmethod
-    def resend(cls, user, portfolio_id, token):
+    def resend(cls, user, token):
         previous_invitation = Invitations._get(token)
         Invitations._update_status(previous_invitation, InvitationStatus.REVOKED)
 

atst/domain/portfolios/portfolios.py

@@ -36,25 +36,7 @@ class Portfolios(object):
         return ScopedPortfolio(user, portfolio)
 
     @classmethod
-    def get_for_update_applications(cls, user, portfolio_id):
-        portfolio = PortfoliosQuery.get(portfolio_id)
-
-        return portfolio
-
-    @classmethod
-    def get_for_update_information(cls, user, portfolio_id):
-        portfolio = PortfoliosQuery.get(portfolio_id)
-
-        return portfolio
-
-    @classmethod
-    def get_for_update_member(cls, user, portfolio_id):
-        portfolio = PortfoliosQuery.get(portfolio_id)
-
-        return portfolio
-
-    @classmethod
-    def get_with_members(cls, user, portfolio_id):
+    def get_for_update(cls, portfolio_id):
         portfolio = PortfoliosQuery.get(portfolio_id)
 
         return portfolio
@@ -68,7 +50,7 @@ class Portfolios(object):
         return portfolios
 
     @classmethod
-    def create_member(cls, user, portfolio, data):
+    def create_member(cls, portfolio, data):
         new_user = Users.get_or_create_by_dod_id(
             data["dod_id"],
             first_name=data["first_name"],
@@ -87,7 +69,7 @@ class Portfolios(object):
         return portfolio_role
 
     @classmethod
-    def update_member(cls, user, portfolio, member, permission_sets):
+    def update_member(cls, member, permission_sets):
         return PortfolioRoles.update(member, permission_sets)
 
     @classmethod
@@ -118,7 +100,7 @@ class Portfolios(object):
         )
 
     @classmethod
-    def revoke_access(cls, user, portfolio_id, portfolio_role_id):
+    def revoke_access(cls, portfolio_id, portfolio_role_id):
         portfolio = PortfoliosQuery.get(portfolio_id)
         portfolio_role = PortfolioRoles.get_by_id(portfolio_role_id)
 
@@ -127,7 +109,7 @@ class Portfolios(object):
 
         portfolio_role.status = PortfolioRoleStatus.DISABLED
         for environment in portfolio.all_environments:
-            Environments.revoke_access(user, environment, portfolio_role.user)
+            Environments.revoke_access(environment, portfolio_role.user)
         PortfoliosQuery.add_and_commit(portfolio_role)
 
         return portfolio_role

atst/domain/task_orders.py

@@ -52,7 +52,7 @@ class TaskOrders(object):
     UNCLASSIFIED_FUNDING = ["performance_length", "csp_estimate", "clin_01", "clin_03"]
 
     @classmethod
-    def get(cls, user, task_order_id):
+    def get(cls, task_order_id):
         try:
             task_order = db.session.query(TaskOrder).filter_by(id=task_order_id).one()
 
@@ -70,7 +70,7 @@ class TaskOrders(object):
         return task_order
 
     @classmethod
-    def update(cls, user, task_order, **kwargs):
+    def update(cls, task_order, **kwargs):
         for key, value in kwargs.items():
             setattr(task_order, key, value)
 
@@ -135,7 +135,7 @@ class TaskOrders(object):
     ]
 
     @classmethod
-    def add_officer(cls, user, task_order, officer_type, officer_data):
+    def add_officer(cls, task_order, officer_type, officer_data):
         if officer_type in TaskOrders.OFFICERS:
             portfolio = task_order.portfolio
 
@@ -152,7 +152,6 @@ class TaskOrders(object):
                 portfolio_user = existing_member.user
             else:
                 member = Portfolios.create_member(
-                    user,
                     portfolio,
                     {
                         **officer_data,