From ac46f41cb3d5cd35e4024c847c4146ada920891a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Sat, 8 Apr 2023 20:40:38 +0200 Subject: [PATCH] Handle inter-account transactions properly. --- src/bank-fio.scm | 8 -------- src/members-payments.scm | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/bank-fio.scm b/src/bank-fio.scm index 7fc0789..d4cc06a 100644 --- a/src/bank-fio.scm +++ b/src/bank-fio.scm @@ -73,14 +73,6 @@ (num (if numrow (cadr numrow) "ERROR")) (bankrow (assoc "bankId" head)) (bank (if bankrow (cadr bankrow) "ERROR"))) - (print head) - (print numrow) - (print bankrow) - (print (assoc (caar head) head)) - (print (caar head)) - (print "accountId") - (print (equal? "accountId" (caar head))) - (print (string->list (caar head))) (make-bank-account num bank (map make-fio-transaction (cdr body)))) (let () diff --git a/src/members-payments.scm b/src/members-payments.scm index c5702cf..710e0e5 100644 --- a/src/members-payments.scm +++ b/src/members-payments.scm @@ -149,16 +149,16 @@ (define (members-payments-process mb apikeys-file dir checked-fn) (if apikeys-file (let* ((acc-list (load-accounts-list apikeys-file)) - (accounts (if acc-list (load-accounts acc-list dir) #f)) - (total (length accounts)) + (all-accounts (if acc-list (load-accounts acc-list dir) #f)) + (total (length all-accounts)) (last-checked (get-latest-checked-id checked-fn))) - (if accounts + (if all-accounts (with-progress% #t "Payments" (progress%-advance 0) (let loop ((mb mb) (idx 0) - (accounts accounts)) + (accounts all-accounts)) (if (null? accounts) (let ((mb (members-base-update mb identity member-sort-payments))) (progress%-advance 1) @@ -166,7 +166,7 @@ (let () (progress%-advance (/ idx total)) (loop (if (car accounts) - (members-payments-process-bank mb (car accounts) last-checked accounts) + (members-payments-process-bank mb (car accounts) last-checked all-accounts) mb) (add1 idx) (cdr accounts))))))