From 5d4f867342d98ad1d2b7194a58630f01cff851bf Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 2 Nov 2018 11:52:22 -0400
Subject: [PATCH] Correct attachment form field even if form is not extended

---
 .../routes/requests/financial_verification.py | 12 ++++-----
 tests/routes/test_financial_verification.py   | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py
index 2a4d6443..ff9617f7 100644
--- a/atst/routes/requests/financial_verification.py
+++ b/atst/routes/requests/financial_verification.py
@@ -30,12 +30,12 @@ class FinancialVerificationBase(object):
         _formdata = ImmutableMultiDict(formdata) if formdata is not None else None
         fv = FinancialVerification(request)
         form = FinancialVerificationForm(obj=fv, formdata=_formdata)
-        if is_extended:
-            try:
-                attachment = Attachment.get_for_resource("task_order", self.request.id)
-                form.task_order.pdf.data = attachment.filename
-            except NotFoundError:
-                pass
+
+        try:
+            attachment = Attachment.get_for_resource("task_order", self.request.id)
+            form.task_order.pdf.data = attachment.filename
+        except NotFoundError:
+            pass
 
         return form
 
diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py
index cbfc959d..24e02ac5 100644
--- a/tests/routes/test_financial_verification.py
+++ b/tests/routes/test_financial_verification.py
@@ -403,6 +403,31 @@ def test_eda_task_order_does_trigger_approval(client, user_session, fv_data, e_f
     assert updated_request.status == RequestStatus.APPROVED
 
 
+def test_attachment_on_non_extended_form(client, user_session, fv_data, e_fv_data):
+    user = UserFactory.create()
+    request = RequestFactory.create(creator=user)
+    data = {
+        **fv_data,
+        **e_fv_data,
+        "task_order-number": MockEDAClient.MOCK_CONTRACT_NUMBER,
+        "request-pe_id": "0101228N",
+    }
+    user_session(user)
+    client.post(
+        url_for(
+            "requests.financial_verification", request_id=request.id, extended=True
+        ),
+        data=data,
+        follow_redirects=True,
+    )
+
+    response = client.get(
+        url_for("requests.financial_verification", request_id=request.id)
+    )
+
+    assert response.status_code == 200
+
+
 def test_task_order_number_persists_in_form(fv_data, e_fv_data):
     user = UserFactory.create()
     request = RequestFactory.create(creator=user)