Changeset 87c9f1e for src/app/api

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/api

Files:

• customers/route.ts (modified) (3 diffs)
• invoices/[id]/route.ts (modified) (1 diff)
• invoices/route.ts (modified) (2 diffs)
• invoices/totals/route.ts (modified) (2 diffs)
• user/route.ts (added)

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
     `;