From 0bda0c481e64f8050b78a37ee4862f70fc21e7ff Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Wed, 19 Feb 2020 11:10:20 -0500
Subject: [PATCH] Explicitly pass in kwargs instead of splatting clin and
 portfolio data

---
 atst/domain/csp/cloud/models.py | 8 --------
 atst/jobs.py                    | 9 +++++----
 atst/models/clin.py             | 2 --
 tests/test_jobs.py              | 1 +
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/atst/domain/csp/cloud/models.py b/atst/domain/csp/cloud/models.py
index 5bb056d7..27f2c9c7 100644
--- a/atst/domain/csp/cloud/models.py
+++ b/atst/domain/csp/cloud/models.py
@@ -220,14 +220,6 @@ class BillingInstructionCSPPayload(BaseCSPPayload):
     billing_account_name: str
     billing_profile_name: str
 
-    class Config:
-        fields = {
-            "initial_clin_amount": "obligated_amount",
-            "initial_clin_start_date": "start_date",
-            "initial_clin_end_date": "end_date",
-            "initial_clin_type": "number",
-        }
-
 
 class BillingInstructionCSPResult(AliasModel):
     reported_clin_name: str
diff --git a/atst/jobs.py b/atst/jobs.py
index e5805875..855af5b2 100644
--- a/atst/jobs.py
+++ b/atst/jobs.py
@@ -325,15 +325,16 @@ def create_billing_instruction(self):
     clins = TaskOrders.get_clins_for_create_billing_instructions()
     for clin in clins:
         portfolio = clin.task_order.portfolio
-        clin_data = clin.to_dictionary()
-        portfolio_data = portfolio.to_dictionary()
 
         payload = BillingInstructionCSPPayload(
             tenant_id=portfolio.csp_data.get("tenant_id"),
             billing_account_name=portfolio.csp_data.get("billing_account_name"),
             billing_profile_name=portfolio.csp_data.get("billing_profile_name"),
-            **clin_data,
-            **portfolio_data,
+            initial_clin_amount=clin.obligated_amount,
+            initial_clin_start_date=str(clin.start_date),
+            initial_clin_end_date=str(clin.end_date),
+            initial_clin_type=clin.number,
+            initial_task_order_id=str(clin.task_order_id),
         )
 
         try:
diff --git a/atst/models/clin.py b/atst/models/clin.py
index 440ee0a0..a96e907f 100644
--- a/atst/models/clin.py
+++ b/atst/models/clin.py
@@ -71,8 +71,6 @@ class CLIN(Base, mixins.TimestampsMixin):
             for c in self.__table__.columns
             if c.name not in ["id"]
         }
-        data["start_date"] = str(data["start_date"])
-        data["end_date"] = str(data["end_date"])
 
         return data
 
diff --git a/tests/test_jobs.py b/tests/test_jobs.py
index 8031d2aa..eba01f9b 100644
--- a/tests/test_jobs.py
+++ b/tests/test_jobs.py
@@ -561,6 +561,7 @@ class TestCreateBillingInstructions:
 
         session.begin_nested()
         create_billing_instruction()
+        session.add(sent_clin)
 
         # check that last_sent_at has been update for the new clin only
         assert new_clin.last_sent_at