Compare commits

..

No commits in common. "ea062e10aec607cd2045ecc31e776310002ed027" and "c05b11387dbf19168621e35480e21e8b2f0e3e8f" have entirely different histories.

2 changed files with 27 additions and 45 deletions

View File

@ -1 +1 @@
1.3.133 1.3.132

View File

@ -470,24 +470,17 @@ class EconomicService:
logger.info(f"📋 Trying invoice endpoint: {endpoint}") logger.info(f"📋 Trying invoice endpoint: {endpoint}")
try: try:
# Pagination: Keep fetching until no more pages
page = 0
while True:
async with session.get( async with session.get(
endpoint, endpoint,
params={"pagesize": 1000, "skippages": page}, params={"pagesize": 1000},
headers=self._get_headers() headers=self._get_headers()
) as response: ) as response:
logger.info(f"🔍 [API] Response status from {endpoint} (page {page}): {response.status}") logger.info(f"🔍 [API] Response status from {endpoint}: {response.status}")
if response.status == 200: if response.status == 200:
data = await response.json() data = await response.json()
invoices_from_endpoint = data.get('collection', []) invoices_from_endpoint = data.get('collection', [])
logger.info(f"✅ Fetched {len(invoices_from_endpoint)} invoices from {endpoint} page {page}") logger.info(f"✅ Successfully fetched {len(invoices_from_endpoint)} invoices from {endpoint}")
if not invoices_from_endpoint:
# No more invoices on this page
break
# Add new invoices (avoid duplicates by tracking invoice numbers) # Add new invoices (avoid duplicates by tracking invoice numbers)
existing_invoice_numbers = set() existing_invoice_numbers = set()
@ -496,25 +489,14 @@ class EconomicService:
if inv_num: if inv_num:
existing_invoice_numbers.add(inv_num) existing_invoice_numbers.add(inv_num)
new_invoices_count = 0
for inv in invoices_from_endpoint: for inv in invoices_from_endpoint:
inv_num = inv.get('draftInvoiceNumber') or inv.get('bookedInvoiceNumber') inv_num = inv.get('draftInvoiceNumber') or inv.get('bookedInvoiceNumber')
if inv_num and inv_num not in existing_invoice_numbers: if inv_num and inv_num not in existing_invoice_numbers:
all_invoices.append(inv) all_invoices.append(inv)
existing_invoice_numbers.add(inv_num) existing_invoice_numbers.add(inv_num)
new_invoices_count += 1
logger.info(f" Added {new_invoices_count} new unique invoices")
# Check if we got full page (1000) - if so, there might be more pages
if len(invoices_from_endpoint) < 1000:
break # Last page
page += 1
else: else:
error_text = await response.text() error_text = await response.text()
logger.warning(f"⚠️ Endpoint {endpoint} returned {response.status}: {error_text[:200]}") logger.warning(f"⚠️ Endpoint {endpoint} returned {response.status}: {error_text[:200]}")
break
except Exception as e: except Exception as e:
logger.warning(f"⚠️ Error trying endpoint {endpoint}: {e}") logger.warning(f"⚠️ Error trying endpoint {endpoint}: {e}")