remove portfolio_role direct relationship to role

tests/domain/test_audit_log.py

@@ -53,10 +53,7 @@ def test_ws_admin_can_view_ws_audit_log():
     portfolio = PortfolioFactory.create()
     admin = UserFactory.create()
     PortfolioRoleFactory.create(
-        portfolio=portfolio,
-        user=admin,
-        role=Roles.get("admin"),
-        status=PortfolioRoleStatus.ACTIVE,
+        portfolio=portfolio, user=admin, status=PortfolioRoleStatus.ACTIVE
     )
     events = AuditLog.get_portfolio_events(admin, portfolio)
     assert len(events) > 0

tests/domain/test_portfolio_roles.py

@@ -11,66 +11,12 @@ from tests.factories import (
 )
 
 
-def test_can_create_new_portfolio_role():
-    portfolio = PortfolioFactory.create()
-    new_user = UserFactory.create()
-
-    portfolio_role_dicts = [{"id": new_user.id, "portfolio_role": "owner"}]
-    portfolio_roles = PortfolioRoles.add_many(portfolio.id, portfolio_role_dicts)
-
-    assert portfolio_roles[0].user_id == new_user.id
-    assert portfolio_roles[0].user.atat_role.name == new_user.atat_role.name
-    assert portfolio_roles[0].role.name == new_user.portfolio_roles[0].role.name
-
-
-def test_can_update_existing_portfolio_role():
-    portfolio = PortfolioFactory.create()
-    new_user = UserFactory.create()
-
-    PortfolioRoles.add_many(
-        portfolio.id, [{"id": new_user.id, "portfolio_role": "owner"}]
-    )
-    portfolio_roles = PortfolioRoles.add_many(
-        portfolio.id, [{"id": new_user.id, "portfolio_role": "developer"}]
-    )
-
-    assert portfolio_roles[0].user.atat_role.name == new_user.atat_role.name
-    assert portfolio_roles[0].role.name == new_user.portfolio_roles[0].role.name
-
-
-def test_portfolio_role_permissions():
-    portfolio_one = PortfolioFactory.create()
-    portfolio_two = PortfolioFactory.create()
-    new_user = UserFactory.create()
-    PortfolioRoleFactory.create(
-        portfolio=portfolio_one,
-        user=new_user,
-        role=Roles.get("developer"),
-        status=PortfolioRoleStatus.ACTIVE,
-    )
-    PortfolioRoleFactory.create(
-        portfolio=portfolio_two,
-        user=new_user,
-        role=Roles.get("developer"),
-        status=PortfolioRoleStatus.PENDING,
-    )
-
-    default_perms = set(new_user.atat_role.permissions)
-    assert len(
-        PortfolioRoles.portfolio_role_permissions(portfolio_one, new_user)
-    ) > len(default_perms)
-    assert (
-        PortfolioRoles.portfolio_role_permissions(portfolio_two, new_user)
-        == default_perms
-    )
-
-
 def test_add_portfolio_role_with_permission_sets():
     portfolio = PortfolioFactory.create()
     new_user = UserFactory.create()
     permission_sets = ["edit_portfolio_application_management"]
     port_role = PortfolioRoles.add(
-        new_user, portfolio.id, "developer", permission_sets=permission_sets
+        new_user, portfolio.id, permission_sets=permission_sets
     )
     assert len(port_role.permission_sets) == 5
     expected_names = [

tests/domain/test_portfolios.py

@@ -53,7 +53,7 @@ def test_get_for_update_applications_allows_owner(portfolio, portfolio_owner):
 
 def test_get_for_update_applications_blocks_developer(portfolio):
     developer = UserFactory.create()
-    PortfolioRoles.add(developer, portfolio.id, "developer")
+    PortfolioRoles.add(developer, portfolio.id)
 
     with pytest.raises(UnauthorizedError):
         Portfolios.get_for_update_applications(developer, portfolio.id)
@@ -120,7 +120,6 @@ def test_update_portfolio_role_role(portfolio, portfolio_owner):
         portfolio_owner, portfolio, member, role_name
     )
     assert updated_member.portfolio == portfolio
-    assert updated_member.role_name == role_name
 
 
 def test_need_permission_to_update_portfolio_role_role(portfolio, portfolio_owner):

tests/domain/test_task_orders.py

@@ -2,6 +2,7 @@ import pytest
 
 from atst.domain.task_orders import TaskOrders, TaskOrderError, DD254s
 from atst.domain.exceptions import UnauthorizedError
+from atst.domain.roles import Roles, _VIEW_PORTFOLIO_PERMISSION_SETS
 from atst.models.attachment import Attachment
 
 from tests.factories import (
@@ -90,10 +91,7 @@ def test_add_officer_who_is_already_portfolio_member():
 
     assert task_order.contracting_officer == owner
     member = task_order.portfolio.members[0]
-    assert member.user == owner and member.role_name == "owner"
-
-
-from atst.domain.roles import Roles, _VIEW_PORTFOLIO_PERMISSION_SETS
+    assert member.user == owner
 
 
 def test_task_order_access():