wibu/desa-darmasaba
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fix API Jumlah Penganggguran

Browse Source
This commit is contained in:
nico
2025-08-25 11:07:21 +08:00
parent 3081e426bd
commit bb8dab05ba
24 changed files with 1305 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/api/[[...slugs]]/_lib/ekonomi/jumlah-pengangguran/detail-data-pengangguran/create.ts
View File

@@ -96,28 +96,36 @@ export default async function detailDataPengangguranCreate(context: Context) {
// Cari bulan sebelumnya
const currentMonthIndex = monthOrder.indexOf(body.month);
const prevMonth = currentMonthIndex > 0 ? monthOrder[currentMonthIndex - 1] : "Des";
const prevYear = currentMonthIndex > 0 ? body.year : body.year - 1;
// Handle year as number for calculations
const currentYear = typeof body.year === 'number' ? body.year : new Date(body.year).getFullYear();
const prevYear = currentMonthIndex > 0 ? currentYear : currentYear - 1;
// Create date objects for Prisma
const currentYearDate = new Date(currentYear, 0, 1);
const prevYearDate = new Date(prevYear, 0, 1);
const prevData = await prisma.detailDataPengangguran.findFirst({
where: {
month: prevMonth,
year: prevYear,
year: prevYearDate,
},
});
let percentageChange: number | null = null;
if (prevData) {
const change = ((body.totalUnemployment - prevData.totalUnemployment) / prevData.totalUnemployment) * 100;
const change = ((Number(body.totalUnemployment) - Number(prevData.totalUnemployment)) / Number(prevData.totalUnemployment)) * 100;
percentageChange = parseFloat(change.toFixed(1));
}
// Create the new record with properly typed values
const created = await prisma.detailDataPengangguran.create({
data: {
month: body.month,
year: body.year,
totalUnemployment: body.totalUnemployment,
educatedUnemployment: body.educatedUnemployment,
uneducatedUnemployment: body.uneducatedUnemployment,
year: currentYearDate,
totalUnemployment: Number(body.totalUnemployment),
educatedUnemployment: Number(body.educatedUnemployment),
uneducatedUnemployment: Number(body.uneducatedUnemployment),
percentageChange,
},
select: {

2
src/app/api/[[...slugs]]/_lib/ekonomi/jumlah-pengangguran/detail-data-pengangguran/findByMonthYear.ts
View File

@@ -15,7 +15,7 @@ export default async function findByMonthYear(context: Context) {
const data = await prisma.detailDataPengangguran.findFirst({
where: {
month,
year: Number(year),
year: new Date(Number(year), 0, 1), // Convert year number to Date object for Prisma
},
});

30
src/app/api/[[...slugs]]/_lib/ekonomi/jumlah-pengangguran/detail-data-pengangguran/updt.ts
View File

@@ -81,13 +81,18 @@ export default async function detailDataPengangguranUpdate(context: Context) {
return { success: false, message: "ID tidak ditemukan" };
}
const { month, year, totalUnemployment, educatedUnemployment, uneducatedUnemployment } = context.body as {
const { month, year: yearInput, totalUnemployment, educatedUnemployment, uneducatedUnemployment } = context.body as {
month: string;
year: number;
totalUnemployment: number;
educatedUnemployment: number;
uneducatedUnemployment: number;
year: number | string | Date;
totalUnemployment: number | string;
educatedUnemployment: number | string;
uneducatedUnemployment: number | string;
};
// Normalize year to Date object
const year = typeof yearInput === 'number' ? new Date(yearInput, 0, 1) :
yearInput instanceof Date ? yearInput :
new Date(parseInt(yearInput as string), 0, 1);
const duplicate = await prisma.detailDataPengangguran.findFirst({
where: {
@@ -109,18 +114,19 @@ export default async function detailDataPengangguranUpdate(context: Context) {
const currentMonthIndex = monthOrder.indexOf(month);
const prevMonth = currentMonthIndex > 0 ? monthOrder[currentMonthIndex - 1] : "Des";
const prevYear = currentMonthIndex > 0 ? year : year - 1;
const currentYear = year.getFullYear();
const prevYear = currentMonthIndex > 0 ? currentYear : currentYear - 1;
const prevData = await prisma.detailDataPengangguran.findFirst({
where: {
month: prevMonth,
year: prevYear,
year: new Date(prevYear, 0, 1),
},
});
let percentageChange: number | null = null;
if (prevData) {
const change = ((totalUnemployment - prevData.totalUnemployment) / prevData.totalUnemployment) * 100;
const change = ((Number(totalUnemployment) - Number(prevData.totalUnemployment)) / Number(prevData.totalUnemployment)) * 100;
percentageChange = parseFloat(change.toFixed(1));
}
@@ -128,10 +134,10 @@ export default async function detailDataPengangguranUpdate(context: Context) {
where: { id },
data: {
month,
year,
totalUnemployment,
educatedUnemployment,
uneducatedUnemployment,
year: new Date(year), // Ensure it's a new Date instance
totalUnemployment: Number(totalUnemployment),
educatedUnemployment: Number(educatedUnemployment),
uneducatedUnemployment: Number(uneducatedUnemployment),
percentageChange,
},
});

16
src/app/api/[[...slugs]]/_lib/landing_page/prestasi-desa/findMany.ts
View File

@@ -10,7 +10,7 @@ async function prestasiDesaFindMany(context: Context) {
const skip = (page - 1) * limit;
// Buat where clause
const where: any = { isActive: true };
const where: any = {};
// Tambahkan pencarian (jika ada)
if (search) {
@@ -19,6 +19,11 @@ async function prestasiDesaFindMany(context: Context) {
{ deskripsi: { contains: search, mode: 'insensitive' } },
{ kategori: { name: { contains: search, mode: 'insensitive' } } },
];
// Tetap filter hanya yang aktif saat melakukan pencarian
where.isActive = true;
} else {
// Jika tidak ada pencarian, tampilkan hanya data yang aktif
where.isActive = true;
}
try {
@@ -27,11 +32,16 @@ async function prestasiDesaFindMany(context: Context) {
where,
include: {
image: true,
kategori: true,
kategori: {
select: {
id: true,
name: true
}
},
},
skip,
take: limit,
orderBy: { createdAt: "desc" }, // opsional, kalau mau urut berdasarkan waktu
orderBy: { createdAt: "desc" },
}),
prisma.prestasiDesa.count({
where,