Changeset 299af01 for src/app

Timestamp:

02/26/25 14:27:26 (2 months ago)

Author:

Naum Shapkarovski <naumshapkarovski@…>

Branches:

main

Children:

3c5302a

Parents:

057453c

Message:

chore

Location:

src/app/api

Files:

• customers/[id]/route.ts (modified) (2 diffs)
• customers/route.ts (modified) (5 diffs)
• employees/route.ts (modified) (2 diffs)
• invoices/[id]/route.ts (modified) (2 diffs)
• invoices/route.ts (modified) (2 diffs)
• invoices/totals/route.ts (added)
• tenant/route.ts (modified) (3 diffs)

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

@@ -6 +6 @@
 export async function PATCH(request: NextRequest, { params }: { params: { id: string } }) {
   try {
-    const userId = await authenticateRequest(request);
-    if (!userId) {
+    const auth = await authenticateRequest(request);
+    if (!auth || auth instanceof NextResponse) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
+    const { userId, tenantId } = auth;
+
     const body = await request.json();
     const validatedData = customerSchema.partial().parse(body);
+
+    console.log('validatedData', validatedData);
 
     const customer = await prisma.client.update({
@@ -18 +22 @@
       data: {
         ...validatedData,
-        bankAccounts: undefined,
+        tenantId,
       },
     });

src/app/api/customers/route.ts

@@ -4 +4 @@
 import { authenticateRequest } from 'src/lib/auth-middleware';
 import { CustomerStatus } from '@prisma/client';
+import { Prisma } from '@prisma/client';
 
 export async function GET(request: NextRequest) {
@@ -12 +13 @@
       return authResult;
     }
-    const { userId } = authResult;
+    const { userId, tenantId } = authResult;
 
     const searchParams = request.nextUrl.searchParams;
@@ -24 +25 @@
     const validatedFilters = customerTableFiltersSchema.parse(filters);
 
-    const customers = await prisma.client.findMany({
-      where: {
-        name: { contains: validatedFilters.name, mode: 'insensitive' },
-        status: validatedFilters.status
-          ? { equals: validatedFilters.status as CustomerStatus }
-          : undefined,
-      },
-    });
-    console.log('customers', customers);
+    // 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`
+        }
+    `;
 
     return NextResponse.json(customers);
   } catch (error) {
+    console.error('Error fetching customers:', error);
     return NextResponse.json({ error: 'Internal Server Error' }, { status: 500 });
   }
@@ -47 +51 @@
       return authResult;
     }
-    const { userId } = authResult;
+    const { userId, tenantId } = authResult;
 
     const body = await request.json();
@@ -57 +61 @@
         ...validatedData,
         // userId,
+        tenantId,
       },
     });

src/app/api/employees/route.ts

@@ -3 +3 @@
 import prisma from 'src/lib/prisma';
 import { authenticateRequest } from 'src/lib/auth-middleware';
-import { EmployeeStatus } from '@prisma/client';
+import { Prisma } from '@prisma/client';
 
 export async function GET(request: NextRequest) {
@@ -23 +23 @@
     const validatedFilters = employeeTableFiltersSchema.parse(filters);
 
-    const employees = await prisma.employee.findMany({
-      where: {
-        tenantId,
-        name: { contains: validatedFilters.name, mode: 'insensitive' },
-        status: validatedFilters.status
-          ? { equals: validatedFilters.status as EmployeeStatus }
-          : undefined,
-      },
-    });
+    // Replace Prisma query with raw SQL
+    const employees = await prisma.$queryRaw`
+      SELECT * FROM "Employee"
+      WHERE "tenantId" = ${tenantId}
+        AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`})
+        ${
+          validatedFilters.status
+            ? Prisma.sql`AND status = ${validatedFilters.status}:::"EmployeeStatus"`
+            : Prisma.sql`AND TRUE`
+        }
+    `;
 
     return NextResponse.json(employees);

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

@@ -90 +90 @@
       // Conditionally delete and recreate items only if they are provided
       if (validation.data.items) {
-        await tx.invoiceItem.deleteMany({
+        await tx.lineItem.deleteMany({
           where: { invoiceId: params.id },
         });
@@ -174 +174 @@
     await prisma.$transaction(async (tx) => {
       // Delete related items first
-      await tx.invoiceItem.deleteMany({
+      await tx.lineItem.deleteMany({
         where: { invoiceId: params.id },
       });

src/app/api/invoices/route.ts

@@ -24 +24 @@
   try {
     const userId = await getUserId(request);
-    if (!userId) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-    }
+    // if (!userId) {
+    //   return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+    // }
 
     const searchParams = request.nextUrl.searchParams;
@@ -74 +74 @@
   try {
     const userId = await getUserId(request);
-    if (!userId) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-    }
+    // if (!userId) {
+    //   return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+    // }
 
     const body = await request.json();

src/app/api/tenant/route.ts

@@ -1 @@
-import { NextResponse } from 'next/server';
+import { NextRequest, NextResponse } from 'next/server';
 import prisma from 'src/lib/prisma';
 import { tenantSchema } from 'src/schemas';
 import { z } from 'zod';
+import { authenticateRequest } from 'src/lib/auth-middleware';
 
-export async function GET() {
+export async function GET(request: NextRequest) {
   try {
-    const tenants = await prisma.tenant.findMany();
-    const tenant = tenants[0]; // Get first tenant since we're dealing with single tenant
-    console.log('tenant', tenant);
+    const auth = await authenticateRequest(request);
+    if (auth instanceof NextResponse) {
+      return auth; // Return error response if authentication failed
+    }
+    const { tenantId } = auth;
+
+    const tenant = await prisma.tenant.findUnique({
+      where: { id: tenantId },
+    });
+
     if (!tenant) {
       return NextResponse.json({ error: 'No tenant found' }, { status: 404 });
@@ -20 +28 @@
 }
 
-export async function POST(request: Request) {
+export async function POST(request: NextRequest) {
   try {
+    const auth = await authenticateRequest(request);
+    if (auth instanceof NextResponse) {
+      return auth;
+    }
+    const { tenantId } = auth;
+
     const body = await request.json();
 
@@ -28 +42 @@
 
     // Check if tenant already exists
-    const existingTenants = await prisma.tenant.findMany();
-    if (existingTenants.length > 0) {
+    const existingTenant = await prisma.tenant.findUnique({
+      where: {
+        id: tenantId,
+      },
+    });
+
+    if (existingTenant) {
       return NextResponse.json({ error: 'Tenant already exists' }, { status: 400 });
     }
 
-    // Create new tenant
+    // Create new tenant with the authenticated tenantId
     const tenant = await prisma.tenant.create({
-      data: validatedData,
+      data: {
+        ...validatedData,
+        id: tenantId, // Ensure the tenant is created with the authenticated tenantId
+      },
     });