From 1552714c1d87a3d0027eccab8aff3b72beaf504a Mon Sep 17 00:00:00 2001 From: amel Date: Thu, 3 Oct 2024 11:59:48 +0800 Subject: [PATCH] fix: qc Deskripsi: - tambah anggota > no tlp > 62 - data home kalau yg login bukan superadmin No Issues --- src/app/api/home/route.ts | 66 +++++++++++++++++++-- src/app/api/user/route.ts | 4 +- src/module/user/member/ui/create_member.tsx | 2 +- 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/app/api/home/route.ts b/src/app/api/home/route.ts index a447f50..6f6b3d2 100644 --- a/src/app/api/home/route.ts +++ b/src/app/api/home/route.ts @@ -1,6 +1,6 @@ import { prisma } from "@/module/_global"; import { funGetUserByCookies } from "@/module/auth"; -import _, { ceil } from "lodash"; +import _, { ceil, some } from "lodash"; import moment from "moment"; import "moment/locale/id"; import { NextResponse } from "next/server"; @@ -35,11 +35,21 @@ export async function GET(request: Request) { isActive: true, } } - } else { + } else if (roleUser == "admin" || roleUser == "cosupadmin") { kondisi = { isActive: true, idGroup: idGroup } + } else { + kondisi = { + isActive: true, + idGroup: idGroup, + ProjectMember: { + some: { + idUser: user.id + } + } + } } const data = await prisma.project.findMany({ @@ -133,17 +143,31 @@ export async function GET(request: Request) { kondisi = { isActive: true, Division: { + isActive: true, idVillage: idVillage, Group: { isActive: true, } } } + } else if (roleUser == "admin" || roleUser == "cosupadmin") { + kondisi = { + isActive: true, + Division: { + isActive: true, + idGroup: idGroup + } + } } else { kondisi = { isActive: true, Division: { - idGroup: idGroup + isActive: true, + DivisionMember: { + some: { + idUser: user.id + } + } } } } @@ -185,18 +209,33 @@ export async function GET(request: Request) { isActive: true, category: 'FILE', Division: { + isActive: true, idVillage: idVillage, Group: { isActive: true, } } } + } else if (roleUser == "admin" || roleUser == "cosupadmin") { + kondisi = { + isActive: true, + category: 'FILE', + Division: { + isActive: true, + idGroup: idGroup + } + } } else { kondisi = { isActive: true, category: 'FILE', Division: { - idGroup: idGroup + isActive: true, + DivisionMember: { + some: { + idUser: user.id + } + } } } } @@ -284,7 +323,7 @@ export async function GET(request: Request) { dateEnd: true, createdAt: true, status: true, - idDivision:true, + idDivision: true, DivisionCalendar: { select: { title: true, @@ -327,18 +366,33 @@ export async function GET(request: Request) { isActive: true, status: 1, Division: { + isActive: true, idVillage: idVillage, Group: { isActive: true, } } } + } else if (roleUser == "admin" || roleUser == "cosupadmin") { + kondisi = { + isActive: true, + status: 1, + Division: { + idGroup: idGroup, + isActive: true + } + } } else { kondisi = { isActive: true, status: 1, Division: { - idGroup: idGroup + isActive: true, + DivisionMember: { + some: { + idUser: user.id + } + } } } } diff --git a/src/app/api/user/route.ts b/src/app/api/user/route.ts index 6fed7bf..80ea26a 100644 --- a/src/app/api/user/route.ts +++ b/src/app/api/user/route.ts @@ -167,7 +167,7 @@ export async function POST(request: Request) { const cekPhone = await prisma.user.count({ where: { - phone: data.phone + phone: "62" + data.phone }, }); @@ -177,7 +177,7 @@ export async function POST(request: Request) { data: { nik: data.nik, name: data.name, - phone: data.phone, + phone: "62" + data.phone, email: data.email, gender: data.gender, idGroup: groupFix, diff --git a/src/module/user/member/ui/create_member.tsx b/src/module/user/member/ui/create_member.tsx index 208ff1a..9f8ceca 100644 --- a/src/module/user/member/ui/create_member.tsx +++ b/src/module/user/member/ui/create_member.tsx @@ -423,7 +423,7 @@ export default function CreateMember() { error={ touched.phone && ( listData.phone == "" ? "Nomor Telepon Tidak Boleh Kosong" : - listData.phone.length < 10 ? "Nomor Telepon harus 10 digit" : null + listData.phone.length < 10 ? "Nomor Telepon Tidak Valid" : null ) } />