v2.7.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vaultz",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",
@@ -32,7 +32,7 @@
     "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-tabs": "^1.1.13",
     "@radix-ui/react-tooltip": "^1.2.8",
-    "@tanstack/react-query": "^5.97.0",
+    "@tanstack/react-query": "^5.99.0",
     "@tanstack/react-table": "^8.21.3",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@uploadthing/react": "^7.3.3",
@@ -41,15 +41,15 @@
     "cmdk": "^1.1.1",
     "fast-fuzzy": "^1.12.0",
     "lucide-react": "^1.8.0",
-    "next": "16.2.3",
+    "next": "16.2.7",
     "next-themes": "^0.4.6",
     "nuqs": "^2.8.9",
     "pg": "^8.20.0",
-    "prettier": "^3.8.2",
+    "prettier": "^3.8.3",
     "prettier-plugin-tailwindcss": "^0.7.2",
-    "react": "19.2.5",
+    "react": "19.2.6",
     "react-day-picker": "^9.14.0",
-    "react-dom": "19.2.5",
+    "react-dom": "19.2.6",
     "react-hook-form": "^7.72.1",
     "recharts": "^3.5.1",
     "sonner": "^2.0.7",
@@ -67,11 +67,11 @@
     "@types/react-dom": "^19",
     "cli-progress": "^3.12.0",
     "eslint": "^9",
-    "eslint-config-next": "16.2.3",
-    "prisma": "^7.7.0",
+    "eslint-config-next": "16.2.6",
+    "prisma": "^7.8.0",
     "tailwindcss": "^4",
-    "tsx": "^4.21.0",
+    "tsx": "^4.22.0",
     "tw-animate-css": "^1.4.0",
-    "typescript": "6.0.2"
+    "typescript": "6.0.3"
   }
 }

prisma/migrations/20260603012618_add_soft_delete_purchase_allocation/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Allocation" ADD COLUMN     "deletedAt" TIMESTAMP(3);
+
+-- AlterTable
+ALTER TABLE "Purchase" ADD COLUMN     "deletedAt" TIMESTAMP(3);

prisma/schema.prisma

@@ -103,6 +103,7 @@ model Purchase {
     excludeFromTotal     Boolean  @default(false)
     expenseReportCreated Boolean  @default(false)
     reimbursed           Boolean  @default(false)
+    deletedAt            DateTime?
 
     categoryId   String
     category     Category        @relation(fields: [categoryId], references: [id])
@@ -185,9 +186,10 @@ model AllocationGroup {
 }
 
 model Allocation {
-    id     String  @id @default(uuid())
-    name   String
-    amount Decimal
+    id        String    @id @default(uuid())
+    name      String
+    amount    Decimal
+    deletedAt DateTime?
 
     designationId     String
     designation       Designation      @relation(fields: [designationId], references: [id])

prisma/services/allocation-groups.ts

@@ -21,13 +21,17 @@ export async function getAllAllocationGroups(
       where: designationId ? { designationId } : undefined,
       include: {
         allocations: {
-          where: periodId
-            ? { periodId }
-            : yearId
-              ? { period: { yearId } }
-              : undefined,
+          where: {
+            deletedAt: null,
+            ...(periodId
+              ? { periodId }
+              : yearId
+                ? { period: { yearId } }
+                : undefined),
+          },
           include: {
             purchases: {
+              where: { deletedAt: null },
               orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
               include: {
                 user: true,
@@ -62,6 +66,7 @@ export async function getAllocationGroup({
       allocations: {
         include: {
           purchases: {
+            where: { deletedAt: null },
             orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
             include: { user: true, process: { select: { templateId: true } } },
           },
@@ -99,9 +104,10 @@ export async function getAllocationGroupWithStats({
     include: {
       designation: true,
       allocations: {
-        where: periodId ? { periodId } : undefined,
+        where: periodId ? { periodId, deletedAt: null } : { deletedAt: null },
         include: {
           purchases: {
+            where: { deletedAt: null },
             orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
             include: { user: true, process: { select: { templateId: true } } },
           },

prisma/services/allocation.ts

@@ -57,6 +57,7 @@ export async function getAllocationById({
     where: { id },
     include: {
       purchases: {
+        where: { deletedAt: null },
         orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
         include: { user: true, process: { select: { templateId: true } } },
       },
@@ -83,12 +84,14 @@ export async function getMiscAllocations(
   const allocations = await prisma.allocation.findMany({
     where: {
       allocationGroupId: null,
+      deletedAt: null,
       ...(designationId && { designationId }),
       ...(periodId && { periodId }),
       ...(yearId && { period: { yearId } }),
     },
     include: {
       purchases: {
+        where: { deletedAt: null },
         orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
         include: { user: true, process: { select: { templateId: true } } },
       },
@@ -130,7 +133,7 @@ export async function deleteAllocation(
 ): Promise<ResponseType<void>> {
   const allocation = await prisma.allocation.findUnique({
     where: { id },
-    include: { purchases: { take: 1 } },
+    include: { purchases: { where: { deletedAt: null }, take: 1 } },
   });
 
   if (!allocation) return { error: 'Allocation not found.' };
@@ -141,7 +144,10 @@ export async function deleteAllocation(
         'Cannot delete an allocation that has purchases. Remove all purchases first.',
     };
 
-  await prisma.allocation.delete({ where: { id } });
+  await prisma.allocation.update({
+    where: { id },
+    data: { deletedAt: new Date() },
+  });
 
   revalidatePath('/allocation-groups');
 }
@@ -158,7 +164,7 @@ export async function copyAllocationsFromPeriod({
   includeCarryover: boolean;
 }): Promise<ResponseType<{ count: number }>> {
   const sourceAllocations = await prisma.allocation.findMany({
-    where: { periodId: fromPeriodId },
+    where: { periodId: fromPeriodId, deletedAt: null },
     include: { purchases: { where: { excludeFromTotal: false } } },
   });
 

prisma/services/dashboard.ts

@@ -17,7 +17,12 @@ export async function getDashboardStatsByDesignation(
       select: { amount: true },
     }),
     prisma.purchase.findMany({
-      where: { category: { designationId }, yearId, excludeFromTotal: false },
+      where: {
+        category: { designationId },
+        yearId,
+        excludeFromTotal: false,
+        deletedAt: null,
+      },
       select: { amount: true },
     }),
   ]);
@@ -42,7 +47,12 @@ export async function getPurchasesByMonthForDesignation(
   yearId: string,
 ) {
   const purchases = await prisma.purchase.findMany({
-    where: { category: { designationId }, yearId, excludeFromTotal: false },
+    where: {
+      category: { designationId },
+      yearId,
+      excludeFromTotal: false,
+      deletedAt: null,
+    },
     select: { amount: true, purchasedAt: true },
     orderBy: [{ purchasedAt: 'asc' }, { createdAt: 'asc' }],
   });
@@ -90,7 +100,7 @@ export async function getSpendingByCategoryForDesignation(
         select: { amount: true },
       },
       purchases: {
-        where: { yearId, excludeFromTotal: false },
+        where: { yearId, excludeFromTotal: false, deletedAt: null },
         select: { amount: true },
       },
       transfersFrom: {

prisma/services/designation.ts

@@ -25,6 +25,7 @@ export async function getAllDesignations(): Promise<
         categories: {
           select: {
             purchases: {
+              where: { deletedAt: null },
               orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
               include: {
                 user: true,
@@ -76,6 +77,7 @@ export async function getDesignation({
       categories: {
         select: {
           purchases: {
+            where: { deletedAt: null },
             orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
             include: { user: true, process: { select: { templateId: true } } },
           },

prisma/services/purchase.ts

@@ -13,6 +13,7 @@ export async function getLatestPurchases(
 ): Promise<PurchaseWithUser[]> {
   const purchases = await prisma.purchase.findMany({
     take: limit,
+    where: { deletedAt: null },
     orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
     include: { user: true, process: { select: { templateId: true } } },
   });
@@ -31,7 +32,11 @@ export async function getPurchasesByDesignation({
   yearId: string;
 }): Promise<PurchaseWithUser[]> {
   const purchases = await prisma.purchase.findMany({
-    where: { yearId, category: { designationId, deletedAt: null } },
+    where: {
+      yearId,
+      deletedAt: null,
+      category: { designationId, deletedAt: null },
+    },
     orderBy: [{ purchasedAt: 'desc' }, { createdAt: 'desc' }],
     include: { user: true, process: { select: { templateId: true } } },
   });
@@ -214,7 +219,10 @@ export async function updatePurchase({
 export async function deletePurchase(
   id: string,
 ): Promise<ResponseType<Purchase>> {
-  const purchase = await prisma.purchase.delete({ where: { id } });
+  const purchase = await prisma.purchase.update({
+    where: { id },
+    data: { deletedAt: new Date() },
+  });
 
   revalidatePath('/');
   revalidatePath('/designation');
@@ -226,7 +234,7 @@ export async function getPurchaseProcess(
   purchaseId: string,
 ): Promise<PurchaseProcessData | null> {
   const purchase = await prisma.purchase.findUnique({
-    where: { id: purchaseId },
+    where: { id: purchaseId, deletedAt: null },
     include: {
       process: {
         include: {
@@ -322,7 +330,7 @@ export async function getBatchPurchaseProcessData(
   if (purchaseIds.length === 0) return {};
 
   const purchases = await prisma.purchase.findMany({
-    where: { id: { in: purchaseIds } },
+    where: { id: { in: purchaseIds }, deletedAt: null },
     select: {
       id: true,
       process: {

prisma/services/year-comparison.ts

@@ -53,7 +53,11 @@ export async function getYearComparisonData({
           select: { yearId: true, amount: true },
         },
         purchases: {
-          where: { excludeFromTotal: false, yearId: { in: yearIds } },
+          where: {
+            excludeFromTotal: false,
+            yearId: { in: yearIds },
+            deletedAt: null,
+          },
           select: { amount: true, yearId: true },
         },
         transfersTo: {