[IMP] *_online_ponto: make conditions readable in data retrieval

OCA · Sep 15, 2023 · 178a565 · 178a565
1 parent 4824174
commit 178a565
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py b/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py
@@ -60,7 +60,7 @@ def _pull(self, date_since, date_until):
     def _ponto_pull(self, date_since, date_until):
         """Translate information from Ponto to Odoo bank statement lines."""
         self.ensure_one()
-        is_scheduled = self.env.context.get("scheduled")
+        is_scheduled = self.env.context.get("scheduled", False)
         if is_scheduled:
             _logger.debug(
                 _(
@@ -97,12 +97,12 @@ def _ponto_retrieve_data(self, date_since, date_until):
         Note: when reading data they are likely to be in descending order of
         execution_date (not seen a guarantee for this in Ponto API). When using
         value date, they may well be out of order. So we cannot simply stop
-        when we have foundd a transaction date before the date_since.
+        when we have found a transaction date before the date_since.
 
         We will not read transactions more then a week before before date_since.
         """
         date_stop = date_since - timedelta(days=7)
-        is_scheduled = self.env.context.get("scheduled")
+        is_scheduled = self.env.context.get("scheduled", False)
         lines = []
         interface_model = self.env["ponto.interface"]
         access_data = interface_model._login(self.username, self.password)
@@ -113,15 +113,21 @@ def _ponto_retrieve_data(self, date_since, date_until):
             for line in transactions:
                 identifier = line.get("id")
                 transaction_datetime = self._ponto_get_transaction_datetime(line)
-                if (is_scheduled and identifier == self.ponto_last_identifier) or (
-                    transaction_datetime < date_stop
-                    and (not self.ponto_last_identifier or not is_scheduled)
-                ):
-                    return lines
-                if not is_scheduled:
-                    if transaction_datetime < date_since:
+                if is_scheduled:
+                    # Handle all stop conditions for scheduled runs.
+                    if identifier == self.ponto_last_identifier or (
+                        not self.ponto_last_identifier
+                        and transaction_datetime < date_stop
+                    ):
                         return lines
-                    if transaction_datetime > date_until:
+                else:
+                    # Handle stop conditions for non scheduled runs.
+                    if transaction_datetime < date_stop:
+                        return lines
+                    if (
+                        transaction_datetime < date_since
+                        or transaction_datetime > date_until
+                    ):
                         continue
                 line["transaction_datetime"] = transaction_datetime
                 lines.append(line)