Merge pull request 'upd: fix route laporan divisi' (#35) from amalia/17-apr-26 into join

Reviewed-on: #35

prisma/migrations/20260406074103_add_dummy_village/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Village" ADD COLUMN     "isDummy" BOOLEAN NOT NULL DEFAULT false;

prisma/schema.prisma

@@ -51,6 +51,7 @@ model Village {
   name         String
   desc         String         @db.Text
   isActive     Boolean        @default(true)
+  isDummy      Boolean        @default(false)
   createdAt    DateTime       @default(now())
   updatedAt    DateTime       @updatedAt
   Group        Group[]

src/app/api/auth/otp/route.ts

@@ -0,0 +1,59 @@
+import { prisma } from "@/module/_global";
+import { ILogin } from "@/types";
+import { NextRequest } from "next/server";
+
+export async function POST(req: NextRequest) {
+  try {
+    const { phone }: ILogin = await req.json();
+    
+    const user = await prisma.user.findUnique({
+      where: { phone, isActive: true },
+      select: { id: true, phone: true, isWithoutOTP: true },
+    });
+
+    if (!user) {
+      return Response.json({
+        success: false,
+        message: "Nomor telepon tidak terdaftar",
+      });
+    }
+
+    // Generate OTP
+    const code = Math.floor(1000 + Math.random() * 9000);
+    const message = `Desa+\nMasukkan kode ini ${code} pada web app Desa+ anda. Jangan berikan pada siapapun.`;
+
+    // Send WhatsApp
+    try {
+      const resWa = await fetch(`${process.env.URL_OTP}/api/wa/send-text`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
+        },
+        body: JSON.stringify({
+          number: user.phone,
+          text: message,
+        }),
+      });
+
+      if (!resWa.ok) {
+        console.error("WhatsApp API Error:", resWa.status);
+      }
+    } catch (error) {
+      console.error("WhatsApp Fetch Error:", error);
+    }
+
+    return Response.json({
+      success: true,
+      message: "Sukses",
+      phone: user.phone,
+      isWithoutOTP: user.isWithoutOTP,
+      id: user.id,
+      otp: code, // Return OTP for client-side verification (as per existing logic)
+    });
+
+  } catch (error) {
+    console.error(error);
+    return Response.json({ message: "Internal Server Error (error: 500)", success: false });
+  }
+}

src/app/api/mobile/division/report/route.ts

@@ -2,6 +2,7 @@ import { prisma } from "@/module/_global";
 import { funGetUserById } from "@/module/auth";
 import _, { ceil } from "lodash";
 import { NextResponse } from "next/server";
+import moment from "moment";
 
 export async function GET(request: Request) {
    try {
@@ -38,10 +39,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -54,10 +55,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -102,10 +103,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -117,10 +118,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -171,8 +172,8 @@ export async function GET(request: Request) {
                   idGroup: String(grup)
                },
                createdAt: {
-                  gte: new Date(String(date)),
-                  lte: new Date(String(dateAkhir))
+                  gte: moment(String(date)).startOf('day').toDate(),
+                  lte: moment(String(dateAkhir)).endOf('day').toDate()
                },
             }
          } else {
@@ -181,8 +182,8 @@ export async function GET(request: Request) {
                category: 'FILE',
                idDivision: String(division),
                createdAt: {
-                  gte: new Date(String(date)),
-                  lte: new Date(String(dateAkhir))
+                  gte: moment(String(date)).startOf('day').toDate(),
+                  lte: moment(String(dateAkhir)).endOf('day').toDate()
                },
             }
          }
@@ -252,8 +253,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date)),
-                        lte: new Date()
+                        gte: moment(String(date)).startOf('day').toDate(),
+                        lte: moment().toDate()
                      }
                   }
                }
@@ -267,8 +268,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gt: new Date(),
-                        lte: new Date(String(dateAkhir))
+                        gt: moment().toDate(),
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -293,8 +294,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date)),
-                        lte: new Date()
+                        gte: moment(String(date)).startOf('day').toDate(),
+                        lte: moment().toDate()
                      }
                   }
                }
@@ -306,8 +307,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gt: new Date(),
-                        lte: new Date(String(dateAkhir))
+                        gt: moment().toDate(),
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }

src/app/api/version-app/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "2.1.7", tahap: "beta", update: "-api untuk dashboard noc" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "2.1.10", tahap: "beta", update: "-perbaikan grafik divisi" }, { 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 });

src/lib/formatDateTime.ts

@@ -0,0 +1,11 @@
+function formatDateTime(date: Date) {
+  return new Intl.DateTimeFormat('id-ID', {
+    hour: '2-digit',
+    minute: '2-digit',
+    day: '2-digit',
+    month: 'short',
+    year: 'numeric',
+  }).format(date);
+}
+
+export default formatDateTime

src/lib/timeAgo.ts

@@ -0,0 +1,38 @@
+function timeAgo(date: Date) {
+   const now = new Date();
+   const d = new Date(date);
+
+   const diffMs = now.getTime() - d.getTime();
+   const seconds = Math.floor(diffMs / 1000);
+   const minutes = Math.floor(seconds / 60);
+   const hours = Math.floor(minutes / 60);
+
+   // 🔥 cek apakah masih hari yang sama
+   const isToday =
+      now.getDate() === d.getDate() &&
+      now.getMonth() === d.getMonth() &&
+      now.getFullYear() === d.getFullYear();
+
+   if (isToday) {
+      if (seconds < 60) return `${seconds} detik lalu`;
+      if (minutes < 60) return `${minutes} menit lalu`;
+      return `${hours} jam lalu`;
+   }
+
+   // 🔥 kalau bukan hari ini → tampil tanggal + jam
+   const time = d.toLocaleTimeString("id-ID", {
+      hour: "2-digit",
+      minute: "2-digit",
+   });
+
+   const datePart = d.toLocaleDateString("id-ID", {
+      day: "2-digit",
+      month: "short",
+      year: "numeric",
+   });
+
+   return `${time} ${datePart}`;
+}
+
+
+export default timeAgo

src/module/auth/login/view/view_login.tsx

@@ -5,7 +5,6 @@ import { useFocusTrap } from "@mantine/hooks";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import ViewVerification from "../../varification/view/view_verification";
-
 function ViewLogin() {
   const focusTrapRef = useFocusTrap()
   const textInfo = "Kami akan mengirimkan kode verifikasi melalui WhatsApp untuk mengonfirmasi nomor Anda.";
@@ -34,23 +33,24 @@ function ViewLogin() {
       })
       const cekLogin = await cek.json()
       if (cekLogin.success) {
-        const code = Math.floor(1000 + Math.random() * 9000)
         try {
-          const res = await fetch(`https://wa.wibudev.com/code?nom=${cekLogin.phone}&text=*DARMASABA*%0A%0A
-            JANGAN BERIKAN KODE RAHASIA ini kepada siapa pun TERMASUK PIHAK DARMASABA. Masukkan otentikasi:  *${encodeURIComponent(code)}*`).then(
-            async (res) => {
-              if (res.status == 200) {
-                setValPhone(cekLogin.phone)
-                setOTP(code)
-                setUser(cekLogin.id)
-                setVerif(true)
-                toast.success('Kode verifikasi telah dikirim')
-              } else {
-                console.error(res.status)
-                toast.error('Internal Server Error')
-              }
-            }
-          )
+          const res = await fetch('/api/auth/otp', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ phone: isPhone })
+          })
+          const data = await res.json()
+          if (data.success) {
+            setValPhone(data.phone)
+            setOTP(data.otp)
+            setUser(data.id)
+            setVerif(true)
+            toast.success('Kode verifikasi telah dikirim')
+          } else {
+            toast.error(data.message || 'Gagal mengirim kode verifikasi')
+          }
         } catch (error) {
           console.error(error)
           toast.error('Internal Server Error')

src/module/auth/varification/view/view_verification.tsx

@@ -15,19 +15,20 @@ export default function ViewVerification({ phone, otp, user }: IVerification) {
 
   async function onResend() {
     try {
-      const code = Math.floor(1000 + Math.random() * 9000)
-      const res = await fetch(`https://wa.wibudev.com/code?nom=${phone}&text=*DARMASABA*%0A%0A
-        JANGAN BERIKAN KODE RAHASIA ini kepada siapa pun TERMASUK PIHAK DARMASABA. Masukkan otentikasi:  *${encodeURIComponent(code)}*`)
-        .then(
-          async (res) => {
-            if (res.status == 200) {
-              toast.success('Kode verifikasi telah dikirim')
-              setOTP(code)
-            } else {
-              toast.error('Internal Server Error')
-            }
-          }
-        );
+      const res = await fetch('/api/auth/otp', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ phone })
+      })
+      const data = await res.json()
+      if (data.success) {
+        toast.success('Kode verifikasi telah dikirim')
+        setOTP(data.otp)
+      } else {
+        toast.error(data.message || 'Gagal mengirim ulang kode')
+      }
     } catch (error) {
       console.error(error)
       toast.error('Internal Server Error')