From dd19a12381b0d287c142db6bc6f119a0a18a30c6 Mon Sep 17 00:00:00 2001
From: graham-dds <graham.beckley-ctr@friends.dds.mil>
Date: Fri, 21 Feb 2020 14:12:24 -0500
Subject: [PATCH] Replace csp data factory with to_dictionary method

---
 tests/domain/test_portfolio_state_machine.py |  9 ++--
 tests/factories.py                           | 43 --------------------
 2 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/tests/domain/test_portfolio_state_machine.py b/tests/domain/test_portfolio_state_machine.py
index 23664079..a3dc2dfb 100644
--- a/tests/domain/test_portfolio_state_machine.py
+++ b/tests/domain/test_portfolio_state_machine.py
@@ -15,7 +15,6 @@ from tests.factories import (
     PortfolioStateMachineFactory,
     TaskOrderFactory,
     UserFactory,
-    get_portfolio_csp_data,
 )
 
 from atst.models import FSMStates, PortfolioStateMachine, TaskOrder
@@ -82,7 +81,7 @@ def test_state_machine_trigger_next_transition(state_machine):
 
     state_machine.state = FSMStates.STARTED
     state_machine.trigger_next_transition(
-        csp_data=get_portfolio_csp_data(state_machine.portfolio)
+        csp_data=state_machine.portfolio.to_dictionary()
     )
     assert state_machine.current_state == FSMStates.TENANT_CREATED
 
@@ -319,7 +318,11 @@ def test_fsm_transition_start(
     config = {"billing_account_name": "billing_account_name"}
 
     assert state_machine.state == FSMStates.UNSTARTED
-    portfolio_data = get_portfolio_csp_data(portfolio)
+    portfolio_data = {
+        **portfolio.to_dictionary(),
+        "display_name": "mgmt group display name",
+        "management_group_name": "mgmt-group-uuid",
+    }
 
     for expected_state in expected_states:
         collected_data = dict(
diff --git a/tests/factories.py b/tests/factories.py
index fa857a3c..f02459b3 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -79,49 +79,6 @@ def get_all_portfolio_permission_sets():
     return PermissionSets.get_many(PortfolioRoles.PORTFOLIO_PERMISSION_SETS)
 
 
-def get_portfolio_csp_data(portfolio):
-
-    ppoc = portfolio.owner
-    if not ppoc:
-
-        class ppoc:
-            first_name = "John"
-            last_name = "Doe"
-            email = "email@example.com"
-
-    user_id = f"{ppoc.first_name[0]}{ppoc.last_name}".lower()
-    domain_name = re.sub("[^0-9a-zA-Z]+", "", portfolio.name).lower()
-
-    initial_task_order: TaskOrder = portfolio.task_orders[0]
-    initial_clin = initial_task_order.sorted_clins[0]
-
-    return {
-        "user_id": user_id,
-        "password": "jklfsdNCVD83nklds2#202",  # pragma: allowlist secret
-        "domain_name": domain_name,
-        "display_name": "mgmt group display name",
-        "management_group_name": "mgmt-group-uuid",
-        "first_name": ppoc.first_name,
-        "last_name": ppoc.last_name,
-        "country_code": "US",
-        "password_recovery_email_address": ppoc.email,
-        "address": {  # TODO: TBD if we're sourcing this from data or config
-            "company_name": "",
-            "address_line_1": "",
-            "city": "",
-            "region": "",
-            "country": "",
-            "postal_code": "",
-        },
-        "billing_profile_display_name": "My Billing Profile",
-        "initial_clin_amount": initial_clin.obligated_amount,
-        "initial_clin_start_date": initial_clin.start_date.strftime("%Y/%m/%d"),
-        "initial_clin_end_date": initial_clin.end_date.strftime("%Y/%m/%d"),
-        "initial_clin_type": initial_clin.number,
-        "initial_task_order_id": initial_task_order.number,
-    }
-
-
 class Base(factory.alchemy.SQLAlchemyModelFactory):
     @classmethod
     def dictionary(cls, **attrs):