Changeset 87c9f1e for src/app

Timestamp:

02/27/25 00:42:38 (2 months ago)

Author:

Naum Shapkarovski <naumshapkarovski@…>

Branches:

main

Children:

32e9876

Parents:

3c5302a

Message:

update the seed script. update the prisma schema, use mapping

Location:

src/app

Files:

• api/customers/route.ts (modified) (3 diffs)
• api/invoices/[id]/route.ts (modified) (1 diff)
• api/invoices/route.ts (modified) (2 diffs)
• api/invoices/totals/route.ts (modified) (2 diffs)
• api/user/route.ts (added)
• dashboard/customer/list/page.tsx (modified) (1 diff)
• dashboard/customer/new/page.tsx (modified) (1 diff)
• error.tsx (added)
• loading.tsx (modified) (1 diff)
• not-found.tsx (modified) (2 diffs)

src/app/api/customers/route.ts

@@ -3 +3 @@
 import prisma from 'src/lib/prisma';
 import { authenticateRequest } from 'src/lib/auth-middleware';
-import { CustomerStatus } from '@prisma/client';
-import { Prisma } from '@prisma/client';
+import { Prisma, ClientStatus } from '@prisma/client';
 
 export async function GET(request: NextRequest) {
@@ -25 +24 @@
     const validatedFilters = customerTableFiltersSchema.parse(filters);
 
-    // Replace Prisma query with raw SQL
-    const customers = await prisma.$queryRaw`
-      SELECT * FROM "Client"
-      WHERE "tenantId" = ${tenantId}
-        AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`})
-        ${
-          validatedFilters.status
-            ? Prisma.sql`AND status = ${validatedFilters.status}::"CustomerStatus"`
-            : Prisma.sql`AND TRUE`
-        }
-    `;
+    //   const customers = await prisma.$queryRaw`
+    //   SELECT * FROM "Client"
+    //   WHERE "tenant_id" = ${tenantId}
+    //     AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`})
+    //     ${
+    //       validatedFilters.status
+    //         ? Prisma.sql`AND status = ${validatedFilters.status}::"CustomerStatus"`
+    //         : Prisma.sql`AND TRUE`
+    //     }
+    // `;
+
+    const customers = await prisma.client.findMany({
+      where: {
+        tenantId,
+        name: {
+          contains: validatedFilters.name,
+          mode: 'insensitive',
+        },
+        ...(validatedFilters.status && {
+          status: validatedFilters.status as ClientStatus,
+        }),
+      },
+    });
 
     return NextResponse.json(customers);
@@ -60 +71 @@
       data: {
         ...validatedData,
-        // userId,
         tenantId,
       },

src/app/api/invoices/[id]/route.ts

@@ -100 +100 @@
         data: {
           invoiceNumber: validation.data.invoiceNumber,
-          createDate: validation.data.createDate,
+          issueDate: validation.data.issueDate,
           dueDate: validation.data.dueDate,
           status: validation.data.status,

src/app/api/invoices/route.ts

@@ -45 +45 @@
           ? { equals: validatedFilters.status as InvoiceStatus }
           : undefined,
-        createDate: {
+        issueDate: {
           ...(validatedFilters.startDate && { gte: validatedFilters.startDate }),
           ...(validatedFilters.endDate && { lte: validatedFilters.endDate }),
@@ -108 +108 @@
         quantityType: validatedData.quantityType,
         subTotal: validatedData.subTotal,
-        createDate: validatedData.createDate,
+        issueDate: validatedData.issueDate,
         month: validatedData.month,
         discount: validatedData.discount,

src/app/api/invoices/totals/route.ts

@@ -20 +20 @@
     const searchParams = request.nextUrl.searchParams;
     const startDate = searchParams.get('startDate')
-      ? new Date(searchParams.get('startDate')!)
+      ? new Date(searchParams.get('issueDate')!)
       : null;
 
@@ -32 +32 @@
         status,
         currency,
-        SUM("totalAmount") as total
+        SUM("total_amount") as total
       FROM "Invoice"
-      WHERE "createDate" >= ${startDate}
-        AND "invoiceFromId" = ${tenantId}
+      WHERE "issue_date" >= ${startDate}
+        AND "tenant_id" = ${tenantId}
       GROUP BY status, currency
     `;

src/app/dashboard/customer/list/page.tsx

@@ -1 +1 @@
 // sections
-import { CustomerListView } from 'src/sections/user/view';
+import { CustomerListView } from 'src/sections/client/view';
 
 // ----------------------------------------------------------------------

src/app/dashboard/customer/new/page.tsx

@@ -1 +1 @@
 // sections
-import { CustomerCreateView } from 'src/sections/user/view';
+import { CustomerCreateView } from 'src/sections/client/view';
 
 // ----------------------------------------------------------------------

src/app/loading.tsx

@@ -7 +7 @@
 
 export default function Loading() {
-  return <SplashScreen />;
+  return (
+    <div className="flex min-h-screen items-center justify-center">
+      <div className="animate-spin rounded-full h-32 w-32 border-t-2 border-b-2 border-blue-500"></div>
+    </div>
+  );
 }

src/app/not-found.tsx

@@ -1 +1 @@
 // sections
 import { NotFoundView } from 'src/sections/error';
+import Link from 'next/link';
 
 // ----------------------------------------------------------------------
@@ -8 +9 @@
 };
 
-export default function NotFoundPage() {
-  return <NotFoundView />;
+export default function NotFound() {
+  return (
+    <div className="flex min-h-screen flex-col items-center justify-center">
+      <h2 className="text-2xl font-bold mb-4">Page Not Found</h2>
+      <p className="mb-4">Could not find requested resource</p>
+      <Link href="/" className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600">
+        Return Home
+      </Link>
+    </div>
+  );
 }