Add checks in missing places and fix typo in schema

Author: krokosik

prisma/schema.prisma

@@ -107,21 +107,21 @@ model Balance {
 }
 
 model Group {
-  id               Int            @id @default(autoincrement())
-  publicId         String         @unique
-  name             String
-  userId           Int
-  defaultCurrency  String         @default("USD")
-  createdAt        DateTime       @default(now())
-  updatedAt        DateTime       @updatedAt
-  splitwiseGroupId String?        @unique
-  simplifyDebts    Boolean        @default(false)
-  archivedAt       DateTime?
-  expenses         Expense[]
-  createdBy        User           @relation(fields: [userId], references: [id], onDelete: Cascade)
-  groupBalances    GroupBalance[]
-  groupUsers       GroupUser[]
-  groupBalanceView BalanceView[]
+  id                Int            @id @default(autoincrement())
+  publicId          String         @unique
+  name              String
+  userId            Int
+  defaultCurrency   String         @default("USD")
+  createdAt         DateTime       @default(now())
+  updatedAt         DateTime       @updatedAt
+  splitwiseGroupId  String?        @unique
+  simplifyDebts     Boolean        @default(false)
+  archivedAt        DateTime?
+  expenses          Expense[]
+  createdBy         User           @relation(fields: [userId], references: [id], onDelete: Cascade)
+  groupBalances     GroupBalance[]
+  groupUsers        GroupUser[]
+  groupBalanceViews BalanceView[]
 
   @@schema("public")
 }
@@ -285,9 +285,9 @@ view BalanceView {
   createdAt DateTime
   updatedAt DateTime
 
-  user      User   @relation("UserBalanceView", fields: [userId], references: [id], onDelete: Cascade)
-  friend    User   @relation("FriendBalanceView", fields: [friendId], references: [id], onDelete: Cascade)
-  group     Group? @relation(fields: [groupId], references: [id], onDelete: Cascade)
+  user   User   @relation("UserBalanceView", fields: [userId], references: [id], onDelete: Cascade)
+  friend User   @relation("FriendBalanceView", fields: [friendId], references: [id], onDelete: Cascade)
+  group  Group? @relation(fields: [groupId], references: [id], onDelete: Cascade)
 
   @@schema("public")
 }

src/components/Expense/BalanceList.tsx

@@ -85,8 +85,8 @@ export const BalanceList: React.FC<{
                     <span className="text-gray-400">
                       {' '}
                       {isCurrentUser
-                        ? t('ui.balance_list.are_settled_up')
-                        : t('ui.balance_list.is_settled_up')}
+                        ? t('expense_details.balance_list.are_settled_up')
+                        : t('expense_details.balance_list.is_settled_up')}
                     </span>
                   ) : (
                     <>

src/server/api/routers/expense.ts

@@ -28,6 +28,7 @@ export const expenseRouter = createTRPCRouter({
 
     const balances = balancesRaw
       .reduce<((typeof balancesRaw)[number] & { hasMore?: boolean })[]>((acc, current) => {
+        // @ts-ignore This will be resolved once we move away from balance tables
         const existing = acc.findIndex((item) => item.friendId === current.friendId);
         if (-1 === existing) {
           acc.push(current);
@@ -59,7 +60,12 @@ export const expenseRouter = createTRPCRouter({
       }
     }
 
-    return { balances, cumulatedBalances, youOwe, youGet };
+    return {
+      balances,
+      cumulatedBalances,
+      youOwe,
+      youGet,
+    };
   }),
 
   addOrEditExpense: protectedProcedure

src/server/api/routers/group.ts

@@ -6,7 +6,7 @@ import { simplifyDebts } from '~/lib/simplify';
 import { createTRPCRouter, groupProcedure, protectedProcedure } from '~/server/api/trpc';
 
 import { recalculateGroupBalances } from '../services/splitService';
-import { getGroupBalances } from '../services/balanceService';
+import { assertBalancesMatch, getGroupBalances } from '../services/balanceService';
 
 export const groupRouter = createTRPCRouter({
   create: protectedProcedure
@@ -66,6 +66,10 @@ export const groupRouter = createTRPCRouter({
               groupBalances: {
                 where: { userId: ctx.session.user.id },
               },
+              groupBalanceViews: {
+                where: { userId: ctx.session.user.id, NOT: { groupId: null } },
+              },
+              // We can sort by group balance view instead
               expenses: {
                 orderBy: {
                   createdAt: 'desc',
@@ -77,6 +81,12 @@ export const groupRouter = createTRPCRouter({
         },
       });
 
+      assertBalancesMatch(
+        groups.flatMap((g) => g.group.groupBalances),
+        groups.flatMap((g) => g.group.groupBalanceViews),
+        'getAllGroupsWithBalances',
+      );
+
       const sortedGroupsByLatestExpense = groups.sort((a, b) => {
         const aDate = a.group.expenses[0]?.createdAt ?? new Date(0);
         const bDate = b.group.expenses[0]?.createdAt ?? new Date(0);
@@ -134,9 +144,16 @@ export const groupRouter = createTRPCRouter({
           },
         },
         groupBalances: true,
+        groupBalanceViews: true,
       },
     });
 
+    assertBalancesMatch(
+      group?.groupBalances || [],
+      group?.groupBalanceViews || [],
+      'getGroupDetails',
+    );
+
     if (group?.simplifyDebts) {
       group.groupBalances = simplifyDebts(group.groupBalances);
     }
@@ -259,6 +276,7 @@ export const groupRouter = createTRPCRouter({
 
       const groupBalances = await getGroupBalances(input.groupId);
 
+      // @ts-ignore This will be resolved once we move away from balance tables
       const finalGroupBalances = group.simplifyDebts ? simplifyDebts(groupBalances) : groupBalances;
 
       if (finalGroupBalances.some((b) => b.userId === userId && 0n !== b.amount)) {
@@ -318,9 +336,16 @@ export const groupRouter = createTRPCRouter({
         },
         include: {
           groupBalances: true,
+          groupBalanceViews: true,
         },
       });
 
+      assertBalancesMatch(
+        group?.groupBalances || [],
+        group?.groupBalanceViews || [],
+        'toggleArchive',
+      );
+
       if (!group) {
         throw new TRPCError({ code: 'NOT_FOUND', message: 'Group not found' });
       }
@@ -380,9 +405,16 @@ export const groupRouter = createTRPCRouter({
         },
         include: {
           groupBalances: true,
+          groupBalanceViews: true,
         },
       });
 
+      assertBalancesMatch(
+        group?.groupBalances || [],
+        group?.groupBalanceViews || [],
+        'deleteGroup',
+      );
+
       if (group?.userId !== ctx.session.user.id) {
         throw new TRPCError({ code: 'UNAUTHORIZED', message: 'Only creator can delete the group' });
       }

src/server/api/routers/user.ts

@@ -110,18 +110,6 @@ export const userRouter = createTRPCRouter({
       return user;
     }),
 
-  // sendExpensePushNotification: protectedProcedure
-  //   .input(z.object({ expenseId: z.string() }))
-  //   .mutation(async ({ input }) => {
-  //     sendExpensePushNotification(input.expenseId).catch((err) => {
-  //       console.error('Error sending push notification', err);
-  //       throw new TRPCError({
-  //         code: 'INTERNAL_SERVER_ERROR',
-  //         message: 'Failed to send push notification',
-  //       });
-  //     });
-  //   }),
-
   getUserDetails: protectedProcedure
     .input(z.object({ userId: z.number() }))
     .query(async ({ input }) => {
@@ -154,6 +142,24 @@ export const userRouter = createTRPCRouter({
         },
       });
 
+      const viewFriend = await db.user.findUnique({
+        where: {
+          id: input.friendId,
+          userBalanceViews: {
+            some: {
+              friendId: ctx.session.user.id,
+            },
+          },
+        },
+      });
+
+      if (friend?.id !== viewFriend?.id) {
+        console.error(`[getFriend] Friend data mismatch for friendId ${input.friendId}:`, {
+          old: friend,
+          view: viewFriend,
+        });
+      }
+
       return friend;
     }),