fix: preserve transfer-staging rows across periodic truncate

TheLastCicada · TheLastCicada · commit 88ce36341399 · 2026-04-23T12:55:25.000-07:00
The periodic truncateStagingV2 task in src/tasks/sync-registries-v2.js
destroys any row with committed: true, which races with project transfers
(ProjectV2.transfer stages committed: true + is_transfer: true). The
is_transfer row must survive until OfferV2.generateOfferFile reads it, or
until the offer flow explicitly clears it. The race caused the
project-v2 integration test "should transfer a project successfully" to
flake on CI.

Exclude is_transfer rows from the periodic truncate in both v2 and the
v1 simulator branch. To avoid a permanent-row-leak regression (once the
truncate no longer cleans up), make OfferV2.cancelActiveOffer destroy
the is_transfer staging row in parallel with the activeOfferTradeId
meta row, mirroring the existing v1 offer.controller.cancelActiveOffer
contract.

Adds a regression test that exercises the new cleanup contract
end-to-end on DELETE /v2/offer.
diff --git a/src/models/v2/offer-v2.model.js b/src/models/v2/offer-v2.model.js
@@ -431,12 +431,16 @@ class OfferV2 {
       const tradeId = tradeIdRecord.meta_value;
       await datalayerPersistance.cancelOffer(tradeId);
 
-      // Remove trade ID from MetaV2
-      await MetaV2.destroy({
-        where: {
-          meta_key: 'activeOfferTradeId',
-        },
-      });
+      // Clear the active offer trade ID and the transfer-staging marker in
+      // parallel, mirroring the v1 offer.controller.cancelActiveOffer flow.
+      // The transfer-staging row (committed: true, is_transfer: true) is
+      // preserved by the periodic sync-registries-v2 truncate on purpose so
+      // that GET /v2/offer can read it between transfer-stage and offer
+      // consumption; it must be cleaned up here when the offer is cancelled.
+      await Promise.all([
+        MetaV2.destroy({ where: { meta_key: 'activeOfferTradeId' } }),
+        StagingV2.destroy({ where: { is_transfer: true } }),
+      ]);
     } catch (error) {
       loggerV2.error('[v2]: Error canceling active offer:', error);
       throw new Error(error.message);
diff --git a/src/tasks/sync-registries-v2.js b/src/tasks/sync-registries-v2.js
@@ -97,11 +97,17 @@ const truncateStagingV2 = async () => {
 
   while (!success && attempts < maxAttempts) {
     try {
-      // Only delete records that have been marked as committed
-      // This prevents deleting newly staged records that haven't been committed yet
+      // Only delete records that have been marked as committed.
+      // This prevents deleting newly staged records that haven't been committed yet.
+      // Exclude is_transfer records: project transfers are staged with
+      // committed: true + is_transfer: true and must persist until the offer
+      // flow consumes them (see staging-v2.model generateOfferFile and the
+      // offer controller). They are cleaned up explicitly by the offer flow,
+      // not by this periodic task.
       await StagingV2.destroy({
         where: {
           committed: true,
+          is_transfer: false,
         },
       });
       success = true; // If destroy succeeds, set success to true to exit the loop
diff --git a/src/tasks/sync-registries.js b/src/tasks/sync-registries.js
@@ -215,7 +215,20 @@ const truncateStaging = async () => {
   while (!success && attempts < maxAttempts) {
     try {
       if (CONFIG.USE_SIMULATOR) {
-        await Staging.destroy({ where: { commited: true } });
+        // Simulator-mode cleanup: delete only committed non-transfer
+        // records. Project transfers are staged with commited: true +
+        // isTransfer: true and must persist until the offer flow consumes
+        // them (see Staging.generateOfferFile and
+        // offer.controller.cancelActiveOffer, which destroys the
+        // isTransfer row on cancel). Excluding them here matches the
+        // existing v1 cancelActiveOffer contract.
+        //
+        // The non-simulator branch below still calls truncate()
+        // unconditionally; that pre-existing race on the v1 transfer
+        // flow is out of scope for this change.
+        await Staging.destroy({
+          where: { commited: true, isTransfer: false },
+        });
       } else {
         await Staging.truncate();
       }
diff --git a/tests/v2/integration/offer-v2.spec.js b/tests/v2/integration/offer-v2.spec.js
@@ -380,6 +380,44 @@ describe('Phase 18.4: OfferV2 Integration Tests', function () {
           }
         });
     });
+
+    it('should remove activeOfferTradeId meta and is_transfer staging row on successful cancel', async function () {
+      // Regression guard: cancelActiveOffer must clear both MetaV2.activeOfferTradeId
+      // and the is_transfer staging marker, since the periodic truncateStagingV2
+      // task deliberately preserves is_transfer rows (see src/tasks/sync-registries-v2.js).
+      await MetaV2.destroy({ where: {} });
+      await resetV2StagingTable();
+
+      await MetaV2.create({
+        meta_key: 'activeOfferTradeId',
+        meta_value: 'test-trade-id-cleanup',
+      });
+
+      await StagingV2.create({
+        uuid: testProject.cadTrustProjectId,
+        table: 'project',
+        action: 'UPDATE',
+        data: JSON.stringify([
+          { cad_trust_project_id: testProject.cadTrustProjectId },
+        ]),
+        committed: true,
+        failed_commit: false,
+        is_transfer: true,
+      });
+
+      const response = await supertest(app).delete('/v2/offer').expect(200);
+      expect(response.body).to.have.property('success', true);
+
+      const remainingTradeIdMeta = await MetaV2.findOne({
+        where: { meta_key: 'activeOfferTradeId' },
+      });
+      expect(remainingTradeIdMeta, 'activeOfferTradeId meta should be cleared').to.be.null;
+
+      const remainingTransferRows = await StagingV2.count({
+        where: { is_transfer: true },
+      });
+      expect(remainingTransferRows, 'is_transfer staging row should be cleared').to.equal(0);
+    });
   });
 
   describe('POST /v2/offer/accept/commit - Commit imported offer', function () {
