Files
integreat/docs/2026-08-15-sales-summary-rollout-plan.md
Bryce 10d0d01b82 fix(square): do not resolve a record that belongs to another client
Two clients on one Square location double a day's tender in the window
between deploying and finishing the migration. Reproduced end to end:

  1. charge X carries the legacy key square/charge/P and belongs to
     client B's order
  2. client A's payout import resolves X through existing-id's legacy
     fallback and renames it into A's scope
  3. client B's next order import matches neither scheme, so it mints a
     second charge
  4. :sales-order/charges is cardinality-many and orders transact as
     plain maps, so nothing retracts the first

B's order ends up holding two charges for one payment — $200 of tender
for a $100 payment — and running the migration on that state produces
square/charge/BBB-LB-AAA-LA-P, the same double-scoped shape that already
doubled tender on five clients once during this work.

existing-id's legacy branch now declines any record already owned by a
different client, reading the owner attribute and, for charges that
predate :charge/client, the client of the referencing order. Declining is
also correct on its merits: the write then lands on this client's own
copy, which is what the scoped keys exist to create. The payout path also
writes :charge/client/:charge/location alongside the key, so a charge's
scope and its owner can no longer disagree.

The guard is transitional and gets deleted with the legacy branch it
protects, at rollout step 9.

Rollout resequenced for the decision to leave duplicate client records
active: no deactivation, no "which record survives" call, and the risk
window closed by pausing the importer across deploy + migrate rather than
by removing one of the two writers. Both records converge to independent
stable histories once every key carries its owner.

Also from review:

- migrate-all! now collision-checks the charge pass like the other three
  attributes instead of discovering a clash mid-run over 17M rows
- split-and-rekey-charges! logs progress every 200 batches; an
  interrupted 19M-order run left no trail
- unscoped-report's docstring no longer promises a zero its :no-owner
  column cannot reach; plan is named as the authoritative signal
- the rollout's pre-flight asked for a :collisions key plan never
  returns, so it silently passed on every database
- the multi-parent gate sampled (take 400000 (all-order-ids db)), which
  streams :aevt — ascending entity id — and so read the OLDEST 2% of
  orders: 2019-12-31 to 2021-06-03, before any of the contention it
  looks for. Now every order of the last year via the client+date index,
  5,159,787 on the restored copy, reading 0
- the report claimed same-client pairs get copied once batches split
  them. They do not, at any batch size; verified at batch-size 1 and now
  pinned by a test

30 tests, 72 assertions.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-16 08:09:53 -07:00

15 KiB
Raw Blame History

Sales-summary balancing — rollout plan

Steps to execute, in order. Every step is either reversible or verifiable before the next one begins. The one behaviour change that alters a client's books is behind a per-client feature flag that is off by default, so merging and deploying this branch changes nothing on its own.

Measured on a restored copy of production (backup point 209608347), 210 clients over 2026-05-10 → 2026-08-07: 1,258 client-days out of balance / $69,560.10 → 279 days / $7,790.54, with zero days knocked out of balance and zero already-balanced days altered.

Of the 279 days left, 171 are not balancing faults — they are days where a client's sales were never imported while its refunds were. Step 10 is about those, and it is the most important thing in this document.


Before you start

Flag introduced summary-service-charges — off by default
Migration to run once auto-ap.jobs.rekey-square-external-ids/migrate-all!
Expected migration runtime ~13 minutes for 19M orders on a warm cache
Nothing here touches invoices, payments, the ledger, or any client without the flag set

Client configuration is left exactly as it is. Ten Square locations are configured against two client records each, and both stay active. The re-key is what resolves them: once every record carries its owner in its key, each client's import resolves only its own records and the two records keep independent, stable histories. No "which record survives" decision is needed, and nothing is deactivated.

The consequence to be aware of: each Square payment, refund, payout and shift at a shared location becomes two entities, one per client record — by design. That is the stable end state, not a duplicate to clean up. If any report or export aggregates across client records, one restaurant's takings would be counted twice at that layer. Nothing in this work changes that either way.

The only window of risk is between deploying and finishing the migration, while legacy keys still exist for a client to resolve. Steps 25 exist to make that window effectively zero.


Step 1 — Guard remove-voided-orders

Do this before the migration, not after. :sales-order/charges is :db/isComponent true, so retracting an order cascades into its payments. Until step 4 finishes there are still payments with two parent orders, and deleting one client's voided order can take the other client's payment with it.

Either leave remove-voided-orders switched off until step 4 verifies clean, or change it to detach a payment that has more than one parent rather than delete it. Detaching is worth doing regardless — it makes the safety a property of the deletion rather than of the migration having been run first.

See docs/2026-08-15-remove-voided-orders-risk.md.


Step 2 — Pause the Square importer

This is what makes the deploy safe, and it is easy to skip. Steps 2 through 5 should be one maintenance action, not separate days' work.

While legacy keys exist, square.core3/existing-id falls back to them — and at a shared location that is the one code path that can reach across client records. Running the migration with imports paused means no client is resolving keys while the keys are being rewritten, so the window closes entirely rather than merely narrowing.

The migration itself takes about 13 minutes for all 19M orders, so the pause is short.


Step 3 — Deploy the code

Deploy the branch. The flag is absent from every client, so:

  • tips are calculated exactly as they are today,
  • no Service Charges line is written.

The only changes that take effect immediately are the safe ones: imbalance logging, the dirty-summary scan bounded to one client (1,321 ms → 5.6 ms per client), the schema-ordering fix, and the importer's new client-scoped keys.

The importer reads both key schemes, so the deploy does not depend on the migration having finished. Two protections cover the interval before it does: imports are paused (step 2), and existing-id refuses to resolve a record that already belongs to a different client. Do not remove the legacy lookup yet — see step 9.


Step 4 — Run the migration

Run it immediately after the deploy, while imports are still paused.

(require '[auto-ap.jobs.rekey-square-external-ids :as rk])

;; read-only first — no two entities may want the same key. `plan` does NOT return a
;; :collisions key; you have to hand its :new-keys to `collisions` yourself.
(rk/collisions (:new-keys (rk/plan (d/db conn) :charge/external-id rk/charge-prefix)))
;; => []   (anything else: stop, do not migrate)

;; then the whole thing
(rk/migrate-all! 2000)

migrate-all! runs this same check itself, on every attribute including charges, and throws rather than transacting if it finds one. Running it by hand first just means finding out before the 13-minute walk rather than partway through it.

Runs in about thirteen minutes over 19M orders. It is idempotent and resumable — a record that already carries the right name is skipped, so it can be stopped and re-run without consequence.

If it appears to crawl, the cause is almost certainly garbage collection in the process driving it, not the transactor. That misdiagnosis cost two days of projected runtime during this work. Free retained memory in the REPL and re-measure before changing anything about the database.

Verify. Two checks, doing two different jobs — run both.

(a) Completeness, across everything. plan must report nothing left to do, for all four attributes:

(dissoc (rk/plan (d/db conn) :charge/external-id rk/charge-prefix) :new-keys)
;; => {:total 17047142 :to-migrate 0 :already-scoped 17047142 :unscopable 0}

Read :to-migrate 0 and :unscopable 0. This is the authoritative signal, and it covers all 17M charges.

unscoped-report is useful colour but is not the gate: its :no-owner column never reaches zero for charges, because ~283k payout stubs carry no :charge/client of their own and it classifies by attribute rather than by resolving ownership. Judge completeness by plan.

(b) The safety gate for the cascade — no payment may answer to two orders, or re-enabling remove-voided-orders in step 8 can delete a payment another order still needs. Check every order in the last year, with no sampling:

(let [db   (d/db conn)
      cs   (map first (d/q '[:find ?c :where [?c :client/code _]] db))
      year (java.util.Date. (- (.getTime (java.util.Date.)) (long (* 365 86400000))))]
  (rk/charges-with-multiple-parents
    db (map first (iol-ion.query/scan-sales-orders db cs year nil))))
;; => 0

On the restored copy that is 5,159,787 orders — 27% of the table — via the :sales-order/client+date index. A year is chosen deliberately: remove-voided-orders only ever deletes orders Square reports as voided, which are recent, so that is where the destructive risk lives. Completeness across all of history is check (a)'s job, not this one.

Do not sample this with (take n (rk/all-order-ids db)). all-order-ids streams :aevt, which is ascending entity id, so a take returns the oldest orders — on the restored copy the first 400,000 are all from 20192021, before any of the contention this gate looks for. It would report a confident zero having inspected none of the relevant data.


Step 5 — Resume the Square importer

Only once step 4's two checks read clean. The maintenance window ends here.

The first cycle after resuming is the one to watch. Compare these against the same counts taken immediately before the deploy — growth should be ordinary daily volume:

(count (d/datoms (d/db conn) :aevt :sales-refund/external-id))
(count (d/datoms (d/db conn) :aevt :expected-deposit/external-id))
(count (d/datoms (d/db conn) :aevt :cash-drawer-shift/external-id))
(count (d/datoms (d/db conn) :aevt :charge/external-id))

A near-doubling of any of them means records are being created rather than matched — stop and roll back the deploy. Charges are included deliberately: they are the one that doubles a client's takings rather than merely duplicating a row.


Step 6 — Recompute summaries, flags still off

(require '[auto-ap.jobs.sales-summaries :as ss])
(ss/refresh-sales-summaries 90)

This is the pass that banks the deduplication. Capture the result before going further — you will need it as the baseline for step 7, and it cannot be reconstructed afterwards:

(require '[auto-ap.tools.compare-sales-summaries :as cmp])   ; test/dev classpath
(def before (cmp/summaries-in (d/db conn) start end))
(spit "before.edn" (pr-str before))

Do not use d/as-of to compare summary amounts. :ledger-mapped/amount, ledger-side and account are :db/noHistory, so past values are discarded. A summary that has since been recomputed reads back through as-of with its amounts absent, which looks like a legitimate balanced day. Capture live, before and after, and diff the captures.


Step 7 — Turn the flag on, a few restaurants at a time

Needs accounting sign-off first: summary-service-charges posts to 49000 Service Income, chosen so the work could be measured. It affects reporting, never whether a day balances.

@(d/transact conn [{:db/id [:client/code "NGxx"]
                    :client/feature-flags ["summary-service-charges"]}])
(ss/refresh-sales-summaries 90)

Start with two or three restaurants, confirm, then widen.

Verify against the capture from step 6:

(def after (cmp/summaries-in (d/db conn) start end))
(cmp/compare-window ...)   ; both arguments live database values, never as-of

The two numbers that matter — both were zero across all 18,900 client-days in testing:

  • :balanced->unbalanced must be 0
  • previously-balanced days whose lines changed must be 0

If either is non-zero, retract the flag for the affected clients and re-run step 6. The flag is the rollback: removing it restores today's behaviour exactly.


Step 8 — Re-enable remove-voided-orders

Safe once step 4's gate reads zero. Keep the detach-rather-than-delete guard from step 1.


Step 9 — Remove the legacy key lookup

Schedule this; do not leave it open-ended. Both client records at a shared location stay active permanently, so the legacy fallback in square.core3/existing-id is the one code path that can ever reach across them. Deleting it is what turns the guarantee from conventional into structural.

Once plan reports :to-migrate 0 and has stayed there through several import cycles, drop the legacy branch of existing-id — and with it owned-by-other-client?, which exists only to make that branch safe while it lives. After this, two clients on one location are structurally incapable of resolving onto each other's records, and no ordering discipline is required to keep it that way.

Until it is done, the protection is the guard plus the maintenance window, both of which depend on people doing the right thing. That is the reason not to let this drift.


Step 10 — Deal with the refunds that have no sales behind them

The most important item in this document, and the only one that is not just execution.

156 of the 279 remaining days are a record carrying refunds on a day it recorded no sales at all. 132 of those fall before that client's first ever order. Nine records are affected, holding 659 refunds worth $15,225.24 dated before their own first order:

Client First order Refunds before it Value
NGDL 2026-07-29 96 $2,751.50
NGWN 2026-07-30 95 $2,218.61
NGDU 2026-08-02 94 $2,188.44
NG4S 2026-05-29 78 $2,168.30
NGPS 2026-05-26 81 $2,167.60
NGCT 2026-08-01 98 $1,789.49
NGVC 2026-08-02 95 $1,594.17
NGDS 2026-01-14 22 $347.13

They did not make those refunds. The database's own ownership history shows a $35.35 refund dated 26 February belonging to NGDG that day and taken over by NGDU on 12 August, with others flipping between the two several times a day across 1215 August. Unscoped refund keys meant whichever import ran last took ownership — fault 1, seen from the other end. Steps 1 and 4 stop it recurring; they do not undo it.

Note NG4S and NGPS are not among the ten shared locations, so this is wider than the duplicate records.

Two ways to close it, and the business has to pick:

  1. Import the missing sales. Correct if these records are meant to have their own books. Their refunds are real and the matching orders exist in Square.
  2. Move the refunds to the record that has the sales. Correct if the record is a duplicate that should never have had books of its own.

Before either, check whether the surviving record already holds the same Square refund — within the ninety-day window all 192 orphans did, but outside it payouts and shifts have no counterpart at all, so a blanket delete would destroy the only copy of some records.

;; per client: refunds dated before that client's own first order
(let [first-order (->> (d/q '[:find [?d ...] :in $ ?c
                              :where [?o :sales-order/client ?c] [?o :sales-order/date ?d]]
                            (d/db conn) [:client/code "NGDU"])
                       (reduce (fn [a b] (if (.before a b) a b))))]
  (->> (d/q '[:find [(pull ?r [:sales-refund/date :sales-refund/total]) ...] :in $ ?c
              :where [?r :sales-refund/client ?c]]
            (d/db conn) [:client/code "NGDU"])
       (filter #(.before (:sales-refund/date %) first-order))
       count))

Until this is resolved those days stay out of balance, on purpose. A summary change to close them was written and measured — it works, closes 156 days and $4,820.19, and breaks nothing — and it was removed, because an unbalanced day is the only visible signal that a restaurant's sales are not being imported. A test asserts the day stays unbalanced so nobody closes it without reading this.


What this will not fix

The 108 real trading days still out of balance, $1,995.36 — the NGBR/NGBK tender gap ($6,358.99 of tender against $6,059.57 of order totals on one day), the ezCater fee question, and unexplained clusters on NGMV and NGEB.

Plus 15 days / $974.99 where a processing fee lands on a day with no trading — the same shape as step 10 but from the payout side, so it needs the payout modelled rather than a rule in the summary.


Two operational findings, unrelated to the summaries

  • The production backup had not written a restore point since 2025-03-10 — about seventeen months — although data files were still uploading daily. Worth an alert on restore-point age.
  • The database server is sized for a much smaller dataset: a 2 GB cache against 27 GB of data. Worth checking what production is set to.