Properly report initial clin information

Includes fixed up state machine test as well as adds some missing dependencies

tests/domain/cloud/test_azure_csp.py

@@ -404,11 +404,11 @@ def test_create_billing_instruction(mock_azure: AzureCloudProvider):
     payload = BillingInstructionCSPPayload(
         **dict(
             creds=creds,
-            amount=1000.00,
-            start_date="2020/1/1",
-            end_date="2020/3/1",
-            clin_type="1",
-            task_order_id="TO1",
+            initial_clin_amount=1000.00,
+            initial_clin_start_date="2020/1/1",
+            initial_clin_end_date="2020/3/1",
+            initial_clin_type="1",
+            initial_task_order_id="TO1",
             billing_account_name="7c89b735-b22b-55c0-ab5a-c624843e8bf6:de4416ce-acc6-44b1-8122-c87c4e903c91_2019-05-31",
             billing_profile_name="KQWI-W2SU-BG7-TGB",
         )

tests/domain/test_portfolio_state_machine.py

@@ -4,16 +4,19 @@ import re
 from tests.factories import (
     PortfolioFactory,
     PortfolioStateMachineFactory,
+    TaskOrderFactory,
+    CLINFactory,
 )
 
-from atst.models import FSMStates, PortfolioStateMachine
+from atst.models import FSMStates, PortfolioStateMachine, TaskOrder
 from atst.models.mixins.state_machines import AzureStages, StageStates, compose_state
+from atst.models.portfolio import Portfolio
 from atst.domain.csp import get_stage_csp_class
 
 
 @pytest.fixture(scope="function")
 def portfolio():
-    portfolio = PortfolioFactory.create()
+    portfolio = CLINFactory.create().task_order.portfolio
     return portfolio
 
 
@@ -77,7 +80,7 @@ def test_state_machine_initialization(portfolio):
         assert ["reset", "fail", create_trigger] == started_triggers
 
 
-def test_fsm_transition_start(portfolio):
+def test_fsm_transition_start(portfolio: Portfolio):
     sm: PortfolioStateMachine = PortfolioStateMachineFactory.create(portfolio=portfolio)
     assert sm.portfolio
     assert sm.state == FSMStates.UNSTARTED
@@ -88,6 +91,16 @@ def test_fsm_transition_start(portfolio):
     sm.start()
     assert sm.state == FSMStates.STARTED
 
+    expected_states = [
+        FSMStates.TENANT_CREATED,
+        FSMStates.BILLING_PROFILE_CREATION_CREATED,
+        FSMStates.BILLING_PROFILE_VERIFICATION_CREATED,
+        FSMStates.BILLING_PROFILE_TENANT_ACCESS_CREATED,
+        FSMStates.TASK_ORDER_BILLING_CREATION_CREATED,
+        FSMStates.TASK_ORDER_BILLING_VERIFICATION_CREATED,
+        FSMStates.BILLING_INSTRUCTION_CREATED,
+    ]
+
     # Should source all creds for portfolio? might be easier to manage than per-step specific ones
     creds = {"username": "mock-cloud", "password": "shh"}
     if portfolio.csp_data is not None:
@@ -95,19 +108,21 @@ def test_fsm_transition_start(portfolio):
     else:
         csp_data = {}
 
-    # ppoc = portfolio.owner
-    # user_id = f"{ppoc.first_name[0]}{ppoc.last_name}".lower()
-    user_id = "abcdefg"
+    ppoc = portfolio.owner
+    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]
+
     portfolio_data = {
         "user_id": user_id,
         "password": "jklfsdNCVD83nklds2#202",
         "domain_name": domain_name,
-        "first_name": "john",  # ppoc.first_name,
-        "last_name": "doe",  # ppoc.last_name,
+        "first_name": ppoc.first_name,
+        "last_name": ppoc.last_name,
         "country_code": "US",
-        "password_recovery_email_address": "email@example.com",  # ppoc.email,
+        "password_recovery_email_address": ppoc.email,
         "address": {
             "company_name": "",
             "address_line_1": "",
@@ -117,26 +132,24 @@ def test_fsm_transition_start(portfolio):
             "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,
     }
 
     config = {"billing_account_name": "billing_account_name"}
 
-    collected_data = dict(
-        list(csp_data.items()) + list(portfolio_data.items()) + list(config.items())
-    )
-    sm.trigger_next_transition(creds=creds, csp_data=collected_data)
+    for expected_state in expected_states:
+        print(expected_state)
+        collected_data = dict(
+            list(csp_data.items()) + list(portfolio_data.items()) + list(config.items())
+        )
+        sm.trigger_next_transition(creds=creds, csp_data=collected_data)
+        assert sm.state == expected_state
+        if portfolio.csp_data is not None:
+            csp_data = portfolio.csp_data
+        else:
+            csp_data = {}
 
-    assert sm.state == FSMStates.TENANT_CREATED
-    assert portfolio.csp_data.get("tenant_id", None) is not None
-    #print(portfolio.csp_data.keys())
-    if portfolio.csp_data is not None:
-        csp_data = portfolio.csp_data
-    else:
-        csp_data = {}
-    collected_data = dict(
-        list(csp_data.items()) + list(portfolio_data.items()) + list(config.items())
-    )
-    sm.trigger_next_transition(creds=creds, csp_data=collected_data)
-    assert sm.state == FSMStates.BILLING_PROFILE_CREATION_CREATED
-
-    #print(portfolio.csp_data.keys())