Handle inter-account transactions properly.

This commit is contained in:
Dominik Pantůček 2023-04-08 20:40:38 +02:00
parent d72cde9c04
commit ac46f41cb3
2 changed files with 5 additions and 13 deletions

View file

@ -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 ()

View file

@ -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))))))