upd: url otp

Reviewed-on: #27

.github/workflows/publish.yml

@@ -3,18 +3,20 @@ name: Publish Docker to GHCR
 on:
   workflow_dispatch:
     inputs:
-      environment:
-        description: "Target environment"
+      stack_env:
+        description: "stack env"
         required: true
         type: choice
-        default: "development"
+        default: "dev"
         options:
-          - development
-          - production
-          - staging
+          - dev
+          - prod
+          - stg
       tag:
-        description: "Image tag (e.g. v1.0.0)"
+        description: "Image tag (e.g. 1.0.0)"
         required: true
+        default: "1.0.0"
+
 
 env:
   REGISTRY: ghcr.io
@@ -22,7 +24,7 @@ env:
 
 jobs:
   publish:
-    name: Build & Push to GHCR (${{ github.event.inputs.environment }})
+    name: Build & Push to GHCR ${{ github.repository }}:${{ github.event.inputs.stack_env }}-${{ github.event.inputs.tag }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -59,8 +61,8 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ github.event.inputs.environment }}-${{ github.event.inputs.tag }}
-            type=raw,value=${{ github.event.inputs.environment }}-latest
+            type=raw,value=${{ github.event.inputs.stack_env }}-${{ github.event.inputs.tag }}
+            type=raw,value=${{ github.event.inputs.stack_env }}-latest
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6

.github/workflows/re-pull.yml

@@ -0,0 +1,37 @@
+name: Re-Pull Docker
+on:
+    workflow_dispatch:
+        inputs:
+            stack_name:
+                description: "stack name"
+                required: true
+                type: string
+            stack_env:
+                description: "stack env"
+                required: true
+                type: choice
+                default: "dev"
+                options:
+                    - dev
+                    - stg
+                    - prod
+
+jobs:
+    publish:
+        name: Re-Pull Docker ${{ github.event.inputs.stack_name }}
+        runs-on: ubuntu-latest
+        environment: ${{ vars.PORTAINER_ENV || 'portainer' }}
+        permissions:
+            contents: read
+            packages: write
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Deploy ke Portainer
+              run: bash ./.github/workflows/script/re-pull.sh
+              env:
+                  PORTAINER_USERNAME: ${{ secrets.PORTAINER_USERNAME }}
+                  PORTAINER_PASSWORD: ${{ secrets.PORTAINER_PASSWORD }}
+                  PORTAINER_URL: ${{ secrets.PORTAINER_URL }}
+                  STACK_NAME: ${{ github.event.inputs.stack_name }}-${{ github.event.inputs.stack_env }}

.github/workflows/script/re-pull.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+: "${PORTAINER_URL:?PORTAINER_URL tidak di-set}"
+: "${PORTAINER_USERNAME:?PORTAINER_USERNAME tidak di-set}"
+: "${PORTAINER_PASSWORD:?PORTAINER_PASSWORD tidak di-set}"
+: "${STACK_NAME:?STACK_NAME tidak di-set}"
+
+echo "🔐 Autentikasi ke Portainer..."
+TOKEN=$(curl -s -X POST https://${PORTAINER_URL}/api/auth \
+  -H "Content-Type: application/json" \
+  -d "{\"username\": \"${PORTAINER_USERNAME}\", \"password\": \"${PORTAINER_PASSWORD}\"}" \
+  | jq -r .jwt)
+
+if [ -z "$TOKEN" ] || [ "$TOKEN" = "null" ]; then
+  echo "❌ Autentikasi gagal! Cek PORTAINER_URL, USERNAME, dan PASSWORD."
+  exit 1
+fi
+
+echo "🔍 Mencari stack: $STACK_NAME..."
+STACK=$(curl -s -X GET https://${PORTAINER_URL}/api/stacks \
+  -H "Authorization: Bearer ${TOKEN}" \
+  | jq ".[] | select(.Name == \"$STACK_NAME\")")
+
+if [ -z "$STACK" ]; then
+  echo "❌ Stack '$STACK_NAME' tidak ditemukan di Portainer!"
+  echo "   Pastikan nama stack sudah benar."
+  exit 1
+fi
+
+STACK_ID=$(echo "$STACK" | jq -r .Id)
+ENDPOINT_ID=$(echo "$STACK" | jq -r .EndpointId)
+ENV=$(echo "$STACK" | jq '.Env // []')
+
+echo "📄 Mengambil compose file..."
+STACK_FILE=$(curl -s -X GET "https://${PORTAINER_URL}/api/stacks/${STACK_ID}/file" \
+  -H "Authorization: Bearer ${TOKEN}" \
+  | jq -r .StackFileContent)
+
+PAYLOAD=$(jq -n \
+  --arg content "$STACK_FILE" \
+  --argjson env "$ENV" \
+  '{stackFileContent: $content, env: $env, pullImage: true}')
+
+echo "🚀 Redeploying $STACK_NAME (pull latest image)..."
+HTTP_STATUS=$(curl -s -o /tmp/portainer_response.json -w "%{http_code}" \
+  -X PUT "https://${PORTAINER_URL}/api/stacks/${STACK_ID}?endpointId=${ENDPOINT_ID}" \
+  -H "Authorization: Bearer ${TOKEN}" \
+  -H "Content-Type: application/json" \
+  -d "$PAYLOAD")
+
+if [ "$HTTP_STATUS" != "200" ]; then
+  echo "❌ Redeploy gagal! HTTP Status: $HTTP_STATUS"
+  cat /tmp/portainer_response.json | jq .
+  exit 1
+fi
+
+echo "⏳ Menunggu container running..."
+
+MAX_RETRY=15
+COUNT=0
+
+while [ $COUNT -lt $MAX_RETRY ]; do
+  sleep 5
+  COUNT=$((COUNT + 1))
+
+  CONTAINERS=$(curl -s -X GET \
+    "https://${PORTAINER_URL}/api/endpoints/${ENDPOINT_ID}/docker/containers/json?all=true&filters=%7B%22label%22%3A%5B%22com.docker.compose.project%3D${STACK_NAME}%22%5D%7D" \
+    -H "Authorization: Bearer ${TOKEN}")
+
+  TOTAL=$(echo "$CONTAINERS" | jq 'length')
+  RUNNING=$(echo "$CONTAINERS" | jq '[.[] | select(.State == "running")] | length')
+  FAILED=$(echo "$CONTAINERS" | jq '[.[] | select(.State == "exited" and (.Status | test("Exited \\(0\\)") | not))] | length')
+
+  echo "🔄 [${COUNT}/${MAX_RETRY}] Running: ${RUNNING} | Failed: ${FAILED} | Total: ${TOTAL}"
+  echo "$CONTAINERS" | jq -r '.[] | "   → \(.Names[0]) | \(.State) | \(.Status)"'
+
+  if [ "$FAILED" -gt "0" ]; then
+    echo ""
+    echo "❌ Ada container yang crash!"
+    echo "$CONTAINERS" | jq -r '.[] | select(.State == "exited" and (.Status | test("Exited \\(0\\)") | not)) | "   → \(.Names[0]) | \(.Status)"'
+    exit 1
+  fi
+
+  if [ "$RUNNING" -gt "0" ]; then
+    echo ""
+    echo "✅ Stack $STACK_NAME berhasil di-redeploy dan running!"
+    exit 0
+  fi
+done
+
+echo ""
+echo "❌ Timeout! Stack tidak kunjung running setelah $((MAX_RETRY * 5)) detik."
+exit 1

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/noc/[[...slug]]/route.ts

@@ -0,0 +1,687 @@
+import { prisma } from "@/module/_global";
+import cors from "@elysiajs/cors";
+import { swagger } from "@elysiajs/swagger";
+import Elysia, { t } from "elysia";
+import _ from "lodash";
+import moment from "moment";
+import "moment/locale/id";
+
+// Gabungkan semua ke dalam satu instance server yang dipasang di /api/noc
+const NocServer = new Elysia({ prefix: "/api/noc" })
+   .use(cors({
+      origin: "*",
+      methods: ["GET", "POST", "OPTIONS"],
+   }))
+   .use(swagger({
+      path: "/docs", // Karena prefix instance adalah /api/noc, maka ini akan diakses di /api/noc/docs
+      documentation: {
+         info: {
+            title: "Sistem Desa Mandiri - NOC API",
+            version: "1.0.0",
+            description: "API Khusus untuk kebutuhan NOC (Network Operation Center) dan Monitoring Desa",
+         },
+         tags: [
+            { name: "NOC", description: "Endpoint khusus monitoring" }
+         ]
+      }
+   }))
+
+   // ── GET /api/noc/active-divisions ──────────────────────────────────────────
+   .get(
+      "/active-divisions",
+      async ({ query, set }) => {
+         const { idDesa, limit } = query;
+
+         if (!idDesa) {
+            set.status = 400;
+            return {
+               success: false,
+               message: "Parameter idDesa wajib diisi",
+               data: null,
+            };
+         }
+
+         const maxResults = Number(limit ?? 5);
+
+         try {
+            // Cek apakah desa ada
+            const village = await prisma.village.findUnique({
+               where: { id: idDesa },
+               select: { id: true, name: true },
+            });
+
+            if (!village) {
+               set.status = 404;
+               return {
+                  success: false,
+                  message: "Desa tidak ditemukan",
+                  data: null,
+               };
+            }
+
+            // Ambil semua divisi milik desa ini
+            const divisions = await prisma.division.findMany({
+               where: {
+                  idVillage: idDesa,
+                  isActive: true,
+               },
+               select: {
+                  id: true,
+                  name: true,
+                  idGroup: true,
+                  Group: {
+                     select: {
+                        name: true,
+                     },
+                  },
+                  _count: {
+                     select: {
+                        DivisionProject: true,
+                     },
+                  },
+               },
+            });
+
+            // Hitung total kegiatan per divisi & urutkan descending, ambil top sesuai limit
+            const ranked = divisions
+               .map((d: any) => ({
+                  id: d.id,
+                  division: d.name,
+                  group: d.Group.name,
+                  totalKegiatan: d._count.DivisionProject
+               }))
+               .sort((a: any, b: any) => b.totalKegiatan - a.totalKegiatan)
+               .slice(0, maxResults);
+
+            return {
+               success: true,
+               message: "Berhasil mendapatkan divisi teraktif",
+               data: {
+                  idDesa: village.id,
+                  namaDesa: village.name,
+                  divisi: ranked,
+               },
+            };
+         } catch (error) {
+            console.error("[NOC] active-divisions error:", error);
+            set.status = 500;
+            return {
+               success: false,
+               message: "Terjadi kesalahan pada server",
+               data: null,
+            };
+         }
+      },
+      {
+         query: t.Object({
+            idDesa: t.String({ description: "ID Desa yang ingin dicari" }),
+            limit: t.Optional(t.String({ description: "Jumlah maksimal data (default: 5)" })),
+         }),
+         detail: {
+            summary: "Divisi Teraktif",
+            description: "Menu Beranda - Mendapatkan daftar divisi teraktif berdasarkan jumlah proyek pada desa tertentu.",
+            tags: ["NOC"],
+         },
+      }
+   )
+
+   // ── GET /api/noc/latest-projects ──────────────────────────────────────────
+   .get(
+      "/latest-projects",
+      async ({ query, set }) => {
+         const { idDesa, limit } = query;
+
+         if (!idDesa) {
+            set.status = 400;
+            return {
+               success: false,
+               message: "Parameter idDesa wajib diisi",
+               data: null,
+            };
+         }
+
+         const maxResults = Math.min(Number(limit ?? 5), 50);
+
+         try {
+            // Cek apakah desa ada
+            const village = await prisma.village.findUnique({
+               where: { id: idDesa },
+               select: { id: true, name: true },
+            });
+
+            if (!village) {
+               set.status = 404;
+               return {
+                  success: false,
+                  message: "Desa tidak ditemukan",
+                  data: null,
+               };
+            }
+
+            // Ambil proyek umum terbaru dari desa ini
+            const projects = await prisma.project.findMany({
+               where: {
+                  idVillage: idDesa,
+                  isActive: true,
+               },
+               select: {
+                  id: true,
+                  title: true,
+                  status: true,
+                  desc: true,
+                  updatedAt: true,
+                  Group: {
+                     select: {
+                        name: true,
+                     },
+                  },
+                  User: {
+                     select: {
+                        name: true,
+                     },
+                  },
+               },
+               orderBy: {
+                  updatedAt: "desc",
+               },
+               take: maxResults,
+            });
+
+            const mapped = projects.map((p: any) => ({
+               id: p.id,
+               title: p.title,
+               status: p.status,
+               desc: p.desc,
+               group: p.Group.name,
+               createdBy: p.User.name,
+               updatedAt: p.updatedAt,
+            }));
+
+            return {
+               success: true,
+               message: "Berhasil mendapatkan proyek terbaru",
+               data: {
+                  idDesa: village.id,
+                  namaDesa: village.name,
+                  total: mapped.length,
+                  projects: mapped,
+               },
+            };
+         } catch (error) {
+            console.error("[NOC] latest-projects error:", error);
+            set.status = 500;
+            return {
+               success: false,
+               message: "Terjadi kesalahan pada server",
+               data: null,
+            };
+         }
+      },
+      {
+         query: t.Object({
+            idDesa: t.String({ description: "ID Desa yang ingin dicari" }),
+            limit: t.Optional(
+               t.String({ description: "Jumlah maksimal proyek (default: 5, maks: 50)" })
+            ),
+         }),
+         detail: {
+            summary: "Latest Projects General",
+            description: "Menu kinerja divisi - Mendapatkan daftar proyek umum terbaru dari berbagai grup pada desa tertentu.",
+            tags: ["NOC"],
+         },
+      }
+   )
+
+   // ── GET /api/noc/upcoming-events ───────────────────────────────────────────
+   .get(
+      "/upcoming-events",
+      async ({ query, set }) => {
+         const { idDesa, limit, filter } = query;
+
+         if (!idDesa) {
+            set.status = 400;
+            return {
+               success: false,
+               message: "Parameter idDesa wajib diisi",
+               data: null,
+            };
+         }
+
+         const maxResults = Math.min(Number(limit ?? 10), 50);
+         const today = moment().startOf("day").toDate();
+
+         try {
+            const village = await prisma.village.findUnique({
+               where: { id: idDesa },
+               select: { id: true, name: true },
+            });
+
+            if (!village) {
+               set.status = 404;
+               return {
+                  success: false,
+                  message: "Desa tidak ditemukan",
+                  data: null,
+               };
+            }
+
+            const events = await prisma.divisionCalendarReminder.findMany({
+               where: {
+                  isActive: true,
+                  dateStart: {
+                     gte: today,
+                  },
+                  Division: {
+                     idVillage: idDesa,
+                     isActive: true,
+                  },
+                  DivisionCalendar: {
+                     isActive: true,
+                  },
+               },
+               select: {
+                  id: true,
+                  idCalendar: true,
+                  dateStart: true,
+                  dateEnd: true,
+                  timeStart: true,
+                  timeEnd: true,
+                  status: true,
+                  Division: {
+                     select: {
+                        id: true,
+                        name: true,
+                     },
+                  },
+                  DivisionCalendar: {
+                     select: {
+                        title: true,
+                        desc: true,
+                        linkMeet: true,
+                        repeatEventTyper: true,
+                        User: {
+                           select: {
+                              name: true,
+                           },
+                        },
+                     },
+                  },
+               },
+               orderBy: [
+                  { dateStart: "asc" },
+                  { timeStart: "asc" },
+               ],
+               take: maxResults,
+            });
+
+            const todayMoment = moment().startOf("day");
+            const mapper = (e: any) => ({
+               id: e.id,
+               idCalendar: e.idCalendar,
+               title: e.DivisionCalendar.title,
+               desc: e.DivisionCalendar.desc,
+               linkMeet: e.DivisionCalendar.linkMeet ?? null,
+               repeatEventTyper: e.DivisionCalendar.repeatEventTyper,
+               dateStart: moment(e.dateStart).format("YYYY-MM-DD"),
+               dateEnd: e.dateEnd
+                  ? moment(e.dateEnd).format("YYYY-MM-DD")
+                  : null,
+               timeStart: moment.utc(e.timeStart).format("HH:mm"),
+               timeEnd: moment.utc(e.timeEnd).format("HH:mm"),
+               status: e.status,
+               createdBy: e.DivisionCalendar.User.name,
+               divisi: {
+                  id: e.Division.id,
+                  name: e.Division.name,
+               },
+            });
+
+            const todayEvents = events.filter((e: any) => moment(e.dateStart).isSame(todayMoment, 'day')).map(mapper);
+            const upcomingEvents = events.filter((e: any) => moment(e.dateStart).isAfter(todayMoment, 'day')).map(mapper);
+
+            let data: any = {
+               idDesa: village.id,
+               namaDesa: village.name,
+            };
+
+            if (filter === "today") {
+               data.events = todayEvents;
+            } else if (filter === "upcoming") {
+               data.events = upcomingEvents;
+            } else {
+               data.today = todayEvents;
+               data.upcoming = upcomingEvents;
+            }
+
+            return {
+               success: true,
+               message: "Berhasil mendapatkan events",
+               data: data,
+            };
+         } catch (error) {
+            console.error("[NOC] upcoming-events error:", error);
+            set.status = 500;
+            return {
+               success: false,
+               message: "Terjadi kesalahan pada server",
+               data: null,
+            };
+         }
+      },
+      {
+         query: t.Object({
+            idDesa: t.String({ description: "ID Desa yang ingin dicari" }),
+            limit: t.Optional(
+               t.String({ description: "Jumlah maksimal event (default: 10, maks: 50)" })
+            ),
+            filter: t.Optional(
+               t.String({ description: "Filter event: 'today' atau 'upcoming'" })
+            ),
+         }),
+         detail: {
+            summary: "Events (Today & Upcoming)",
+            description: "Menu beranda dan kinerja divisi - Mendapatkan daftar event pada hari ini dan yang akan datang untuk semua divisi pada desa tertentu.",
+            tags: ["NOC"],
+         },
+      }
+   )
+
+   // ── GET /api/noc/diagram-jumlah-document ───────────────────────────────────────────────
+   .get(
+      "/diagram-jumlah-document",
+      async ({ query, set }) => {
+         const { idDesa } = query;
+
+         if (!idDesa) {
+            set.status = 400;
+            return {
+               success: false,
+               message: "Parameter idDesa wajib diisi",
+               data: null,
+            };
+         }
+
+         try {
+            const village = await prisma.village.findUnique({
+               where: { id: idDesa },
+               select: { id: true, name: true },
+            });
+
+            if (!village) {
+               set.status = 404;
+               return {
+                  success: false,
+                  message: "Desa tidak ditemukan",
+                  data: null,
+               };
+            }
+
+            const documents = await prisma.divisionDocumentFolderFile.findMany({
+               where: {
+                  isActive: true,
+                  category: 'FILE',
+                  Division: {
+                     isActive: true,
+                     idVillage: idDesa,
+                     Group: {
+                        isActive: true,
+                     }
+                  }
+               }
+            })
+
+            const groupData = _.map(_.groupBy(documents, "extension"), (v: any) => ({
+               file: v[0].extension,
+               jumlah: v.length,
+            }))
+
+            const image = ['jpg', 'jpeg', 'png', 'heic']
+
+
+            let hasilImage = {
+               label: 'Gambar',
+               value: 0,
+               color: '#fac858'
+            }
+
+            let hasilFile = {
+               label: 'Dokumen',
+               value: 0,
+               color: '#92cc76'
+            }
+
+            groupData.map((v: any) => {
+               if (image.some((i: any) => i == v.file)) {
+                  hasilImage = {
+                     label: 'Gambar',
+                     value: hasilImage.value + v.jumlah,
+                     color: '#fac858'
+                  }
+               } else {
+                  hasilFile = {
+                     label: 'Dokumen',
+                     value: hasilFile.value + v.jumlah,
+                     color: '#92cc76'
+                  }
+               }
+            })
+
+            const allData = [hasilImage, hasilFile]
+
+            return {
+               success: true,
+               message: "Berhasil mendapatkan jumlah document",
+               data: allData
+            };
+         } catch (error) {
+            console.error("[NOC] jumlah-document error:", error);
+            set.status = 500;
+            return {
+               success: false,
+               message: "Terjadi kesalahan pada server",
+               data: null,
+            };
+         }
+      },
+      {
+         query: t.Object({
+            idDesa: t.String({ description: "ID Desa yang ingin dicari" }),
+         }),
+         detail: {
+            summary: "Diagram Jumlah Document",
+            description: "Menu kinerja divisi - Mendapatkan diagram jumlah document pada desa tertentu.",
+            tags: ["NOC"],
+         },
+      }
+   )
+
+   // -- GET /api/noc/diagram-progres-kegiatan
+   .get(
+      "/diagram-progres-kegiatan",
+      async ({ query, set }) => {
+         const { idDesa } = query;
+
+         if (!idDesa) {
+            set.status = 400;
+            return {
+               success: false,
+               message: "Parameter idDesa wajib diisi",
+               data: null,
+            };
+         }
+
+         try {
+            const village = await prisma.village.findUnique({
+               where: { id: idDesa },
+               select: { id: true, name: true },
+            });
+
+            if (!village) {
+               set.status = 404;
+               return {
+                  success: false,
+                  message: "Desa tidak ditemukan",
+                  data: null,
+               };
+            }
+
+            const data = await prisma.project.groupBy({
+               where: {
+                  isActive: true,
+                  idVillage: idDesa,
+                  Group: {
+                     isActive: true,
+                  }
+               },
+               by: ["status"],
+               _count: true
+            })
+
+            const dataStatus = [{ name: 'Segera dikerjakan', status: 0, color: '#177AD5' }, { name: 'Dikerjakan', status: 1, color: '#fac858' }, { name: 'Selesai dikerjakan', status: 2, color: '#92cc76' }, { name: 'Dibatalkan', status: 3, color: '#ED6665' }]
+            const hasil: any[] = []
+            let input
+            for (let index = 0; index < dataStatus.length; index++) {
+               const cek = data.some((i: any) => i.status == dataStatus[index].status)
+               if (cek) {
+                  const find = ((Number(data.find((i: any) => i.status == dataStatus[index].status)?._count) * 100) / data.reduce((n: any, { _count }: any) => n + _count, 0)).toFixed(2)
+                  const fix = find != "100.00" ? find.substr(-2, 2) == "00" ? find.substr(0, 2) : find : "100"
+                  input = {
+                     text: fix + '%',
+                     value: fix,
+                     color: dataStatus[index].color
+                  }
+               } else {
+                  input = {
+                     text: '0%',
+                     value: 0,
+                     color: dataStatus[index].color
+                  }
+               }
+               hasil.push(input)
+            }
+
+            return {
+               success: true,
+               message: "Berhasil mendapatkan progres kegiatan",
+               data: hasil
+            };
+         } catch (error) {
+            console.error("[NOC] progres-kegiatan error:", error);
+            set.status = 500;
+            return {
+               success: false,
+               message: "Terjadi kesalahan pada server",
+               data: null,
+            };
+         }
+      },
+      {
+         query: t.Object({
+            idDesa: t.String({ description: "ID Desa yang ingin dicari" }),
+         }),
+         detail: {
+            summary: "Diagram Progres Kegiatan",
+            description: "Menu kinerja divisi - Mendapatkan diagram progres kegiatan pada desa tertentu.",
+            tags: ["NOC"],
+         },
+      }
+   )
+
+   // -- GET /api/noc/latest-discussion
+   .get(
+      "/latest-discussion",
+      async ({ query, set }) => {
+         const { idDesa, limit } = query;
+
+         const maxResults = Math.min(Number(limit ?? 5), 50);
+
+         if (!idDesa) {
+            set.status = 400;
+            return {
+               success: false,
+               message: "Parameter idDesa wajib diisi",
+               data: null,
+            };
+         }
+
+         try {
+            const village = await prisma.village.findUnique({
+               where: { id: idDesa },
+               select: { id: true, name: true },
+            });
+
+            if (!village) {
+               set.status = 404;
+               return {
+                  success: false,
+                  message: "Desa tidak ditemukan",
+                  data: null,
+               };
+            }
+
+            const data = await prisma.discussion.findMany({
+               take: maxResults,
+               where: {
+                  idVillage: idDesa,
+                  isActive: true,
+                  status: 1,
+               },
+               select: {
+                  id: true,
+                  title: true,
+                  desc: true,
+                  createdAt: true,
+                  User: {
+                     select: {
+                        name: true
+                     }
+                  },
+                  Group: {
+                     select: {
+                        name: true
+                     }
+                  }
+               },
+               orderBy: {
+                  createdAt: "desc"
+               }
+            })
+
+            const allData = data.map((v: any) => ({
+               ..._.omit(v, ["createdAt", "User", "Group"]),
+               date: moment(v.createdAt).format("ll"),
+               user: v.User.name,
+               group: v.Group.name
+            }))
+
+            return {
+               success: true,
+               message: "Berhasil mendapatkan latest discussion",
+               data: allData
+            };
+         } catch (error) {
+            console.error("[NOC] latest-discussion error:", error);
+            set.status = 500;
+            return {
+               success: false,
+               message: "Terjadi kesalahan pada server",
+               data: null,
+            };
+         }
+      },
+      {
+         query: t.Object({
+            idDesa: t.String({ description: "ID Desa yang ingin dicari" }),
+            limit: t.Optional(t.String({ description: "Limit data" })),
+         }),
+         detail: {
+            summary: "Latest Discussion",
+            description: "Menu kinerja divisi - Mendapatkan latest discussion pada desa tertentu.",
+            tags: ["NOC"],
+         },
+      }
+   );
+
+
+export const GET = NocServer.handle;
+export const POST = NocServer.handle;

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.3", tahap: "beta", update: "-revisi api mobile pengumuman, diskusi umum dan diskusi divisi; -ditambah kan file " }, { status: 200 });
+      return NextResponse.json({ success: true, version: "2.1.8", tahap: "beta", update: "-api untuk dashboard noc; -perbaikan otp" }, { 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/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')

src/module/seeder/data/user.json

@@ -19,7 +19,7 @@
       "idPosition": "pos_ketua_rt01",
       "nik": "3201010101010001",
       "name": "Juli Ningrum",
-      "phone": "081234567890",
+      "phone": "6281234567890",
       "email": "juliningrum@gmail.com",
       "gender": "F"
    },
@@ -31,7 +31,7 @@
       "idPosition": "pos_sekretaris_rt01",
       "nik": "3201010101010002",
       "name": "Salwa Kusmawati",
-      "phone": "081234567891",
+      "phone": "6281234567891",
       "email": "salwakusmawati@gmail.com",
       "gender": "F"
    },
@@ -43,7 +43,7 @@
       "idPosition": "pos_staff_rt01",
       "nik": "3201010101010005",
       "name": "Bakidin Wibowo",
-      "phone": "081234567894",
+      "phone": "6281234567894",
       "email": "bakidinwibowo@gmail.com",
       "gender": "M"
    },
@@ -55,7 +55,7 @@
       "idPosition": "pos_staff_rt01",
       "nik": "3201010101010006",
       "name": "Jais Kurniawan",
-      "phone": "081234567895",
+      "phone": "6281234567895",
       "email": "jaiskurniawan@gmail.com",
       "gender": "M"
    },
@@ -67,7 +67,7 @@
       "idPosition": "pos_staff_rt01",
       "nik": "3201010101010007",
       "name": "Safira Oktaviani S.I.Kom",
-      "phone": "081234567896",
+      "phone": "6281234567896",
       "email": "safiraoktaviani@gmail.com",
       "gender": "F"
    },
@@ -79,7 +79,7 @@
       "idPosition": "pos_staff_rt01",
       "nik": "3201010101010008",
       "name": "Agus Setiawan",
-      "phone": "081234567897",
+      "phone": "6281234567897",
       "email": "agussetiawannn@gmail.com",
       "gender": "M"
    }