Merge pull request 'amalia/28-mei-26' (#54) from amalia/28-mei-26 into join
Reviewed-on: #54
This commit is contained in:
@@ -1149,6 +1149,7 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
|
||||
name: true,
|
||||
Village: {
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
},
|
||||
},
|
||||
@@ -1171,6 +1172,7 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
|
||||
desc: item.desc,
|
||||
username: item.User.name,
|
||||
village: item.User.Village.name,
|
||||
idVillage: item.User.Village.id,
|
||||
}));
|
||||
|
||||
|
||||
@@ -1274,6 +1276,11 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
|
||||
name: true,
|
||||
},
|
||||
},
|
||||
UserLog: {
|
||||
orderBy: { createdAt: 'desc' },
|
||||
take: 1,
|
||||
select: { createdAt: true },
|
||||
},
|
||||
},
|
||||
orderBy: {
|
||||
[safeOrderBy]: safeOrderDir,
|
||||
@@ -1302,6 +1309,7 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
|
||||
idVillage: item.idVillage,
|
||||
idGroup: item.idGroup,
|
||||
idPosition: item.idPosition,
|
||||
lastActivity: item.UserLog[0]?.createdAt ?? null,
|
||||
}));
|
||||
|
||||
return {
|
||||
@@ -1504,6 +1512,439 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
|
||||
}
|
||||
)
|
||||
|
||||
.get("/stale-villages", async ({ query, set }) => {
|
||||
const VALID_DAYS = [7, 14, 30];
|
||||
const days = VALID_DAYS.includes(Number(query.days)) ? Number(query.days) : 7;
|
||||
|
||||
try {
|
||||
const data = await prisma.$queryRaw`
|
||||
SELECT
|
||||
v."id",
|
||||
v."name",
|
||||
MAX(ul."createdAt") AS "lastActivity"
|
||||
FROM "Village" v
|
||||
LEFT JOIN "User" u ON u."idVillage" = v."id" AND u."idUserRole" != 'developer'
|
||||
LEFT JOIN "UserLog" ul ON ul."idUser" = u."id"
|
||||
WHERE v."isDummy" = false AND v."isActive" = true
|
||||
GROUP BY v."id", v."name"
|
||||
HAVING MAX(ul."createdAt") < NOW() - (${days} * INTERVAL '1 day')
|
||||
OR MAX(ul."createdAt") IS NULL
|
||||
ORDER BY "lastActivity" ASC NULLS FIRST
|
||||
` as any[];
|
||||
|
||||
const result = data.map((v: any) => ({
|
||||
id: v.id,
|
||||
name: v.name,
|
||||
lastActivity: v.lastActivity ?? null,
|
||||
daysSince: v.lastActivity
|
||||
? Math.floor((Date.now() - new Date(v.lastActivity).getTime()) / (1000 * 60 * 60 * 24))
|
||||
: null,
|
||||
}));
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: "Berhasil mendapatkan data",
|
||||
data: {
|
||||
count: result.length,
|
||||
days,
|
||||
villages: result,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("[stale-villages] error:", error);
|
||||
set.status = 500;
|
||||
return {
|
||||
success: false,
|
||||
message: "Terjadi kesalahan pada server",
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
},
|
||||
{
|
||||
query: t.Object({
|
||||
days: t.Optional(t.String({ description: "Threshold hari tidak aktif: 7, 14, atau 30 (default: 7)" })),
|
||||
}),
|
||||
detail: {
|
||||
summary: "Stale Villages",
|
||||
description: "Mendapatkan daftar desa aktif yang tidak ada aktivitas dalam X hari terakhir (atau belum pernah ada aktivitas sama sekali).",
|
||||
tags: ["villages"],
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
.get("/inactive-users", async ({ query, set }) => {
|
||||
const VALID_DAYS = [7, 14, 30];
|
||||
const days = VALID_DAYS.includes(Number(query.days)) ? Number(query.days) : 7;
|
||||
const pageNum = Number(query.page ?? 1) || 1;
|
||||
const take = 15;
|
||||
const { idVillage } = query;
|
||||
|
||||
try {
|
||||
const users = await prisma.user.findMany({
|
||||
where: {
|
||||
idUserRole: { not: 'developer' },
|
||||
...(idVillage && { idVillage }),
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
nik: true,
|
||||
email: true,
|
||||
phone: true,
|
||||
gender: true,
|
||||
isActive: true,
|
||||
isWithoutOTP: true,
|
||||
isApprover: true,
|
||||
idUserRole: true,
|
||||
idVillage: true,
|
||||
idGroup: true,
|
||||
idPosition: true,
|
||||
UserRole: { select: { name: true } },
|
||||
Village: { select: { id: true, name: true } },
|
||||
Group: { select: { name: true } },
|
||||
Position: { select: { name: true } },
|
||||
UserLog: {
|
||||
orderBy: { createdAt: 'desc' },
|
||||
take: 1,
|
||||
select: { createdAt: true },
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const threshold = new Date(Date.now() - days * 24 * 60 * 60 * 1000);
|
||||
|
||||
const inactive = users
|
||||
.map((u) => ({
|
||||
id: u.id,
|
||||
name: u.name,
|
||||
nik: u.nik,
|
||||
email: u.email,
|
||||
phone: u.phone,
|
||||
gender: u.gender,
|
||||
isActive: u.isActive,
|
||||
isWithoutOTP: u.isWithoutOTP,
|
||||
isApprover: u.isApprover,
|
||||
role: u.UserRole?.name ?? null,
|
||||
idUserRole: u.idUserRole,
|
||||
village: u.Village?.name ?? null,
|
||||
idVillage: u.Village?.id ?? null,
|
||||
group: u.Group?.name ?? null,
|
||||
position: u.Position?.name ?? null,
|
||||
idGroup: u.idGroup,
|
||||
idPosition: u.idPosition,
|
||||
lastActivity: u.UserLog[0]?.createdAt ?? null,
|
||||
daysSince: u.UserLog[0]?.createdAt
|
||||
? Math.floor((Date.now() - u.UserLog[0].createdAt.getTime()) / (1000 * 60 * 60 * 24))
|
||||
: null,
|
||||
}))
|
||||
.filter((u) => u.lastActivity === null || u.lastActivity < threshold)
|
||||
.sort((a, b) => {
|
||||
if (a.lastActivity === null) return -1;
|
||||
if (b.lastActivity === null) return 1;
|
||||
return a.lastActivity.getTime() - b.lastActivity.getTime();
|
||||
});
|
||||
|
||||
const total = inactive.length;
|
||||
const paginated = inactive.slice((pageNum - 1) * take, pageNum * take);
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: "Berhasil mendapatkan data",
|
||||
data: {
|
||||
users: paginated,
|
||||
total,
|
||||
totalPage: Math.ceil(total / take),
|
||||
currentPage: pageNum,
|
||||
days,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("[inactive-users] error:", error);
|
||||
set.status = 500;
|
||||
return {
|
||||
success: false,
|
||||
message: "Terjadi kesalahan pada server",
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
},
|
||||
{
|
||||
query: t.Object({
|
||||
days: t.Optional(t.String({ description: "Threshold hari tidak aktif: 7, 14, atau 30 (default: 7)" })),
|
||||
idVillage: t.Optional(t.String({ description: "Filter berdasarkan ID desa" })),
|
||||
page: t.Optional(t.String({ description: "Halaman (default: 1)" })),
|
||||
}),
|
||||
detail: {
|
||||
summary: "Inactive Users",
|
||||
description: "Mendapatkan daftar user yang tidak ada aktivitas dalam X hari terakhir, atau belum pernah ada aktivitas sama sekali.",
|
||||
tags: ["user"],
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
.get("/peak-hours", async ({ query, set }) => {
|
||||
const { idVillage } = query;
|
||||
|
||||
try {
|
||||
const data = await prisma.$queryRaw`
|
||||
SELECT
|
||||
EXTRACT(HOUR FROM ul."createdAt")::int AS hour,
|
||||
COUNT(*)::int AS count
|
||||
FROM "UserLog" ul
|
||||
JOIN "User" u ON ul."idUser" = u."id"
|
||||
WHERE (${idVillage ?? null}::text IS NULL OR u."idVillage" = ${idVillage ?? null})
|
||||
GROUP BY hour
|
||||
ORDER BY hour
|
||||
` as { hour: number; count: number }[];
|
||||
|
||||
const map = new Map(data.map((d) => [d.hour, d.count]));
|
||||
const result = Array.from({ length: 24 }, (_, i) => ({
|
||||
hour: i,
|
||||
label: `${String(i).padStart(2, '0')}:00`,
|
||||
count: map.get(i) ?? 0,
|
||||
}));
|
||||
|
||||
const peak = result.reduce((max, item) => (item.count > max.count ? item : max), result[0]);
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: "Berhasil mendapatkan data",
|
||||
data: {
|
||||
hours: result,
|
||||
peak,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("[peak-hours] error:", error);
|
||||
set.status = 500;
|
||||
return {
|
||||
success: false,
|
||||
message: "Terjadi kesalahan pada server",
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
},
|
||||
{
|
||||
query: t.Object({
|
||||
idVillage: t.Optional(t.String({ description: "ID desa (kosong = semua desa)" })),
|
||||
}),
|
||||
detail: {
|
||||
summary: "Peak Hours",
|
||||
description: "Mendapatkan distribusi aktivitas per jam dalam sehari (0-23) untuk desa tertentu atau semua desa.",
|
||||
tags: ["villages"],
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
// ─── CSV EXPORT ──────────────────────────────────────────────────────────
|
||||
|
||||
.get("/export-logs", async ({ query, set }) => {
|
||||
const { search, action, idVillage, dateFrom, dateTo } = query;
|
||||
|
||||
const whereClause = {
|
||||
...(action && { action: action.toUpperCase() }),
|
||||
...(idVillage && { User: { idVillage } }),
|
||||
...((dateFrom || dateTo) && {
|
||||
createdAt: {
|
||||
...(dateFrom && { gte: new Date(dateFrom) }),
|
||||
...(dateTo && { lte: new Date(new Date(dateTo).setHours(23, 59, 59, 999)) }),
|
||||
},
|
||||
}),
|
||||
...(search && {
|
||||
OR: [
|
||||
{ User: { name: { contains: search, mode: "insensitive" as const } } },
|
||||
{ User: { Village: { name: { contains: search, mode: "insensitive" as const } } } },
|
||||
],
|
||||
}),
|
||||
};
|
||||
|
||||
try {
|
||||
const data = await prisma.userLog.findMany({
|
||||
where: whereClause,
|
||||
select: {
|
||||
createdAt: true,
|
||||
action: true,
|
||||
desc: true,
|
||||
User: {
|
||||
select: {
|
||||
name: true,
|
||||
Village: { select: { name: true } },
|
||||
},
|
||||
},
|
||||
},
|
||||
orderBy: { createdAt: "desc" },
|
||||
});
|
||||
|
||||
const result = data.map((item) => ({
|
||||
timestamp: moment(item.createdAt).format('DD MMM YYYY HH:mm'),
|
||||
username: item.User.name,
|
||||
village: item.User.Village.name,
|
||||
action: item.action,
|
||||
desc: item.desc,
|
||||
}));
|
||||
|
||||
return { success: true, data: result };
|
||||
} catch (error) {
|
||||
console.error("[export-logs] error:", error);
|
||||
set.status = 500;
|
||||
return { success: false, message: "Terjadi kesalahan pada server", data: null };
|
||||
}
|
||||
}, {
|
||||
query: t.Object({
|
||||
search: t.Optional(t.String()),
|
||||
action: t.Optional(t.String()),
|
||||
idVillage: t.Optional(t.String()),
|
||||
dateFrom: t.Optional(t.String()),
|
||||
dateTo: t.Optional(t.String()),
|
||||
}),
|
||||
detail: { summary: "Export Logs CSV", tags: ["log-activity"] },
|
||||
})
|
||||
|
||||
.get("/export-users", async ({ query, set }) => {
|
||||
const { search, isActive, idUserRole, idVillage } = query;
|
||||
|
||||
const whereClause = {
|
||||
...(isActive !== undefined && { isActive: isActive === 'true' }),
|
||||
...(idUserRole && { idUserRole }),
|
||||
...(idVillage && { idVillage }),
|
||||
...(search && {
|
||||
OR: [
|
||||
{ name: { contains: search, mode: "insensitive" as const } },
|
||||
{ phone: { contains: search, mode: "insensitive" as const } },
|
||||
{ email: { contains: search, mode: "insensitive" as const } },
|
||||
{ nik: { contains: search, mode: "insensitive" as const } },
|
||||
{ Village: { name: { contains: search, mode: "insensitive" as const } } },
|
||||
],
|
||||
}),
|
||||
};
|
||||
|
||||
try {
|
||||
const data = await prisma.user.findMany({
|
||||
where: whereClause,
|
||||
select: {
|
||||
name: true,
|
||||
nik: true,
|
||||
phone: true,
|
||||
email: true,
|
||||
gender: true,
|
||||
isActive: true,
|
||||
UserRole: { select: { name: true } },
|
||||
Village: { select: { name: true } },
|
||||
Group: { select: { name: true } },
|
||||
Position: { select: { name: true } },
|
||||
UserLog: {
|
||||
orderBy: { createdAt: 'desc' },
|
||||
take: 1,
|
||||
select: { createdAt: true },
|
||||
},
|
||||
},
|
||||
orderBy: { name: 'asc' },
|
||||
});
|
||||
|
||||
const result = data.map((item) => ({
|
||||
name: item.name,
|
||||
nik: item.nik,
|
||||
email: item.email,
|
||||
phone: item.phone,
|
||||
gender: item.gender === 'M' ? 'Male' : item.gender === 'F' ? 'Female' : item.gender,
|
||||
role: item.UserRole?.name ?? '',
|
||||
village: item.Village?.name ?? '',
|
||||
group: item.Group?.name ?? '',
|
||||
position: item.Position?.name ?? '',
|
||||
status: item.isActive ? 'Active' : 'Inactive',
|
||||
lastActivity: item.UserLog[0]?.createdAt ? moment(item.UserLog[0].createdAt).format('DD MMM YYYY HH:mm') : '',
|
||||
}));
|
||||
|
||||
return { success: true, data: result };
|
||||
} catch (error) {
|
||||
console.error("[export-users] error:", error);
|
||||
set.status = 500;
|
||||
return { success: false, message: "Terjadi kesalahan pada server", data: null };
|
||||
}
|
||||
}, {
|
||||
query: t.Object({
|
||||
search: t.Optional(t.String()),
|
||||
isActive: t.Optional(t.String()),
|
||||
idUserRole: t.Optional(t.String()),
|
||||
idVillage: t.Optional(t.String()),
|
||||
}),
|
||||
detail: { summary: "Export Users CSV", tags: ["user"] },
|
||||
})
|
||||
|
||||
.get("/village-report", async ({ query, set }) => {
|
||||
const VALID_RANGES = [7, 30, 90];
|
||||
const range = VALID_RANGES.includes(Number(query.range)) ? Number(query.range) : 7;
|
||||
const doubleRange = range * 2;
|
||||
|
||||
try {
|
||||
const data = await prisma.$queryRaw`
|
||||
SELECT
|
||||
v."id",
|
||||
v."name",
|
||||
v."isActive",
|
||||
COUNT(CASE WHEN ul."createdAt" >= NOW() - (${range} * INTERVAL '1 day') THEN 1 END)::int AS activity_count,
|
||||
COUNT(CASE WHEN ul."createdAt" < NOW() - (${range} * INTERVAL '1 day') THEN 1 END)::int AS prev_activity_count,
|
||||
MAX(ul."createdAt") AS last_activity,
|
||||
(
|
||||
SELECT u2."name" FROM "User" u2
|
||||
WHERE u2."idVillage" = v."id" AND u2."idUserRole" = 'supadmin'
|
||||
LIMIT 1
|
||||
) AS perbekel,
|
||||
(
|
||||
SELECT COUNT(*)::int FROM "User" u3
|
||||
WHERE u3."idVillage" = v."id" AND u3."isActive" = true AND u3."idUserRole" != 'developer'
|
||||
) AS active_users,
|
||||
(
|
||||
SELECT COUNT(*)::int FROM "User" u4
|
||||
WHERE u4."idVillage" = v."id" AND u4."isActive" = false AND u4."idUserRole" != 'developer'
|
||||
) AS inactive_users
|
||||
FROM "Village" v
|
||||
LEFT JOIN "User" u ON u."idVillage" = v."id" AND u."idUserRole" != 'developer'
|
||||
LEFT JOIN "UserLog" ul ON ul."idUser" = u."id"
|
||||
AND ul."createdAt" >= NOW() - (${doubleRange} * INTERVAL '1 day')
|
||||
WHERE v."isDummy" = false
|
||||
GROUP BY v."id", v."name", v."isActive"
|
||||
ORDER BY activity_count DESC, v."name" ASC
|
||||
` as any[];
|
||||
|
||||
const result = data.map((v: any) => {
|
||||
const curr = Number(v.activity_count);
|
||||
const prev = Number(v.prev_activity_count);
|
||||
const trend = prev > 0 ? Math.round(((curr - prev) / prev) * 100) : curr > 0 ? 100 : 0;
|
||||
return {
|
||||
id: v.id,
|
||||
name: v.name,
|
||||
isActive: v.isActive,
|
||||
perbekel: v.perbekel ?? '-',
|
||||
activeUsers: Number(v.active_users),
|
||||
inactiveUsers: Number(v.inactive_users),
|
||||
activityCount: curr,
|
||||
prevActivityCount: prev,
|
||||
trend,
|
||||
lastActivity: v.last_activity ? moment(v.last_activity).format('DD MMM YYYY HH:mm') : null,
|
||||
daysSince: v.last_activity
|
||||
? Math.floor((Date.now() - new Date(v.last_activity).getTime()) / (1000 * 60 * 60 * 24))
|
||||
: null,
|
||||
};
|
||||
});
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: "Berhasil mendapatkan data",
|
||||
data: { villages: result, range, generatedAt: moment().format('DD MMM YYYY HH:mm') },
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("[village-report] error:", error);
|
||||
set.status = 500;
|
||||
return { success: false, message: "Terjadi kesalahan pada server", data: null };
|
||||
}
|
||||
}, {
|
||||
query: t.Object({
|
||||
range: t.Optional(t.String({ description: "Rentang hari: 7, 30, atau 90 (default: 7)" })),
|
||||
}),
|
||||
detail: { summary: "Village Report", description: "Data semua desa untuk keperluan laporan PDF.", tags: ["villages"] },
|
||||
})
|
||||
|
||||
// ─── API KEY MANAGEMENT ──────────────────────────────────────────────────
|
||||
|
||||
.get("/api-keys", async ({ set }) => {
|
||||
|
||||
Reference in New Issue
Block a user