Skip to content

UPD camt parser: filter empty text nodes and enhance transaction details #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ecino wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

UPD camt parser: filter empty text nodes and enhance transaction details #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions account_statement_import_camt/models/account_statement_import_camt_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def add_value_from_node(self, ns, node, xpath_str, obj, attr_name, join_str=None
elif join_str is None:
attr_value = found_node[0].text
else:
attr_value = join_str.join([x.text for x in found_node])
attr_value = join_str.join([x.text for x in found_node if x.text])
obj[attr_name] = attr_value
break

Expand Down Expand Up @@ -289,6 +289,7 @@ def parse_entry(self, ns, node):
"./ns:NtryDtls/ns:RmtInf/ns:Strd/ns:CdtrRefInf/ns:Ref",
"./ns:NtryDtls/ns:Btch/ns:PmtInfId",
"./ns:NtryDtls/ns:TxDtls/ns:Refs/ns:AcctSvcrRef",
"./ns:AcctSvcrRef",
],
transaction,
"ref",
Expand Down Expand Up @@ -337,12 +338,21 @@ def parse_entry(self, ns, node):

details_nodes = node.xpath("./ns:NtryDtls/ns:TxDtls", namespaces={"ns": ns})
if len(details_nodes) == 0:
self.add_value_from_node(
ns, node, "./ns:AddtlNtryInf", transaction, "payment_ref"
)
self.generate_narration(transaction)
yield transaction
return
transaction_base = transaction
for node in details_nodes:
transaction = transaction_base.copy()
transaction["narration"] = transaction_base["narration"].copy()
detail_amount = self.parse_amount(ns, node)
if detail_amount != 0.0:
transaction["amount"] = detail_amount
elif len(details_nodes) == 1 and node.tag.endswith("TxDtls"):
transaction["amount"] = amount
self.parse_transaction_details(ns, node, transaction)
self.generate_narration(transaction)
yield transaction
Expand Down Expand Up @@ -450,7 +460,7 @@ def parse(self, data):
root = None
if root is None:
raise ValueError("Not a valid xml file, or not an xml file at all.")
ns = root.tag[1 : root.tag.index("}")]
ns = root.tag[1 : root.tag.index("}")] if "}" in root.tag else ""
self.check_version(ns, root)
statements = []
currency = None
Expand Down
18 changes: 17 additions & 1 deletion account_statement_import_camt/tests/samples/golden-camt053-txdtls.pydata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,20 @@
'partner_name': 'Banque Cantonale Vaudoise',
'payment_ref': '/',
'ref': '302388292000022222222222222',
'transaction_type': 'PMNT-RCDT-VCOM'}]}])
'transaction_type': 'PMNT-RCDT-VCOM'},
{'account_number': 'CH4444000000123456789',
'amount': 50.0,
'date': '2017-03-22',
'narration': 'Partner Name (RltdPties/Nm): Single Detail Debtor\n'
'Partner Account Number (RltdPties/Acct): CH4444000000123456789\n'
'Transaction Date (BookgDt): 2017-03-22\n'
'Reference: ENTRY-FALLBACK-REF\n'
'Communication: \n'
'Transaction Type (BkTxCd): \n'
'Additional Entry Information (AddtlNtryInf): ENTRY INFO SHOULD STAY IN NARRATION ONLY\n'
'Unstructured Reference (RmtInf/Ustrd): REM-ONE\n'
'Postal Address (PstlAdr): Address line 1',
'partner_name': 'Single Detail Debtor',
'payment_ref': 'REM-ONE',
'ref': 'ENTRY-FALLBACK-REF',
'transaction_type': ''}]}])
31 changes: 31 additions & 0 deletions account_statement_import_camt/tests/samples/test-camt053-txdtls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,37 @@
</NtryDtls>
<AddtlNtryInf>CRÉDIT GROUPÉ BVR TRAITEMENT DU 22.03.2017 NUMÉRO CLIENT 01-70884-3 PAQUET ID: 123456CHCAFEBABE</AddtlNtryInf>
</Ntry>
<Ntry>
<Amt Ccy="CHF">50.00</Amt>
<CdtDbtInd>CRDT</CdtDbtInd>
<BookgDt>
<Dt>2017-03-22</Dt>
</BookgDt>
<AcctSvcrRef>ENTRY-FALLBACK-REF</AcctSvcrRef>
<NtryDtls>
<TxDtls>
<RltdPties>
<Dbtr>
<Nm>Single Detail Debtor</Nm>
<PstlAdr>
<AdrLine></AdrLine>
<AdrLine>Address line 1</AdrLine>
</PstlAdr>
</Dbtr>
<DbtrAcct>
<Id>
<IBAN>CH4444000000123456789</IBAN>
</Id>
</DbtrAcct>
</RltdPties>
<RmtInf>
<Ustrd></Ustrd>
<Ustrd>REM-ONE</Ustrd>
</RmtInf>
</TxDtls>
</NtryDtls>
<AddtlNtryInf>ENTRY INFO SHOULD STAY IN NARRATION ONLY</AddtlNtryInf>
</Ntry>
</Stmt>
</BkToCstmrStmt>
</Document>
Loading