diff --git a/src/module/user/api/get/getOneUser.ts b/src/module/user/api/get/getOneUser.ts index a292d2f..2ab5788 100644 --- a/src/module/user/api/get/getOneUser.ts +++ b/src/module/user/api/get/getOneUser.ts @@ -1,4 +1,5 @@ import { prisma } from "@/module/_global"; +import _ from "lodash"; import { NextRequest } from "next/server"; export async function getOneUser(req: NextRequest) { @@ -17,10 +18,39 @@ export async function getOneUser(req: NextRequest) { phone: true, email: true, gender: true, + idGroup: true, + idPosition: true, + UserRole: { + select: { + name: true, + id: true + } + }, + Position: { + select: { + name: true, + id: true + }, + }, + Group: { + select: { + name: true, + id: true + }, + }, }, }); - return Response.json(users); + const { ...userData } = users; + const group = users?.Group.name + const position = users?.Position.name + const idUserRole = users?.UserRole.id + + const result = { ...userData, group, position, idUserRole }; + + const omitData = _.omit(result, ["Group", "Position", "UserRole"]) + console.log(omitData) + return Response.json(omitData); } catch (error) { console.error(error); return Response.json({ message: "Internal Server Errorr", success: false }, { status: 500 }); diff --git a/src/module/user/api/post/deleteUser.ts b/src/module/user/api/post/deleteUser.ts index 5ea84d3..461aeda 100644 --- a/src/module/user/api/post/deleteUser.ts +++ b/src/module/user/api/post/deleteUser.ts @@ -1,19 +1,23 @@ import { createLogUser } from '@/module/user'; import { prisma } from "@/module/_global"; import { NextRequest } from "next/server"; +import { revalidatePath } from 'next/cache'; export async function deleteUser(req: NextRequest) { try { const data = await req.json(); + const active = data.isActive; const update = await prisma.user.update({ where: { id: data.id, }, data: { - isActive: false, + isActive: !active, }, }); + revalidatePath("/member"); + // create log user const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus data user', table: 'user', data: update.id }) diff --git a/src/module/user/api/post/updateUser.ts b/src/module/user/api/post/updateUser.ts index 4463f0e..626302f 100644 --- a/src/module/user/api/post/updateUser.ts +++ b/src/module/user/api/post/updateUser.ts @@ -1,6 +1,7 @@ import { createLogUser } from '@/module/user'; import { prisma } from "@/module/_global"; import { NextRequest } from "next/server"; +import { funGetUserByCookies } from '@/module/auth'; export async function updateUser(req: NextRequest) { try { @@ -17,7 +18,6 @@ export async function updateUser(req: NextRequest) { email: data.email, gender: data.gender, idGroup: data.idGroup, - idVillage: data.idVillage, idPosition: data.idPosition, idUserRole: data.idUserRole, },