From 09253a494cde7e498f6078e30ae1e23d81a6b748 Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 21 Oct 2024 17:41:19 +0800 Subject: [PATCH] fix: divisi Deskripsi; - kondisi active divisi pada beberapa api No Issues --- src/app/api/group/get-division/route.ts | 8 ++++++-- src/app/api/home/route.ts | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/api/group/get-division/route.ts b/src/app/api/group/get-division/route.ts index ec52351..c11a98b 100644 --- a/src/app/api/group/get-division/route.ts +++ b/src/app/api/group/get-division/route.ts @@ -1,9 +1,10 @@ import { prisma } from "@/module/_global"; import { funGetUserByCookies } from "@/module/auth"; import { NextResponse } from "next/server"; - export const dynamic = 'force-dynamic' export const revalidate = true + + export async function GET(request: Request) { try { const user = await funGetUserByCookies() @@ -32,6 +33,9 @@ export async function GET(request: Request) { id: true, name: true, Division: { + where: { + isActive: true + }, select: { id: true, name: true @@ -44,6 +48,6 @@ export async function GET(request: Request) { } catch (error) { console.error(error); - return NextResponse.json({ success: false, message: "Gagal mendapatkan grup, coba lagi nanti", reason: (error as Error).message, }, { status: 500 }); + return NextResponse.json({ success: false, message: "Gagal mendapatkan grup, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 }); } } \ No newline at end of file diff --git a/src/app/api/home/route.ts b/src/app/api/home/route.ts index 95342f9..0e1d147 100644 --- a/src/app/api/home/route.ts +++ b/src/app/api/home/route.ts @@ -287,6 +287,7 @@ export async function GET(request: Request) { isActive: true, dateStart: new Date(), Division: { + isActive: true, idVillage: idVillage, Group: { isActive: true, @@ -301,6 +302,7 @@ export async function GET(request: Request) { isActive: true, dateStart: new Date(), Division: { + isActive: true, idGroup: idGroup }, DivisionCalendar: {