Merge pull request #191 from dod-ccpo/to-not-found-#159087193

Task Order number not found #159087193

tests/domain/test_task_orders.py

@@ -2,6 +2,7 @@ import pytest
 
 from atst.domain.exceptions import NotFoundError
 from atst.domain.task_orders import TaskOrders
+from atst.eda_client import MockEDAClient
 
 from tests.factories import TaskOrderFactory
 
@@ -13,6 +14,19 @@ def test_can_get_task_order():
     assert to.id == to.id
 
 
-def test_nonexistent_task_order_raises():
+def test_can_get_task_order_from_eda(monkeypatch):
+    monkeypatch.setattr("atst.domain.task_orders.TaskOrders._client", lambda: MockEDAClient())
+    to = TaskOrders.get(MockEDAClient.MOCK_CONTRACT_NUMBER)
+
+    assert to.number == MockEDAClient.MOCK_CONTRACT_NUMBER
+
+
+def test_nonexistent_task_order_raises_without_client():
     with pytest.raises(NotFoundError):
         TaskOrders.get("some fake number")
+
+
+def test_nonexistent_task_order_raises_with_client(monkeypatch):
+    monkeypatch.setattr("atst.domain.task_orders.TaskOrders._client", lambda: MockEDAClient())
+    with pytest.raises(NotFoundError):
+        TaskOrders.get("some other fake numer")

tests/forms/test_financial.py

@@ -1,6 +1,7 @@
 import pytest
 
-from atst.forms.financial import suggest_pe_id, FinancialForm
+from atst.forms.financial import suggest_pe_id, FinancialForm, ExtendedFinancialForm
+from atst.eda_client import MockEDAClient
 
 
 @pytest.mark.parametrize("input_,expected", [
@@ -18,7 +19,7 @@ def test_funding_type_other_not_required_if_funding_type_is_not_other():
     form_data = {
         "funding_type": "PROC"
     }
-    form = FinancialForm(data=form_data)
+    form = ExtendedFinancialForm(data=form_data)
     form.validate()
     assert "funding_type_other" not in form.errors
 
@@ -27,7 +28,7 @@ def test_funding_type_other_required_if_funding_type_is_other():
     form_data = {
         "funding_type": "OTHER"
     }
-    form = FinancialForm(data=form_data)
+    form = ExtendedFinancialForm(data=form_data)
     form.validate()
     assert "funding_type_other" in form.errors
 
@@ -67,3 +68,16 @@ def test_ba_code_validation(input_, expected):
     is_valid = "ba_code" not in form.errors
 
     assert is_valid == expected
+
+def test_task_order_number_validation(monkeypatch):
+    monkeypatch.setattr("atst.domain.task_orders.TaskOrders._client", lambda: MockEDAClient())
+    form_invalid = FinancialForm(data={"task_order_number": "1234"})
+    form_invalid.validate()
+
+    assert "task_order_number" in form_invalid.errors
+
+    form_valid = FinancialForm(data={"task_order_number": MockEDAClient.MOCK_CONTRACT_NUMBER}, eda_client=MockEDAClient())
+    form_valid.validate()
+
+    assert "task_order_number" not in form_valid.errors
+

tests/routes/test_financial_verification.py

@@ -1,6 +1,10 @@
 import re
 import pytest
 import urllib
+from flask import url_for
+
+from atst.eda_client import MockEDAClient
+
 from tests.mocks import MOCK_REQUEST, MOCK_USER
 from tests.factories import PENumberFactory
 
@@ -9,7 +13,7 @@ class TestPENumberInForm:
 
     required_data = {
         "pe_id": "123",
-        "task_order_id": "1234567899C0001",
+        "task_order_number": MockEDAClient.MOCK_CONTRACT_NUMBER,
         "fname_co": "Contracting",
         "lname_co": "Officer",
         "email_co": "jane@mail.mil",
@@ -18,6 +22,11 @@ class TestPENumberInForm:
         "lname_cor": "Representative",
         "email_cor": "jane@mail.mil",
         "office_cor": "WHS",
+        "uii_ids": "1234",
+        "treasury_code": "00123456",
+        "ba_code": "024A"
+    }
+    extended_data = {
         "funding_type": "RDTE",
         "funding_type_other": "other",
         "clin_0001": "50,000",
@@ -33,9 +42,13 @@ class TestPENumberInForm:
         monkeypatch.setattr("atst.domain.requests.Requests.get", lambda i: MOCK_REQUEST)
         monkeypatch.setattr("atst.domain.auth.get_current_user", lambda *args: MOCK_USER)
 
-    def submit_data(self, client, data):
+    def submit_data(self, client, data, extended=False):
+        url_kwargs = {"request_id": MOCK_REQUEST.id}
+        if extended:
+            url_kwargs["extended"] = True
+
         response = client.post(
-            "/requests/verify/{}".format(MOCK_REQUEST.id),
+            url_for("requests.financial_verification", **url_kwargs),
             headers={"Content-Type": "application/x-www-form-urlencoded"},
             data=urllib.parse.urlencode(data),
             follow_redirects=False,
@@ -83,3 +96,40 @@ class TestPENumberInForm:
 
         assert "There were some errors" in response.data.decode()
         assert response.status_code == 200
+
+    def test_submit_financial_form_with_invalid_task_order(self, monkeypatch, user_session, client):
+        monkeypatch.setattr("atst.domain.requests.Requests.get", lambda i: MOCK_REQUEST)
+        user_session()
+
+        data = dict(self.required_data)
+        data['pe_id'] = MOCK_REQUEST.body['financial_verification']['pe_id']
+        data['task_order_number'] = '1234'
+
+        response = self.submit_data(client, data)
+
+        assert "enter TO information manually" in response.data.decode()
+
+    def test_submit_financial_form_with_valid_task_order(self, monkeypatch, user_session, client):
+        monkeypatch.setattr("atst.domain.requests.Requests.get", lambda i: MOCK_REQUEST)
+        user_session()
+
+        data = dict(self.required_data)
+        data['pe_id'] = MOCK_REQUEST.body['financial_verification']['pe_id']
+        data['task_order_number'] = MockEDAClient.MOCK_CONTRACT_NUMBER
+
+        response = self.submit_data(client, data)
+
+        assert "enter TO information manually" not in response.data.decode()
+
+    def test_submit_extended_financial_form(self, monkeypatch, user_session, client):
+        monkeypatch.setattr("atst.domain.requests.Requests.get", lambda i: MOCK_REQUEST)
+        user_session()
+
+        data = { **self.required_data, **self.extended_data }
+        data['pe_id'] = MOCK_REQUEST.body['financial_verification']['pe_id']
+        data['task_order_number'] = "1234567"
+
+        response = self.submit_data(client, data, extended=True)
+
+        assert response.status_code == 302
+        assert "/requests/financial_verification_submitted" in response.headers.get("Location")