From 6a03664b51058541ee56e1747a77c843543c6493 Mon Sep 17 00:00:00 2001 From: dandds Date: Wed, 17 Oct 2018 15:05:58 -0400 Subject: [PATCH] get CLIN info from EDA XML --- atst/eda_client.py | 36 ++++- tests/fixtures/eda_contract.xml | 239 ++++++++++++++++++++++++++++++++ tests/test_eda_client.py | 17 ++- 3 files changed, 284 insertions(+), 8 deletions(-) create mode 100644 tests/fixtures/eda_contract.xml diff --git a/atst/eda_client.py b/atst/eda_client.py index 51b25522..06e3f881 100644 --- a/atst/eda_client.py +++ b/atst/eda_client.py @@ -5,6 +5,39 @@ import requests from requests.auth import HTTPBasicAuth +def parse_eda_xml(xml_string): + contract_et = ET.fromstring(xml_string) + handler = EDAXMLHandler(contract_et) + handler.parse() + return { + "clin_0001": handler.clins.get("0001"), + "clin_0003": handler.clins.get("0003"), + "clin_1001": handler.clins.get("1001"), + "clin_1003": handler.clins.get("1003"), + "clin_2001": handler.clins.get("2001"), + "clin_2003": handler.clins.get("2003"), + } + + +class EDAXMLHandler: + def __init__(self, element_tree): + self.element_tree = element_tree + self.clins = {} + + @property + def _line_items(self): + return self.element_tree.findall(".//LineItem[LineItemType='CLIN']/../../..") + + def _parse_clin_data(self): + for line_item in self._line_items: + number = line_item.find(".//LineItemBase").text + amount_details = line_item.find(".//ItemOtherAmounts[AmountDescription='Not to Exceed Amount (Funding)']/Amount") + self.clins[number] = float(amount_details.text) + + def parse(self): + self._parse_clin_data() + + class EDAClientBase(object): def list_contracts( self, @@ -80,9 +113,6 @@ class MockEDAClient(EDAClientBase): MOCK_CONTRACT_NUMBER = "DCA10096D0052" - # TODO: It seems likely that this will have to supply CLIN data form the - # EDA returnclinXML API call, in addition to the basic task order data - # below. See the EDA docs. def get_contract(self, contract_number, status): if contract_number == self.MOCK_CONTRACT_NUMBER and status == "y": return { diff --git a/tests/fixtures/eda_contract.xml b/tests/fixtures/eda_contract.xml new file mode 100644 index 00000000..14dad743 --- /dev/null +++ b/tests/fixtures/eda_contract.xml @@ -0,0 +1,239 @@ + + 2.5 + DD 1155 + + 3244871 + + 00000431 + 704331 + + + + + + Department of Defense + Delivery Order + 70433119F2644 + Represented Contract + + + Department of Defense + Basic Ordering Agreement + W81K0419G0001 + Ordering Instrument + + + false + Original + false + + Firm Fixed Price + + + + + http://farsite.hill.af.mil/reghtml/regs/far2afmcfars/fardfars/far/52_220.htm#P810_149596 + + + FAR + 52.222-50 + Combating Trafficking in Persons. + 2015-05 + + + [ lots of text ] + + +
I
+ + + FAR + 52.245-1 + Government Property. + 2012-04 + + + [ lots of text ] + + +
I
+ + + + 2016-02-04 + + 2016-01-25 + + DALE WOLFE + + Telephone + 520-533-9132 + + + + + + Contractor +
+ + 0Z7K0 + 808152482 + + + CACI TECHNOLOGIES, INC + + + 6933 Gateway Ct + Manassas VA, 20109 + + + +
+ + + Contract Issuing Office +
+ + 704331 + + + FEMA DISTRIBUTION CENTER + + + 3870 S. SIDE INDUSTRIAL CTR + ATLANTA GA, 30354 + + + +
+ + GENE BARBER + + Telephone + (202) 646-2727 + + + + + Contract Administrative Office +
+ + 704331 + + + FEMA DISTRIBUTION CENTER + + + 3870 S. SIDE INDUSTRIAL CTR + ATLANTA GA, 30354 + + + +
+ + + Paying Office +
+ + HQ0131 + + + DEFENSE FINANCE AND ACCOUNTING SVC + + + P.O. BOX 369016 + COLUMBUS OH, 43236 + + + +
+ + + Ship To +
+ + S0302A + + + DCMA PHOENIX + + + 40 NORTH CENTRAL AVE, STE 400 + TWO RENAISSANCE SQUARE + PHOENIX AZ, 85004 + + + +
+ + + + Header Only - Total Contract Value + 192000.00 + + + + + Delivery Requested By + + 2016-01-16 + + + + + + Defense Priorities Allocation System (DPAS) Priority Rating + + DO-A7 +
A
+ + + + Contractor + Origin (after Loading) + + + + + + + + + CLIN + 0001 + + + + + false + + Cost No Fee + + + Real Property + Radio Dishes + 3 + false + Estimated + Each + 64000.00 + + Manufacturer's Part Number + 5L33M7730291DX081 + + + + + + Estimated Cost + 192000.00 + + + Not to Exceed Amount (Funding) + 200000.00 + + + + + + diff --git a/tests/test_eda_client.py b/tests/test_eda_client.py index 03380ee1..36619df6 100644 --- a/tests/test_eda_client.py +++ b/tests/test_eda_client.py @@ -1,20 +1,27 @@ -from atst.eda_client import MockEDAClient +from atst.eda_client import MockEDAClient, parse_eda_xml -client = MockEDAClient() +mock_client = MockEDAClient() def test_list_contracts(): - results = client.list_contracts() + results = mock_client.list_contracts() assert len(results) == 3 def test_get_contract(): - result = client.get_contract("DCA10096D0052", "y") + result = mock_client.get_contract("DCA10096D0052", "y") assert result["contract_no"] == "DCA10096D0052" assert result["amount"] == 2_000_000 def test_contract_not_found(): - result = client.get_contract("abc", "y") + result = mock_client.get_contract("abc", "y") assert result is None + + +def test_eda_xml_parser(): + with open("tests/fixtures/eda_contract.xml") as contract: + eda_data = parse_eda_xml(contract.read()) + assert eda_data["clin_0001"] == 200000.00 + assert not eda_data["clin_0003"]