wip

atst/domain/invitations.py

@@ -108,6 +108,11 @@ class Invitations(object):
         invite = Invitations._get(token)
         return Invitations._update_status(invite, InvitationStatus.REVOKED)
 
+    @classmethod
+    def lookup_by_portfolio_and_user(cls, portfolio, user):
+        portfolio_role = PortfolioRoles.get(portfolio.id, user.id)
+        return portfolio_role.latest_invitation
+
     @classmethod
     def resend(cls, user, portfolio_id, token):
         portfolio = Portfolios.get(user, portfolio_id)

atst/domain/task_orders.py

@@ -14,6 +14,10 @@ class TaskOrderError(Exception):
     pass
 
 
+class InvalidOfficerError(Exception):
+    pass
+
+
 class TaskOrders(object):
     SECTIONS = {
         "app_info": [
@@ -145,6 +149,15 @@ class TaskOrders(object):
         "security_officer",
     ]
 
+    @classmethod
+    def remove_officer(cls, task_order, officer_type):
+        if officer_type in TaskOrders.OFFICERS:
+            setattr(task_order, officer_type, None)
+            db.session.add(task_order)
+            db.session.commit()
+        else:
+            raise (InvalidOfficerError)
+
     @classmethod
     def add_officer(cls, user, task_order, officer_type, officer_data):
         Authorization.check_portfolio_permission(