Conflict

midday-ai · Nov 13, 2023 · ab4a643 · ab4a643
1 parent 67fd53c
commit ab4a643
Show file tree

Hide file tree

Showing 5 changed files with 320 additions and 316 deletions.
diff --git a/apps/dashboard/src/components/charts/realtime.tsx b/apps/dashboard/src/components/charts/realtime.tsx
@@ -24,7 +24,7 @@ export function Realtime({ teamId }) {
             `spending-${teamId}`,
             `metrics-${teamId}`,
           ]);
-        },
+        }
       )
       .subscribe();
 

diff --git a/apps/dashboard/src/components/modals/export-transactions-modal.tsx b/apps/dashboard/src/components/modals/export-transactions-modal.tsx
@@ -17,7 +17,7 @@ export function ExportTransactionsModal({ isOpen, setOpen }) {
             <DialogTitle>Export</DialogTitle>
             <DialogDescription>
               Heads up, we’ve noticed that 12 of your transactions are missing
-              receipts. Click show more and we’ll filter them for you.
+              receipts. Click “show more” and we’ll filter them for you.
             </DialogDescription>
           </DialogHeader>
         </div>

diff --git a/apps/dashboard/src/jobs/transactions.ts b/apps/dashboard/src/jobs/transactions.ts
@@ -33,7 +33,7 @@ const transformTransactions = (transactions, { teamId, accountId }) =>
     name: capitalCase(data.additionalInformation),
     original: data.additionalInformation,
     method: mapTransactionMethod(data.proprietaryBankTransactionCode),
-    provider_transaction_id: data.internalTransactionId,
+    internal_id: data.internalTransactionId,
     amount: data.transactionAmount.amount,
     currency: data.transactionAmount.currency,
     bank_account_id: accountId,
@@ -100,7 +100,6 @@ client.defineJob({
       .single();
 
     if (!data) {
-      // TODO: Remove schedule
       await io.logger.error(`Bank account not found: ${ctx.source.id}`);
       await dynamicSchedule.unregister(ctx.source.id);
     }
@@ -121,7 +120,7 @@ client.defineJob({
           teamId: data?.team_id,
         }),
         {
-          onConflict: "provider_transaction_id",
+          onConflict: "internal_id",
           ignoreDuplicates: true,
         },
       );

diff --git a/packages/supabase/src/queries/index.ts b/packages/supabase/src/queries/index.ts
@@ -305,6 +305,7 @@ export async function getTransaction(supabase: Client, id: string) {
     `)
     .eq("id", id)
     .single()
+
     .throwOnError();
 }