From 3cd87a44b2eeca4f8977d5a71d56364d3cace0c9 Mon Sep 17 00:00:00 2001 From: lukman Date: Mon, 29 Jul 2024 17:29:20 +0800 Subject: [PATCH] api : update announcement --- src/module/announcement/api/get/getAllAnnouncement.ts | 8 ++++---- src/module/announcement/api/get/getOneAnnouncement.ts | 8 ++++---- src/module/announcement/api/post/deleteAnnouncement.ts | 2 +- src/module/announcement/api/post/updateAnnouncement.ts | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/module/announcement/api/get/getAllAnnouncement.ts b/src/module/announcement/api/get/getAllAnnouncement.ts index 15a759a..328760c 100644 --- a/src/module/announcement/api/get/getAllAnnouncement.ts +++ b/src/module/announcement/api/get/getAllAnnouncement.ts @@ -8,7 +8,7 @@ export async function getAllAnnouncement(req: NextRequest) { const villageID = searchParams.get("villageID"); const createBy = searchParams.get("createBy"); const divisionID = searchParams.get("divisionID"); - const announcements = await prisma.annoucement.findMany({ + const announcements = await prisma.announcement.findMany({ where: { idVillage: String(villageID), createdBy: String(createBy), @@ -21,16 +21,16 @@ export async function getAllAnnouncement(req: NextRequest) { }, }); - const announcementMember = await prisma.annoucementMember.findMany({ + const announcementMember = await prisma.announcementMember.findMany({ where: { idGroup: String(groupID), idDivision: String(divisionID), - idAnnoucement: { + idAnnouncement: { in: announcements.map((announcement: any) => announcement.id), }, }, select: { - idAnnoucement: true, + idAnnouncement: true, idGroup: true, idDivision: true, }, diff --git a/src/module/announcement/api/get/getOneAnnouncement.ts b/src/module/announcement/api/get/getOneAnnouncement.ts index 3384c46..05a7f10 100644 --- a/src/module/announcement/api/get/getOneAnnouncement.ts +++ b/src/module/announcement/api/get/getOneAnnouncement.ts @@ -5,7 +5,7 @@ export async function getOneAnnouncement(req: NextRequest) { try { const searchParams = req.nextUrl.searchParams; const announcementId = searchParams.get("announcementId"); - const announcement = await prisma.annoucement.findUnique({ + const announcement = await prisma.announcement.findUnique({ where: { id: String(announcementId), }, @@ -15,12 +15,12 @@ export async function getOneAnnouncement(req: NextRequest) { desc: true, }, }); - const announcementMember = await prisma.annoucementMember.findMany({ + const announcementMember = await prisma.announcementMember.findMany({ where: { - idAnnoucement: String(announcementId), + idAnnouncement: String(announcementId), }, select: { - idAnnoucement: true, + idAnnouncement: true, idGroup: true, idDivision: true, }, diff --git a/src/module/announcement/api/post/deleteAnnouncement.ts b/src/module/announcement/api/post/deleteAnnouncement.ts index efaf239..a0a6044 100644 --- a/src/module/announcement/api/post/deleteAnnouncement.ts +++ b/src/module/announcement/api/post/deleteAnnouncement.ts @@ -4,7 +4,7 @@ import { NextRequest } from "next/server"; export async function deleteAnnouncement(req: NextRequest) { try { const data = await req.json(); - const update = await prisma.annoucement.update({ + const update = await prisma.announcement.update({ where: { id: data.id, }, diff --git a/src/module/announcement/api/post/updateAnnouncement.ts b/src/module/announcement/api/post/updateAnnouncement.ts index 47fd977..0f5059b 100644 --- a/src/module/announcement/api/post/updateAnnouncement.ts +++ b/src/module/announcement/api/post/updateAnnouncement.ts @@ -4,7 +4,7 @@ import { NextRequest } from "next/server"; export async function updateAnnouncement(req: NextRequest) { try { const data = await req.json(); - const udpate = await prisma.annoucement.update({ + const udpate = await prisma.announcement.update({ where: { id: data.id, }, @@ -17,9 +17,9 @@ export async function updateAnnouncement(req: NextRequest) { }, }); - const deleteAnnouncement = await prisma.annoucementMember.deleteMany({ + const deleteAnnouncement = await prisma.announcementMember.deleteMany({ where: { - idAnnoucement: data.id, + idAnnouncement: data.id, }, }); @@ -30,7 +30,7 @@ export async function updateAnnouncement(req: NextRequest) { isActive: true, })); - const announcementMember = await prisma.annoucementMember.createMany({ + const announcementMember = await prisma.announcementMember.createMany({ data: dataMember, });