New invitation backend for portfolio invitations.

Portfolio invitations do not associate a user entity until the
invitation has been accepted. User info, including DOD ID, is held on
the invitation itself. When a user accepts and invitation, their user
entry is associated with the corresponding `portfolio_role` entry.

The same change will be applied to `application_role` and application
invitations. For now, small changes have been made to
application-related methods so that that flow works as-is.

tests/routes/applications/test_invitations.py

@@ -8,7 +8,7 @@ def test_accept_application_invitation(client, user_session):
     application = ApplicationFactory.create()
     app_role = ApplicationRoleFactory.create(application=application, user=user)
     invite = ApplicationInvitationFactory.create(
-        role=app_role, user=user, inviter=application.portfolio.owner
+        role=app_role, inviter=application.portfolio.owner, dod_id=user.dod_id
     )
 
     user_session(user)
@@ -28,7 +28,7 @@ def test_accept_application_invitation_end_to_end(client, user_session):
     application = ApplicationFactory.create(name="Millenium Falcon")
     app_role = ApplicationRoleFactory.create(application=application, user=user)
     invite = ApplicationInvitationFactory.create(
-        role=app_role, user=user, inviter=application.portfolio.owner
+        role=app_role, dod_id=user.dod_id, inviter=application.portfolio.owner
     )
 
     user_session(user)

tests/routes/portfolios/test_invitations.py

@@ -18,10 +18,10 @@ from atst.domain.permission_sets import PermissionSets
 def test_existing_member_accepts_valid_invite(client, user_session):
     portfolio = PortfolioFactory.create()
     user = UserFactory.create()
-    ws_role = PortfolioRoleFactory.create(
+    role = PortfolioRoleFactory.create(
         portfolio=portfolio, user=user, status=PortfolioRoleStatus.PENDING
     )
-    invite = PortfolioInvitationFactory.create(user_id=user.id, role=ws_role)
+    invite = PortfolioInvitationFactory.create(dod_id=user.dod_id, role=role)
 
     # the user does not have access to the portfolio before accepting the invite
     assert len(Portfolios.for_user(user)) == 0
@@ -46,32 +46,15 @@ def test_existing_member_accepts_valid_invite(client, user_session):
 def test_new_member_accepts_valid_invite(monkeypatch, client, user_session):
     portfolio = PortfolioFactory.create()
     user_info = UserFactory.dictionary()
-
-    user_session(portfolio.owner)
-    response = client.post(
-        url_for("portfolios.create_member", portfolio_id=portfolio.id),
-        data={
-            "permission_sets-perms_app_mgmt": PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
-            "permission_sets-perms_funding": PermissionSets.VIEW_PORTFOLIO_FUNDING,
-            "permission_sets-perms_reporting": PermissionSets.VIEW_PORTFOLIO_REPORTS,
-            "permission_sets-perms_portfolio_mgmt": PermissionSets.VIEW_PORTFOLIO_ADMIN,
-            "user_data-first_name": user_info["first_name"],
-            "user_data-last_name": user_info["last_name"],
-            "user_data-dod_id": user_info["dod_id"],
-            "user_data-email": user_info["email"],
-        },
-    )
-
-    assert response.status_code == 302
-    user = Users.get_by_dod_id(user_info["dod_id"])
-    token = user.portfolio_invitations[0].token
+    role = PortfolioRoleFactory.create(portfolio=portfolio)
+    invite = PortfolioInvitationFactory.create(role=role, dod_id=user_info["dod_id"])
 
     monkeypatch.setattr(
         "atst.domain.auth.should_redirect_to_user_profile", lambda *args: False
     )
-    user_session(user)
+    user_session(UserFactory.create(dod_id=user_info["dod_id"]))
     response = client.get(
-        url_for("portfolios.accept_invitation", portfolio_token=token)
+        url_for("portfolios.accept_invitation", portfolio_token=invite.token)
     )
 
     # user is redirected to the portfolio view
@@ -81,7 +64,8 @@ def test_new_member_accepts_valid_invite(monkeypatch, client, user_session):
         in response.headers["Location"]
     )
     # the user has access to the portfolio
-    assert len(Portfolios.for_user(user)) == 1
+    assert role.user.dod_id == user_info["dod_id"]
+    assert len(role.user.portfolio_roles) == 1
 
 
 def test_member_accepts_invalid_invite(client, user_session):

tests/routes/portfolios/test_members.py

@@ -1,9 +1,11 @@
 from flask import url_for
 
-from tests.factories import UserFactory, PortfolioFactory
 from atst.domain.permission_sets import PermissionSets
+from atst.models import PortfolioInvitation
 from atst.queue import queue
 
+from tests.factories import UserFactory, PortfolioFactory
+
 _DEFAULT_PERMS_FORM_DATA = {
     "permission_sets-perms_app_mgmt": PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
     "permission_sets-perms_funding": PermissionSets.VIEW_PORTFOLIO_FUNDING,
@@ -23,8 +25,8 @@ def test_user_with_permission_has_add_member_link(client, user_session):
     )
 
 
-def test_create_member(client, user_session):
-    user = UserFactory.create()
+def test_create_member(client, user_session, session):
+    user_data = UserFactory.dictionary()
     portfolio = PortfolioFactory.create()
     user_session(portfolio.owner)
     queue_length = len(queue.get_queue())
@@ -32,20 +34,25 @@ def test_create_member(client, user_session):
     response = client.post(
         url_for("portfolios.create_member", portfolio_id=portfolio.id),
         data={
-            "user_data-dod_id": user.dod_id,
-            "user_data-first_name": "user_data-Wilbur",
-            "user_data-last_name": "user_data-Zuckerman",
-            "user_data-email": "user_data-some_pig@zuckermans.com",
-            "user_data-portfolio_role": "user_data-developer",
+            "user_data-dod_id": user_data.get("dod_id"),
+            "user_data-first_name": user_data.get("first_name"),
+            "user_data-last_name": user_data.get("last_name"),
+            "user_data-email": user_data.get("email"),
             **_DEFAULT_PERMS_FORM_DATA,
         },
         follow_redirects=True,
     )
 
     assert response.status_code == 200
-    assert user.full_name in response.data.decode()
-    assert user.has_portfolios
-    assert user.portfolio_invitations
+    full_name = "{} {}".format(user_data.get("first_name"), user_data.get("last_name"))
+    assert full_name in response.data.decode()
+
+    invitation = (
+        session.query(PortfolioInvitation)
+        .filter_by(dod_id=user_data.get("dod_id"))
+        .one()
+    )
+    assert invitation.role.portfolio == portfolio
+
     assert len(queue.get_queue()) == queue_length + 1
-    portfolio_role = user.portfolio_roles[0]
-    assert len(portfolio_role.permission_sets) == 5
+    assert len(invitation.role.permission_sets) == 5