diff --git a/src/app/api/mobile/group/[id]/route.ts b/src/app/api/mobile/group/[id]/route.ts index 5281961..106a238 100644 --- a/src/app/api/mobile/group/[id]/route.ts +++ b/src/app/api/mobile/group/[id]/route.ts @@ -84,7 +84,7 @@ export async function DELETE(request: Request, context: { params: { id: string } // create log user const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengedit status data grup', table: 'group', data: id, user }) - return NextResponse.json({ success: true, message: "Grup berhasil diedit", data, }, { status: 200 }); + return NextResponse.json({ success: true, message: "Grup berhasil diedit", }, { status: 200 }); } catch (error) { console.error(error); @@ -129,7 +129,7 @@ export async function PUT(request: Request, context: { params: { id: string } }) // create log user const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengedit data grup', table: 'group', data: id, user }) - return NextResponse.json({ success: true, message: "Grup berhasil diedit", data, }, { status: 200 }); + return NextResponse.json({ success: true, message: "Grup berhasil diedit" }, { status: 200 }); } catch (error) { console.error(error); diff --git a/src/app/api/mobile/group/route.ts b/src/app/api/mobile/group/route.ts index cb271e0..95944b2 100644 --- a/src/app/api/mobile/group/route.ts +++ b/src/app/api/mobile/group/route.ts @@ -71,7 +71,7 @@ export async function POST(request: Request) { // create log user const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data grup', table: 'group', data: data.id }) - return NextResponse.json({ success: true, message: "Berhasil menambahkan grup", data, }, { status: 200 }); + return NextResponse.json({ success: true, message: "Berhasil menambahkan grup", }, { status: 200 }); } catch (error) { console.error(error); return NextResponse.json({ success: false, message: "Gagal menambahkan grup, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 }); diff --git a/src/app/api/mobile/position/route.ts b/src/app/api/mobile/position/route.ts index 2e6bb00..9b0e591 100644 --- a/src/app/api/mobile/position/route.ts +++ b/src/app/api/mobile/position/route.ts @@ -126,7 +126,7 @@ export async function POST(request: Request) { // create log user const log = await createLogUserMobile({ act: 'CREATE', desc: 'User membuat data jabatan baru', table: 'position', data: positions.id, user }) - return NextResponse.json({ success: true, message: "Berhasil menambahkan jabatan", positions, }, { status: 200 }); + return NextResponse.json({ success: true, message: "Berhasil menambahkan jabatan" }, { status: 200 }); } else { return NextResponse.json( { success: false, message: "Jabatan sudah ada" }, diff --git a/src/app/api/mobile/user/[id]/route.ts b/src/app/api/mobile/user/[id]/route.ts index 8ff8e71..29dada5 100644 --- a/src/app/api/mobile/user/[id]/route.ts +++ b/src/app/api/mobile/user/[id]/route.ts @@ -1,6 +1,5 @@ import { DIR, funDeleteFile, funUploadFile, prisma } from "@/module/_global"; -import { funGetUserByCookies } from "@/module/auth"; -import { createLogUser } from "@/module/user"; +import { createLogUserMobile } from "@/module/user"; import _ from "lodash"; import { NextResponse } from "next/server"; import sharp from "sharp"; @@ -78,12 +77,13 @@ export async function GET(request: Request, context: { params: { id: string } }) // DELETE / ACTIVE & NON ACTIVE MEMBER / USER export async function DELETE(request: Request, context: { params: { id: string } }) { try { - const user = await funGetUserByCookies() - if (user.id == undefined) { + const { id } = context.params; + const { isActive, user } = (await request.json()); + + if (user == "null" || user == undefined || user == "") { return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); } - const { id } = context.params; - const { isActive } = (await request.json()); + const data = await prisma.user.count({ where: { id: id, @@ -114,13 +114,12 @@ export async function DELETE(request: Request, context: { params: { id: string } }); // create log user - const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate status anggota', table: 'user', data: id }) + const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengupdate status anggota', table: 'user', data: id, user: user }) return NextResponse.json( { success: true, message: "Berhasil mengupdate status anggota", - data: result, }, { status: 200 } ); @@ -135,10 +134,6 @@ export async function DELETE(request: Request, context: { params: { id: string } // UPDATE MEMBER export async function PUT(request: Request, context: { params: { id: string } }) { try { - const user = await funGetUserByCookies() - if (user.id == undefined) { - return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); - } const { id } = context.params; const body = await request.formData() @@ -152,9 +147,14 @@ export async function PUT(request: Request, context: { params: { id: string } }) gender, idGroup, idPosition, - idUserRole + idUserRole, + user } = JSON.parse(data as string) + if (user == "null" || user == undefined || user == "") { + return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); + } + const cekNIK = await prisma.user.count({ where: { nik: nik, @@ -234,7 +234,7 @@ export async function PUT(request: Request, context: { params: { id: string } }) } // create log user - const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate data anggota', table: 'user', data: user.id }) + const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengupdate data anggota', table: 'user', data: id, user: user }) return Response.json( { success: true, message: "Sukses update anggota" }, diff --git a/src/app/api/mobile/user/route.ts b/src/app/api/mobile/user/route.ts index fd9323f..1776b51 100644 --- a/src/app/api/mobile/user/route.ts +++ b/src/app/api/mobile/user/route.ts @@ -1,6 +1,6 @@ import { DIR, funUploadFile, prisma } from "@/module/_global"; -import { funGetUserByCookies } from "@/module/auth"; -import { createLogUser } from "@/module/user"; +import { funGetUserById } from "@/module/auth"; +import { createLogUser, createLogUserMobile } from "@/module/user"; import _ from "lodash"; import { NextResponse } from "next/server"; import sharp from "sharp"; @@ -14,13 +14,16 @@ export async function GET(request: Request) { const idGroup = searchParams.get("group"); const active = searchParams.get("active"); const page = searchParams.get('page'); + const userMobile = searchParams.get("user") const dataSkip = Number(page) * 10 - 10; - const user = await funGetUserByCookies() - if (user.id == undefined) { + + if (userMobile == "null" || userMobile == undefined || userMobile == "") { return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); } - if (idGroup == "null" || idGroup == undefined || idGroup == "") { + const user = await funGetUserById({ id: userMobile }) + + if (idGroup == "null" || idGroup == undefined || idGroup == "" || idGroup == "undefined") { fixGroup = user.idGroup } else { fixGroup = idGroup @@ -37,6 +40,7 @@ export async function GET(request: Request) { }) + if (page != undefined) { const users = await prisma.user.findMany({ skip: dataSkip, @@ -144,13 +148,15 @@ export async function GET(request: Request) { // CREATE MEMBER / USER export async function POST(request: Request) { try { - const user = await funGetUserByCookies() - if (user.id == undefined) { - return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); - } const body = await request.formData() const data = JSON.parse(body.get("data") as string) const file = body.get("file") as File + + if (data.user == "null" || data.user == undefined || data.user == "") { + return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 }); + } + + const user = await funGetUserById({ id: data.user }) const village = String(user.idVillage) let groupFix = data.idGroup @@ -231,11 +237,11 @@ export async function POST(request: Request) { } // create log user - const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data user baru', table: 'user', data: users.id }) + const log = await createLogUserMobile({ act: 'CREATE', desc: 'User membuat data user baru', table: 'user', data: users.id, user: data.user }) - return Response.json({ success: true, message: 'Sukses membuat user', data: users }, { status: 200 }); + return Response.json({ success: true, message: 'Sukses membuat user' }, { status: 200 }); } else { - return Response.json({ success: false, message: "User sudah ada" }, { status: 400 }); + return Response.json({ success: false, message: "User sudah ada" }, { status: 200 }); } } catch (error) {