refactor: two step persistence of onramp

apps/swap/prisma/client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "prisma-client-8249a439b47caffdc401079e727cadaab3d3608e2625a88d0e4834c1de075f21",
+  "name": "prisma-client-329939b91e664d538106e283479a0108be9d53a88e58de489d4dc5c579143dd3",
   "main": "index.js",
   "types": "index.d.ts",
   "browser": "index-browser.js",

apps/swap/prisma/client/schema.prisma

@@ -19,7 +19,7 @@ model MpesaOnrampSwap {
   /// Lightning invoice to pay.
   lightning         String
   /// References the fiat onramp collection ID
-  collectionTracker String               @unique
+  collectionTracker String?              @unique
   /// Fx Rate from 
   rate              String
   /// Amount in satoshi

apps/swap/prisma/migrations/20241106132127_optional_collection_tracker/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "MpesaOnrampSwap" ALTER COLUMN "collectionTracker" DROP NOT NULL;

apps/swap/prisma/schema.prisma

@@ -19,7 +19,7 @@ model MpesaOnrampSwap {
   /// Lightning invoice to pay.
   lightning String
   /// References the fiat onramp collection ID
-  collectionTracker   String @unique
+  collectionTracker   String? @unique
   /// Fx Rate from 
   rate      String
   /// Amount in satoshi

apps/swap/src/swap.service.spec.ts

@@ -208,7 +208,6 @@ describe('SwapService', () => {
       const swap = await swapService.createOnrampSwap(req);
 
       expect(swap).toBeDefined();
-      expect(swap.rate).toEqual(mock_rate.toString());
       expect(swap.status).toEqual(SwapStatus.PENDING);
     });
   });
@@ -271,61 +270,11 @@ describe('SwapService', () => {
       state: SwapTransactionState.PENDING,
     };
 
-    it.skip('creates a new swap tx if there was none recorded before', async () => {
-      (mockCacheManager.get as jest.Mock).mockImplementation(
-        (_key: string) => ({
-          lightning: 'lnbtcexampleinvoicee',
-          phone: '0700000000',
-          amount: '100',
-          rate: mock_rate.toString(),
-          ref: 'test-onramp-swap',
-          state: MpesaTransactionState.Pending,
-        }),
-      );
-
-      (
-        mockIntasendService.getMpesaTrackerFromCollectionUpdate as jest.Mock
-      ).mockImplementation(() => ({
-        id: '123456789',
-        state: MpesaTransactionState.Pending,
-      }));
-
-      (mockPrismaService.mpesaOnrampSwap.create as jest.Mock).mockResolvedValue(
-        swap,
-      );
-      (
-        mockPrismaService.mpesaOnrampSwap.findUniqueOrThrow as jest.Mock
-      ).mockImplementation(() => {
-        throw new Error('Not found');
-      });
-      (
-        mockPrismaService.mpesaOnrampSwap.update as jest.Mock
-      ).mockImplementation((u) => {
-        return {
-          ...swap,
-          state: u.data.state,
-        };
-      });
-
-      await swapService.processSwapUpdate({
-        ...req,
-        state: MpesaTransactionState.Processing,
-      });
-      expect(
-        mockIntasendService.getMpesaTrackerFromCollectionUpdate,
-      ).toHaveBeenCalled();
-      expect(
-        mockPrismaService.mpesaOnrampSwap.findUniqueOrThrow,
-      ).toHaveBeenCalled();
-      expect(mockPrismaService.mpesaOnrampSwap.create).toHaveBeenCalled();
-      expect(mockPrismaService.mpesaOnrampSwap.update).toHaveBeenCalled();
-    });
-
     it('should update swap tx from PENDING to PROCESSING', async () => {
       (
         mockIntasendService.getMpesaTrackerFromCollectionUpdate as jest.Mock
       ).mockImplementation(() => ({
-        id: '123456789',
+        id: 'MPSA56789',
         state: MpesaTransactionState.Processing,
       }));
 

apps/swap/src/swap.service.ts

@@ -141,32 +141,38 @@ export class SwapService {
       to: Currency.BTC,
     });
 
-    const { id, state } = await this.intasendService.sendMpesaStkPush({
-      amount: Number(amountFiat),
-      phone_number: source.origin.phone,
-      api_ref: ref,
-    });
-
     const { amountSats } = fiatToBtc({
       amountFiat: Number(amountFiat),
       btcToFiatRate: Number(rate),
     });
 
     const swap = await this.prismaService.mpesaOnrampSwap.create({
       data: {
-        id,
         reference: ref,
-        collectionTracker: id,
-        state: mapMpesaTxStateToSwapTxState(state),
+        state: SwapTransactionState.PENDING,
         lightning: target.payout.invoice,
         amountSats: amountSats.toFixed(2),
         retryCount: 0,
         rate,
       },
     });
 
+    const mpesa = await this.intasendService.sendMpesaStkPush({
+      amount: Number(amountFiat),
+      phone_number: source.origin.phone,
+      api_ref: ref,
+    });
+
+    const updatedSwap = await this.prismaService.mpesaOnrampSwap.update({
+      where: { id: swap.id },
+      data: {
+        collectionTracker: mpesa.id,
+        state: mapMpesaTxStateToSwapTxState(mpesa.state),
+      },
+    });
+
     return {
-      ...swap,
+      ...updatedSwap,
       status: mapSwapTxStateToSwapStatus(swap.state),
       createdAt: swap.createdAt.toDateString(),
       updatedAt: swap.updatedAt.toDateString(),
@@ -333,7 +339,6 @@ export class SwapService {
 
     const swap = await this.prismaService.mpesaOnrampSwap.findUniqueOrThrow({
       where: {
-        id: update.invoice_id,
         collectionTracker: update.invoice_id,
       },
     });