Browse Source

[FIX] *_online_ponto: Backport 4a8f9ac better code organisation

12.0
Ronald Portier (Therp BV) 2 years ago
parent
commit
daa143336e
No known key found for this signature in database GPG Key ID: A181F8124D7101D3
  1. 47
      account_bank_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py

47
account_bank_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py

@ -159,34 +159,33 @@ class OnlineBankStatementProviderPonto(models.Model):
response = requests.get(
page_url, params=params, headers=self._ponto_header()
)
if response.status_code == 200:
if params.get("before"):
params.pop("before")
data = json.loads(response.text)
links = data.get("links", {})
if page_next:
page_url = links.get("next", False)
else:
page_url = links.get("prev", False)
transactions = data.get("data", [])
if transactions:
current_transactions = []
for transaction in transactions:
date = self._ponto_date_from_string(
transaction.get("attributes", {}).get("executionDate")
)
if date_since <= date < date_until:
current_transactions.append(transaction)
if current_transactions:
if not page_next or (page_next and not latest_identifier):
latest_identifier = current_transactions[0].get("id")
transaction_lines.extend(current_transactions)
else:
if response.status_code != 200:
raise UserError(
_("Error during get transaction.\n\n%s \n\n %s")
% (response.status_code, response.text)
)
if params.get("before"):
params.pop("before")
data = json.loads(response.text)
links = data.get("links", {})
if page_next:
page_url = links.get("next", False)
else:
page_url = links.get("prev", False)
transactions = data.get("data", [])
if transactions:
current_transactions = []
for transaction in transactions:
date = self._ponto_date_from_string(
transaction.get("attributes", {}).get("executionDate")
)
if date_since <= date < date_until:
current_transactions.append(transaction)
if current_transactions:
if not page_next or (page_next and not latest_identifier):
latest_identifier = current_transactions[0].get("id")
transaction_lines.extend(current_transactions)
if latest_identifier:
self.ponto_last_identifier = latest_identifier
return transaction_lines

Loading…
Cancel
Save