8 Commits

Author SHA1 Message Date
9f3acf306e req: pengumuman
Deskripsi:
- struktur db pengumuman
- api tambah pengumuman
- api detail pengumuman
- api update pengumuman

No Issues
2026-01-14 15:02:43 +08:00
3d2a35446c Merge pull request 'amalia/16-okt-25' (#1) from amalia/16-okt-25 into join
Reviewed-on: http://wibugit.wibudev.com/wibu/sistem-desa-mandiri/pulls/1
2025-10-27 10:59:59 +08:00
3ab2566a89 update 2025-10-27 10:32:54 +08:00
9573c1472a Merge pull request 'upd: api mobile status saat error' (#67) from amalia/16-okt-25 into join
Reviewed-on: bip/sistem-desa-mandiri#67
2025-10-16 14:56:17 +08:00
ed2c9495c3 upd: api mobile status saat error 2025-10-16 14:53:23 +08:00
1b8bfebf4f Merge pull request 'amalia/15-okt-25' (#65) from amalia/15-okt-25 into join
Reviewed-on: bip/sistem-desa-mandiri#65
2025-10-15 14:56:29 +08:00
10b9037fda upd: api version 2025-10-15 14:52:17 +08:00
4a4be31921 upd: api website dan mobile
Deskripsi:
- update order komentar pada mobile dan website pada fitur diskusi umum dan diskusi divisi

No Issues
2025-10-15 14:51:58 +08:00
19 changed files with 155 additions and 47 deletions

View File

@@ -168,16 +168,29 @@ model Announcement {
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
AnnouncementMember AnnouncementMember[]
AnnouncementFile AnnouncementFile[]
}
model AnnouncementMember {
id String @id @default(cuid())
Announcement Announcement @relation(fields: [idAnnouncement], references: [id])
idAnnouncement String
Group Group @relation(fields: [idGroup], references: [id])
idGroup String
Division Division @relation(fields: [idDivision], references: [id])
idDivision String
isActive Boolean @default(true)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
}
model AnnouncementFile {
id String @id @default(cuid())
Announcement Announcement @relation(fields: [idAnnouncement], references: [id])
idAnnouncement String
Group Group @relation(fields: [idGroup], references: [id])
idGroup String
Division Division @relation(fields: [idDivision], references: [id])
idDivision String
name String
extension String
idStorage String?
isActive Boolean @default(true)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

View File

@@ -3,8 +3,8 @@ import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _ from "lodash";
import moment from "moment";
import { NextResponse } from "next/server";
import "moment/locale/id";
import { NextResponse } from "next/server";
// GET ONE DETAIL DISKUSI UMUM
@@ -75,6 +75,9 @@ export async function GET(request: Request, context: { params: { id: string } })
img: true
}
}
},
orderBy: {
createdAt: "asc"
}
})

View File

@@ -63,6 +63,9 @@ export async function GET(request: Request, context: { params: { id: string } })
},
where: {
isActive:true
},
orderBy: {
createdAt: "asc"
}
},
}

View File

@@ -1,4 +1,4 @@
import { prisma } from "@/module/_global";
import { DIR, funUploadFile, prisma } from "@/module/_global";
import { funGetUserById } from "@/module/auth";
import { createLogUserMobile } from "@/module/user";
import _ from "lodash";
@@ -20,6 +20,7 @@ export async function GET(request: Request, context: { params: { id: string } })
const data = await prisma.announcement.count({
where: {
id: id,
isActive: true,
},
});
@@ -29,7 +30,7 @@ export async function GET(request: Request, context: { params: { id: string } })
success: false,
message: "Gagal mendapatkan pengumuman, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -75,13 +76,26 @@ export async function GET(request: Request, context: { params: { id: string } })
// const fixMember = Object.groupBy(formatMember, ({ group }) => group);
const fixMember = _.groupBy(formatMember, ({ group }) => group);
const file = await prisma.announcementFile.findMany({
where: {
idAnnouncement: id
},
select: {
id: true,
idStorage: true,
name: true,
extension: true
}
})
return NextResponse.json(
{
success: true,
message: "Berhasil mendapatkan pengumuman",
data: announcement,
member: fixMember
member: fixMember,
file: file
},
{ status: 200 }
);
@@ -153,7 +167,12 @@ export async function DELETE(request: Request, context: { params: { id: string }
// EDIT PENGUMUMAN
export async function PUT(request: Request, context: { params: { id: string } }) {
try {
const { title, desc, groups, user } = (await request.json());
const body = await request.formData()
const dataBody = body.get("data")
const cekFile = body.has("file0")
// const { title, desc, groups, user } = (await request.json());
const { title, desc, groups, user, oldFile } = JSON.parse(dataBody as string)
const { id } = context.params;
const userMobile = await funGetUserById({ id: String(user) })
@@ -173,7 +192,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
success: false,
message: "Edit pengumuman gagal, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -213,6 +232,41 @@ export async function PUT(request: Request, context: { params: { id: string } })
data: memberDivision,
});
if (oldFile.length > 0) {
for (let index = 0; index < oldFile.length; index++) {
const element = oldFile[index];
if (element.delete) {
await prisma.announcementFile.delete({
where: {
id: element.id
}
})
}
}
}
if (cekFile) {
body.delete("data")
for (var pair of body.entries()) {
if (String(pair[0]).substring(0, 4) == "file") {
const file = body.get(pair[0]) as File
const fExt = file.name.split(".").pop()
const fName = decodeURIComponent(file.name.replace("." + fExt, ""))
const upload = await funUploadFile({ file: file, dirId: DIR.announcement })
if (upload.success) {
await prisma.announcementFile.create({
data: {
idStorage: upload.data.id,
idAnnouncement: id,
name: fName,
extension: String(fExt)
}
})
}
}
}
}
// create log user
const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengupdate data pengumuman', table: 'announcement', data: id, user: userMobile.id })

View File

@@ -1,4 +1,4 @@
import { funSendWebPush, prisma } from "@/module/_global";
import { DIR, funSendWebPush, funUploadFile, prisma } from "@/module/_global";
import { funGetUserById } from "@/module/auth";
import { createLogUserMobile } from '@/module/user';
import _ from "lodash";
@@ -113,7 +113,12 @@ export async function GET(request: Request) {
// CREATE PENGUMUMAN
export async function POST(request: Request) {
try {
const { title, desc, groups, user } = (await request.json());
const body = await request.formData()
const dataBody = body.get("data")
const cekFile = body.has("file0")
// const { title, desc, groups, user } = (await request.json());
const { title, desc, groups, user } = JSON.parse(dataBody as string)
const userMobile = await funGetUserById({ id: String(user) })
if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
@@ -152,6 +157,29 @@ export async function POST(request: Request) {
}
}
if (cekFile) {
body.delete("data")
for (var pair of body.entries()) {
if (String(pair[0]).substring(0, 4) == "file") {
const file = body.get(pair[0]) as File
const fExt = file.name.split(".").pop()
const fName = decodeURIComponent(file.name.replace("." + fExt, ""))
const upload = await funUploadFile({ file: file, dirId: DIR.announcement })
if (upload.success) {
await prisma.announcementFile.create({
data: {
idStorage: upload.data.id,
idAnnouncement: data.id,
name: fName,
extension: String(fExt)
}
})
}
}
}
}
const announcementMember = await prisma.announcementMember.createMany({
data: memberDivision,
});

View File

@@ -11,7 +11,7 @@ export async function GET(request: Request) {
const userMobile = searchParams.get("user")
if (userMobile == "null" || userMobile == undefined || userMobile == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const user = await funGetUserById({ id: userMobile })

View File

@@ -8,7 +8,7 @@ import { NextResponse } from "next/server";
// GET ONE DETAIL DISKUSI UMUM
export async function GET(request: Request, context: { params: { id: string } }) {
export async function GET(request : Request, context: { params: { id: string } }) {
try {
let dataFix
const { id } = context.params
@@ -19,7 +19,7 @@ export async function GET(request: Request, context: { params: { id: string } })
const user = await funGetUserById({ id: String(userMobile) })
if (user.id == "null" || user.id == undefined || user.id == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const cek = await prisma.discussion.count({
@@ -29,7 +29,7 @@ export async function GET(request: Request, context: { params: { id: string } })
})
if (cek == 0) {
return NextResponse.json({ success: false, message: "Gagal mendapatkan diskusi, data tidak ditemukan" }, { status: 404 });
return NextResponse.json({ success: false, message: "Gagal mendapatkan diskusi, data tidak ditemukan" }, { status: 200 });
}
if (kategori == "detail") {
@@ -77,6 +77,9 @@ export async function GET(request: Request, context: { params: { id: string } })
img: true
}
}
},
orderBy: {
createdAt: "asc"
}
})

View File

@@ -15,7 +15,7 @@ export async function GET(request: Request) {
const { searchParams } = new URL(request.url);
const user = searchParams.get("user")
if (user == "null" || user == undefined || user == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const userMobile = await funGetUserById({ id: user })

View File

@@ -31,7 +31,7 @@ export async function GET(request: Request, context: { params: { id: string } })
success: false,
message: "Gagal mendapatkan diskusi, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -54,6 +54,9 @@ export async function GET(request: Request, context: { params: { id: string } })
img: true
}
}
},
orderBy: {
createdAt: "asc"
}
})
@@ -134,7 +137,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
});
if (data == 0) {
return NextResponse.json({ success: false, message: "Gagal mendapatkan diskusi, data tidak ditemukan" }, { status: 404 });
return NextResponse.json({ success: false, message: "Gagal mendapatkan diskusi, data tidak ditemukan" }, { status: 200 });
}
const result = await prisma.divisionDisscussion.update({

View File

@@ -35,7 +35,7 @@ export async function GET(request: Request) {
})
if (cekDivision == 0) {
return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 404 });
return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 200 });
}
const data = await prisma.divisionDisscussion.findMany({
@@ -121,7 +121,7 @@ export async function POST(request: Request) {
})
if (cekDivision == 0) {
return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 404 });
return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 200 });
}
const data = await prisma.divisionDisscussion.create({

View File

@@ -12,7 +12,7 @@ export async function GET(request: Request, context: { params: { id: string } })
const userMobile = searchParams.get("user")
if (userMobile == "null" || userMobile == undefined || userMobile == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const { id } = context.params;
@@ -28,7 +28,7 @@ export async function GET(request: Request, context: { params: { id: string } })
success: false,
message: "Gagal mendapatkan grup, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -52,7 +52,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
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 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const userLogin = await funGetUserById({ id: user })
@@ -68,7 +68,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
success: false,
message: "Edit grup gagal, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -98,7 +98,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
const { name, user } = (await request.json());
if (user == "null" || user == undefined || user == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const data = await prisma.group.count({
@@ -113,7 +113,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
success: false,
message: "Edit grup gagal, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}

View File

@@ -11,7 +11,7 @@ export async function GET(request: Request) {
const userMobile = searchParams.get("user")
if (userMobile == "null" || userMobile == undefined || userMobile == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const user = await funGetUserById({ id: userMobile })
@@ -51,7 +51,7 @@ export async function POST(request: Request) {
const { name, user } = (await request.json());
if (user == "null" || user == undefined || user == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const userMobile = await funGetUserById({ id: user })

View File

@@ -11,7 +11,7 @@ export async function GET(request: Request) {
const userMobile = searchParams.get("user")
if (userMobile == "null" || userMobile == undefined || userMobile == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const userId = await funGetUserById({ id: userMobile })

View File

@@ -11,7 +11,7 @@ export async function GET(request: Request, context: { params: { id: string } })
const { id } = context.params;
if (userMobile == "null" || userMobile == undefined || userMobile == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const data = await prisma.position.findUnique({
@@ -30,7 +30,7 @@ export async function GET(request: Request, context: { params: { id: string } })
success: false,
message: "Gagal mendapatkan jabatan, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -55,7 +55,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
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 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const data = await prisma.position.count({
@@ -104,7 +104,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
const { name, idGroup, user } = await request.json();
if (user == "null" || user == undefined || user == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const cek = await prisma.position.count({

View File

@@ -16,7 +16,7 @@ export async function GET(request: Request) {
const userMobile = searchParams.get("user")
if (userMobile == "null" || userMobile == undefined || userMobile == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const user = await funGetUserById({ id: userMobile })
@@ -35,7 +35,7 @@ export async function GET(request: Request) {
})
if (cek == 0) {
return NextResponse.json({ success: false, message: "Gagal mendapatkan jabatan, data tidak ditemukan", }, { status: 404 });
return NextResponse.json({ success: false, message: "Gagal mendapatkan jabatan, data tidak ditemukan", }, { status: 200 });
}
const filter = await prisma.group.findUnique({
@@ -93,7 +93,7 @@ export async function POST(request: Request) {
const { name, idGroup, user } = await request.json();
if (user == "null" || user == undefined || user == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const userMobile = await funGetUserById({ id: user })
@@ -131,7 +131,7 @@ export async function POST(request: Request) {
} else {
return NextResponse.json(
{ success: false, message: "Jabatan sudah ada" },
{ status: 400 }
{ status: 200 }
);
}

View File

@@ -87,7 +87,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
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 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const data = await prisma.user.count({
@@ -102,7 +102,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
success: false,
message: "Gagal mendapatkan anggota, data tidak ditemukan",
},
{ status: 404 }
{ status: 200 }
);
}
@@ -158,7 +158,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
} = 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 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const cekNIK = await prisma.user.count({
@@ -247,7 +247,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
{ status: 200 }
);
} else {
return Response.json({ success: false, message: "Anggota sudah ada" }, { status: 400 });
return Response.json({ success: false, message: "Anggota sudah ada" }, { status: 200 });
}
} catch (error) {
console.error(error);

View File

@@ -11,7 +11,7 @@ export async function GET(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 });
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
const data = await prisma.user.findUnique({
where: {

View File

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
export async function GET(request: Request) {
try {
return NextResponse.json({ success: true, version: "2.0.8", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi; -api jenna ai; -privacy policy" }, { status: 200 });
return NextResponse.json({ success: true, version: "2.1.0", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi; -api jenna ai; -privacy policy" }, { status: 200 });
} catch (error) {
console.error(error);
return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

View File

@@ -1,6 +1,6 @@
import { hookstate } from "@hookstate/core"
import { IGlobalTema } from './type_global';
import { hookstate } from "@hookstate/core";
import { RefObject } from "react";
import { IGlobalTema } from './type_global';
export const pwd_key_config = "fchgvjknlmdfnbvghhujlaknsdvjbhknlkmsdbdyu567t8y9u30r4587638y9uipkoeghjvuyi89ipkoefmnrjbhtiu4or9ipkoemnjfbhjiuoijdklnjhbviufojkejnshbiuojijknehgruyu"
export const globalRole = hookstate<string>('')
@@ -11,7 +11,8 @@ export const DIR = {
document: "cm0xhbkf50009acbbtw03qo4l",
village: "cm0xhb91o0007acbbkx8rk8hj",
user: "cm0x8dbwn0005bp5tgmfcthzw",
banner: "cm1sxex19004938bjvyaq8vta"
banner: "cm1sxex19004938bjvyaq8vta",
announcement: "cmkdfkze4005hkhjgunsroi4t"
}
export const keyWibu = 'padahariminggukuturutayahkekotanaikdelmanistimewakududukdimuka'