Fix query

apps/dashboard/src/actions/connect-bank-account-action.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import { getTransactions, transformTransactions } from "@midday/gocardless";
-import { Events, scheduler } from "@midday/jobs";
+import { scheduler } from "@midday/jobs";
 import { getUser } from "@midday/supabase/cached-queries";
 import { createBankAccounts } from "@midday/supabase/mutations";
 import { createClient } from "@midday/supabase/server";
@@ -18,7 +18,7 @@ export const connectBankAccountAction = action(
 
     const { data } = await createBankAccounts(supabase, accounts);
 
-    const promisses = data?.map(async (account) => {
+    const promises = data?.map(async (account) => {
       // Fetch transactions for each account
       const { transactions } = await getTransactions(account.account_id);
 
@@ -31,15 +31,12 @@ export const connectBankAccountAction = action(
         .eq("id", account.id);
 
       // Create transactions
-      await supabase
-        .from("transactions")
-        .insert(
-          transformTransactions(transactions?.booked, {
-            accountId: account.id, // Bank account row id
-            teamId,
-          })
-        )
-        .select();
+      await supabase.from("transactions").insert(
+        transformTransactions(transactions?.booked, {
+          accountId: account.id, // Bank account row id
+          teamId,
+        })
+      );
 
       // Schedule sync for each account
       await scheduler.register(account.id, {
@@ -52,7 +49,7 @@ export const connectBankAccountAction = action(
       return;
     });
 
-    await Promise.all(promisses);
+    await Promise.all(promises);
 
     revalidateTag(`bank_connections_${teamId}`);
     revalidateTag(`transactions_${teamId}`);

packages/gocardless/src/index.ts

@@ -320,7 +320,6 @@ export const transformTransactions = (transactions, { teamId, accountId }) => {
     return {
       transaction_id: data.transactionId,
       reference: data.entryReference,
-      booking_date: data.bookingDate,
       date: data.valueDate,
       name: capitalCase(data.additionalInformation),
       original: data.additionalInformation,

packages/supabase/src/queries/cached-queries.ts

@@ -201,7 +201,7 @@ export const getTeams = async () => {
     ["teams", userId],
     {
       tags: [`teams_${userId}`],
-      revalidate: 10,
+      revalidate: 180,
     }
   )();
 };

packages/supabase/src/queries/index.ts

@@ -135,8 +135,7 @@ export async function getSpendingQuery(
       `
       currency,
       category,
-      amount,
-      enrichment:enrichment_id(category)
+      amount
     `
     )
     .order("order", { ascending: false })
@@ -157,9 +156,9 @@ export async function getSpendingQuery(
   const combinedValues = {};
 
   for (const item of data) {
-    const { category, amount, currency, enrichment } = item;
+    const { category, amount, currency } = item;
 
-    const key = category || enrichment?.category || "uncategorized";
+    const key = category || "uncategorized";
 
     if (combinedValues[key]) {
       combinedValues[key].amount += amount;
@@ -175,11 +174,9 @@ export async function getSpendingQuery(
       currency: data?.at(0)?.currency,
     },
     data: Object.entries(combinedValues)
-      .map(([category, { amount, currency, enrichment }]) => {
+      .map(([category, { amount, currency }]) => {
         return {
-          category: !category
-            ? "uncategorized"
-            : category || enrichment?.category,
+          category: category || "uncategorized",
           currency,
           amount: +Math.abs(amount).toFixed(2),
         };
@@ -229,7 +226,6 @@ export async function getTransactionsQuery(
       `
       *,
       assigned:assigned_id(*),
-      enrichment:transaction_enrichments(category),
       attachments(*)
     `,
       { count: "exact" }
@@ -272,22 +268,20 @@ export async function getTransactionsQuery(
       `
       *,
       assigned:assigned_id(*),
-      enrichment:transaction_enrichments!inner(category),
       attachments(*)
     `
     );
 
     const matchCategory = categories
-      .map((category) => `category.eq.${category}`)
+      .map((category) => {
+        if (category === "uncategorized") {
+          return "category.is.null";
+        }
+        return `category.eq.${category}`;
+      })
       .join(",");
 
-    query
-      // .or(matchCategory)
-      .or(matchCategory, { referencedTable: "enrichment" });
-  }
-
-  if (categories?.includes("uncategorized")) {
-    query.not("category", "is", null);
+    query.or(matchCategory);
   }
 
   if (type === "expense") {
@@ -296,8 +290,7 @@ export async function getTransactionsQuery(
   }
 
   if (type === "income") {
-    query.gt("amount", 0);
-    query.neq("category", "transfer");
+    query.eq("category", "income");
   }
 
   const { data, count } = await query.range(from, to).throwOnError();
@@ -327,10 +320,7 @@ export async function getTransactionsQuery(
     },
     data: data?.map((transaction) => ({
       ...transaction,
-      category:
-        transaction?.category ||
-        transaction?.enrichment?.category ||
-        "uncategorized",
+      category: transaction?.category || "uncategorized",
     })),
   };
 }
@@ -342,7 +332,6 @@ export async function getTransactionQuery(supabase: Client, id: string) {
       `
       *,
       assigned:assigned_id(*),
-      enrichment:enrichment_id(category),
       attachments(*)
     `
     )
@@ -352,7 +341,7 @@ export async function getTransactionQuery(supabase: Client, id: string) {
 
   return {
     ...data,
-    category: data?.category || data?.enrichment?.category || "uncategorized",
+    category: data?.category || "uncategorized",
   };
 }
 
@@ -409,7 +398,7 @@ export async function getMetricsQuery(
     .neq("category", "transfer");
 
   if (type === "income") {
-    query.gt("amount", 0);
+    query.eq("category", "income");
   }
 
   const { data } = await query.throwOnError();