Merge pull request 'staging' (#34) from staging into main

Reviewed-on: http://wibugit.wibudev.com/wibu/hipmi/pulls/34

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.5.28](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.27...v1.5.28) (2025-12-17)
+
+## [1.5.27](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.26...v1.5.27) (2025-12-17)
+
 ## [1.5.26](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.25...v1.5.26) (2025-12-10)
 
 ## [1.5.25](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.24...v1.5.25) (2025-12-09)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hipmi",
-  "version": "1.5.26",
+  "version": "1.5.28",
   "private": true,
   "prisma": {
     "seed": "bun prisma/seed.ts"

prisma/migrations/20251216041242_add_token_user_device_indexes/migration.sql

@@ -0,0 +1,28 @@
+-- AlterTable
+ALTER TABLE "Notifikasi" ADD COLUMN     "deepLink" TEXT,
+ADD COLUMN     "readAt" TIMESTAMP(3);
+
+-- CreateTable
+CREATE TABLE "TokenUserDevice" (
+    "id" TEXT NOT NULL,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "platform" TEXT,
+    "deviceId" TEXT,
+    "model" TEXT,
+    "appVersion" TEXT,
+    "token" TEXT NOT NULL,
+    "userId" TEXT,
+
+    CONSTRAINT "TokenUserDevice_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "TokenUserDevice_userId_idx" ON "TokenUserDevice"("userId");
+
+-- CreateIndex
+CREATE INDEX "TokenUserDevice_token_idx" ON "TokenUserDevice"("token");
+
+-- AddForeignKey
+ALTER TABLE "TokenUserDevice" ADD CONSTRAINT "TokenUserDevice_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20251217063947_fix_master_bank_fk_on_donasi_invoice/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Donasi_Invoice" ALTER COLUMN "masterBankId" DROP DEFAULT;

prisma/schema.prisma

@@ -58,6 +58,7 @@ model User {
 
   acceptedTermsAt      DateTime?
   acceptedForumTermsAt DateTime?
+  tokenUserDevices     TokenUserDevice[]
 }
 
 model MasterUserRole {
@@ -586,7 +587,7 @@ model Donasi_Invoice {
 
   imageId      String?
   MasterBank   MasterBank? @relation(fields: [masterBankId], references: [id])
-  masterBankId String?     @default("null")
+  masterBankId String?     
 }
 
 model Donasi_Kabar {
@@ -973,16 +974,19 @@ model NomorAdmin {
 }
 
 model Notifikasi {
-  id          String   @id @default(cuid())
+  id          String    @id @default(cuid())
-  isActive    Boolean  @default(true)
+  isActive    Boolean   @default(true)
-  createdAt   DateTime @default(now())
+  createdAt   DateTime  @default(now())
-  updatedAt   DateTime @updatedAt
+  updatedAt   DateTime  @updatedAt
-  isRead      Boolean  @default(false)
   appId       String
   kategoriApp String
   pesan       String
   title       String?
   status      String?
+  
+  isRead      Boolean   @default(false)
+  readAt      DateTime? // kapan user membaca notifikasi ini
+  deepLink    String? // misal: "announcement/123", "user/profile/cmha6wb9w0001cfndwl9fcse6"
 
   Role       MasterUserRole? @relation(fields: [userRoleId], references: [id])
   userRoleId String
@@ -1099,3 +1103,22 @@ model BlockedUser {
 
   @@unique([blockerId, blockedId])
 }
+
+model TokenUserDevice {
+  id        String   @id @default(uuid())
+  isActive  Boolean  @default(true)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  platform   String? // "ios" | "android"
+  deviceId   String? // UUID unik dari device (misal: dari expo-device)
+  model      String? // "iPhone15,4", "Pixel 7", dll
+  appVersion String? // "1.5.15" — sangat berguna saat debug
+
+  token  String  @db.Text
+  user   User?   @relation(fields: [userId], references: [id])
+  userId String?
+
+  @@index([userId])
+  @@index([token]) // untuk pencarian cepat & deduplikasi
+}

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

@@ -33,18 +33,24 @@ export async function POST(req: Request) {
     // const encodedMsg = encodeURIComponent(msg);
 
     const res = await fetch(
-      `https://wa.wibudev.com/code?nom=${nomor}&text=${msg}`,
+      `https://cld-dkr-prod-wajs-server.wibudev.com/api/wa/code?nom=${nomor}&text=${msg}`,
-      { cache: "no-cache" }
+      {
+        cache: "no-cache",
+        headers: {
+          Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
+        },
+      }
     );
 
-    const sendWa = await res.json();
+    if (res.status !== 200)
-
-    if (sendWa.status !== "success")
       return NextResponse.json(
         { success: false, message: "Nomor Whatsapp Tidak Aktif" },
         { status: 400 }
       );
 
+    const sendWa = await res.text();
+    console.log("WA Response:", sendWa);
+
     return NextResponse.json(
       {
         success: true,
@@ -63,5 +69,5 @@ export async function POST(req: Request) {
       },
       { status: 500 }
     );
-  } 
+  }
 }

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

@@ -18,22 +18,25 @@ export async function POST(req: Request) {
 
     const msg = `HIPMI%20-%20Kode%20ini%20bersifat%20RAHASIA%20dan%20JANGAN%20DI%20BAGIKAN%20KEPADA%20SIAPAPUN%2C%20termasuk%20anggota%20ataupun%20pengurus%20HIPMI%20lainnya.%5Cn%5Cn%3E%3E%20Kode%20OTP%20anda%3A%20${codeOtp}.`;
 
-    const res = await fetch(
+       const res = await fetch(
-      `https://wa.wibudev.com/code?nom=${nomor}&text=${msg}`,
+      `https://cld-dkr-prod-wajs-server.wibudev.com/api/wa/code?nom=${nomor}&text=${msg}`,
-      { cache: "no-cache" }
+      {
+        cache: "no-cache",
+        headers: {
+          Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
+        },
+      }
     );
 
-    const sendWa = await res.json();
+    if (res.status !== 200)
-
-    if (sendWa.status !== "success")
       return NextResponse.json(
-        {
+        { success: false, message: "Nomor Whatsapp Tidak Aktif" },
-          success: false,
-          message: "Nomor Whatsapp Tidak Aktif",
-        },
         { status: 400 }
       );
 
+    const sendWa = await res.text();
+    console.log("WA Response:", sendWa);
+
     const createOtpId = await prisma.kodeOtp.create({
       data: {
         nomor: nomor,

src/app/api/mobile/auth/device-tokens/route.ts

@@ -0,0 +1,64 @@
+import { NextRequest, NextResponse } from "next/server";
+import { prisma } from "@/lib";
+
+export async function POST(request: NextRequest) {
+  const { data } = await request.json();
+  try {
+    console.log("Data >>", JSON.stringify(data, null, 2));
+
+    const { userId, platform, deviceId, model, appVersion, fcmToken } =
+      data;
+
+    if (!fcmToken) {
+      return NextResponse.json({ error: "Missing Token" }, { status: 400 });
+    }
+
+    const existing = await prisma.tokenUserDevice.findFirst({
+      where: {
+        token: fcmToken,
+        userId: userId,
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    let deviceToken;
+
+    if (existing) {
+      deviceToken = await prisma.tokenUserDevice.update({
+        where: {
+          id: existing?.id,
+        },
+        data: {
+          platform,
+          deviceId,
+          model,
+          appVersion,
+          isActive: true,
+          updatedAt: new Date(),
+        },
+      });
+    } else {
+      // Buat baru jika belum ada
+      deviceToken = await prisma.tokenUserDevice.create({
+        data: {
+          token: fcmToken,
+          userId: userId,
+          platform,
+          deviceId,
+          model,
+          appVersion,
+          isActive: true,
+        },
+      });
+    }
+
+    return NextResponse.json({ success: true, data: deviceToken });
+  } catch (error) {
+    return NextResponse.json(
+      { error: (error as Error).message },
+      { status: 500 }
+    );
+  }
+}

src/app_modules/auth/login/view.tsx

@@ -21,17 +21,24 @@ import { apiFetchLogin } from "../_lib/api_fetch_auth";
 
 export default function Login({ version }: { version: string }) {
   const router = useRouter();
-  const [phone, setPhone] = useState("");
   const [loading, setLoading] = useState(false);
   const [isError, setError] = useState(false);
 
+  const [phone, setPhone] = useState("");
+  const [countryCode, setCountryCode] = useState<string>("62"); // default ke Indonesia
+
   async function onLogin() {
-    const nomor = phone.substring(1);
+    console.log("phone >>", phone);
+
+    const nomor = phone;
     if (nomor.length <= 4) return setError(true);
 
+    const fixPhone = `${countryCode}${nomor}`;
+    console.log("fixPhone >>", fixPhone);
+
     try {
       setLoading(true);
-      const respone = await apiFetchLogin({ nomor: nomor });
+      const respone = await apiFetchLogin({ nomor: fixPhone });
 
       if (respone && respone.success) {
         localStorage.setItem("hipmi_auth_code_id", respone.kodeId);
@@ -72,16 +79,38 @@ export default function Login({ version }: { version: string }) {
             <Center>
               <Text c={MainColor.white}>Nomor telepon</Text>
             </Center>
+
             <PhoneInput
               countrySelectorStyleProps={{
                 buttonStyle: {
                   backgroundColor: MainColor.login,
                 },
               }}
-              inputStyle={{ width: "100%", backgroundColor: MainColor.login }}
               defaultCountry="id"
-              onChange={(val) => {
+              inputStyle={{ width: "100%", backgroundColor: MainColor.login }}
-                setPhone(val);
+              onChange={(fullPhone, meta) => {
+                const dialCode = meta.country.dialCode; // string, misal: "62"
+                let localNumber = fullPhone;
+
+                // Hapus kode negara dari awal string
+                if (fullPhone.startsWith(`+${dialCode}`)) {
+                  localNumber = fullPhone.slice(`+${dialCode}`.length);
+                }
+
+                // Bersihkan semua non-digit
+                localNumber = localNumber.replace(/\D/g, "");
+
+                // ✅ Filter khusus: untuk Indonesia (+62), hapus leading zero
+                if (dialCode === "62" && localNumber.startsWith("0")) {
+                  localNumber = localNumber.replace(/^0+/, ""); // hapus semua 0 di awal
+                }
+
+                // Simpan hasil akhir
+                setCountryCode(dialCode);
+                setPhone(localNumber);
+
+                // console.log("Country Code:", dialCode);
+                // console.log("Clean Local Number:", localNumber);
               }}
             />