Merge pull request 'upd : api monitoring' (#32) from amalia/09-apr-26 into join

Reviewed-on: #32

src/app/api/monitoring/[[...slug]]/route.ts

@@ -13,6 +13,7 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
    .use(cors({
       origin: "*",
       methods: ["GET", "POST", "OPTIONS"],
+      allowedHeaders: ["Content-Type", "Authorization"]
    }))
    .use(swagger({
       path: "/docs", // Karena prefix instance adalah /api/monitoring, maka ini akan diakses di /api/monitoring/docs
@@ -179,6 +180,11 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
    )
    .get("/comparison-activity", async ({ query, set }) => {
       try {
+         const villages = await prisma.village.findMany({
+            where: { isDummy: false },
+            select: { name: true },
+         });
+
          const data = await prisma.$queryRaw`
                SELECT 
                   v."name",
@@ -192,9 +198,15 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
                ORDER BY total_logs DESC;
             ` as any[];
 
-         const result = data.map(item => ({
+         const logMap: Record<string, number> = {};
-            village: item.name,
+
-            activity: Number(item.total_logs)
+         data.forEach((item) => {
+            logMap[item.name] = Number(item.total_logs);
+         });
+
+         const result = villages.map((v) => ({
+            village: v.name,
+            activity: logMap[v.name] || 0,
          }));
 
 
@@ -309,6 +321,13 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
             take: 10,
          })
 
+         const count = await prisma.village.count({
+            where: {
+               isDummy: false,
+               ...(search && { name: { contains: search, mode: 'insensitive' } })
+            },
+         })
+
          const result = data.map((village) => ({
             id: village.id,
             name: village.name,
@@ -321,6 +340,9 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
             success: true,
             message: "Berhasil mendapatkan data",
             data: result,
+            totalPage: Math.ceil(count / 10),
+            currentPage: pageNum,
+            totalData: count,
          };
       } catch (error) {
          console.error("[villages] get-villages error:", error);
@@ -1009,7 +1031,7 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
    .get("/user", async ({ query, set }) => {
       const { page = 1, search } = query;
       const pageNum = Number(page) || 1;
-      const take = 25;
+      const take = 15;
       const skip = (pageNum - 1) * take;
 
       try {
@@ -1349,3 +1371,4 @@ const MonitoringServer = new Elysia({ prefix: "/api/monitoring" })
 
 export const GET = MonitoringServer.handle;
 export const POST = MonitoringServer.handle;
+export const OPTIONS = MonitoringServer.handle;