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

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

CHANGELOG.md

@@ -2,14 +2,6 @@
 
 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.32](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.31...v1.5.32) (2026-01-05)
-
-## [1.5.31](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.30...v1.5.31) (2025-12-24)
-
-## [1.5.30](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.29...v1.5.30) (2025-12-19)
-
-## [1.5.29](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.28...v1.5.29) (2025-12-17)
-
 ## [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)

package.json

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

prisma/migrations/20251218071503_add_type_on_db_notifikasi/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Notifikasi" ADD COLUMN     "type" TEXT;

prisma/migrations/20251223084450_add_recipient_and_sender/migration.sql

@@ -1,16 +0,0 @@
--- DropForeignKey
-ALTER TABLE "Notifikasi" DROP CONSTRAINT "Notifikasi_userRoleId_fkey";
-
--- AlterTable
-ALTER TABLE "Notifikasi" ADD COLUMN     "recipientId" TEXT,
-ADD COLUMN     "senderId" TEXT,
-ALTER COLUMN "userRoleId" DROP NOT NULL;
-
--- AddForeignKey
-ALTER TABLE "Notifikasi" ADD CONSTRAINT "Notifikasi_userRoleId_fkey" FOREIGN KEY ("userRoleId") REFERENCES "MasterUserRole"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Notifikasi" ADD CONSTRAINT "Notifikasi_recipientId_fkey" FOREIGN KEY ("recipientId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Notifikasi" ADD CONSTRAINT "Notifikasi_senderId_fkey" FOREIGN KEY ("senderId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/schema.prisma

@@ -59,10 +59,6 @@ model User {
   acceptedTermsAt      DateTime?
   acceptedForumTermsAt DateTime?
   tokenUserDevices     TokenUserDevice[]
-
-  // For Mobile App
-  NotificationRecipient Notifikasi[] @relation("NotificationRecipient")
-  NotificationSender    Notifikasi[] @relation("NotificationSender")
 }
 
 model MasterUserRole {
@@ -591,7 +587,7 @@ model Donasi_Invoice {
 
   imageId      String?
   MasterBank   MasterBank? @relation(fields: [masterBankId], references: [id])
-  masterBankId String?
+  masterBankId String?     
 }
 
 model Donasi_Kabar {
@@ -978,36 +974,27 @@ model NomorAdmin {
 }
 
 model Notifikasi {
-  id          String   @id @default(cuid())
-  isActive    Boolean  @default(true)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
+  id          String    @id @default(cuid())
+  isActive    Boolean   @default(true)
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
   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"
-  type     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?
+  userRoleId String
 
   User    User?   @relation("UserNotifikasi", fields: [userId], references: [id], map: "NotifikasiUser")
   userId  String?
   Admin   User?   @relation("AdminNotifikasi", fields: [adminId], references: [id], map: "NotifikasiAdmin")
   adminId String?
-
-  // Recipient (user who receives the notification)
-  recipient   User?   @relation("NotificationRecipient", fields: [recipientId], references: [id])
-  recipientId String?
-
-  // Sender (user who sent the notification)
-  sender   User?   @relation("NotificationSender", fields: [senderId], references: [id])
-  senderId String?
 }
 
 // MAPS

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

@@ -1,51 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { prisma } from "@/lib";
-
-export { DELETE };
-
-async function DELETE(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const { id } = params;
-  const { searchParams } = new URL(request.url);
-  const deviceId = searchParams.get("deviceId");
-
-  console.log("ID", id);
-  console.log("DEVICE ID", deviceId);
-
-  try {
-    const findFirst = await prisma.tokenUserDevice.findFirst({
-      where: {
-        userId: id,
-        deviceId: deviceId as any,
-      },
-    });
-
-    if (!findFirst) {
-      return NextResponse.json({
-        success: false,
-        message: "User tidak ditemukan !",
-      });
-    }
-
-    const deleted = await prisma.tokenUserDevice.delete({
-      where: {
-        id: findFirst.id,
-      },
-    });
-
-    console.log("DEL", deleted);
-
-    return NextResponse.json({
-      success: true,
-      message: "Berhasil menghapus device token user",
-    });
-  } catch (error) {
-    console.log("ERROR", error);
-    return NextResponse.json(
-      { error: (error as Error).message, message: "Terjadi error pada API" },
-      { status: 500 }
-    );
-  }
-}

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

@@ -1,13 +1,13 @@
 import { NextRequest, NextResponse } from "next/server";
 import { prisma } from "@/lib";
 
-export { POST, GET };
-
-async function POST(request: NextRequest) {
+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;
+    const { userId, platform, deviceId, model, appVersion, fcmToken } =
+      data;
 
     if (!fcmToken) {
       return NextResponse.json({ error: "Missing Token" }, { status: 400 });
@@ -23,9 +23,6 @@ async function POST(request: NextRequest) {
       },
     });
 
-
-    console.log("✅ EX", existing);
-
     let deviceToken;
 
     if (existing) {
@@ -65,22 +62,3 @@ async function POST(request: NextRequest) {
     );
   }
 }
-
-async function GET(request: NextRequest) {
-  try {
-    const data = await prisma.tokenUserDevice.findMany({
-      where: {
-        isActive: true,
-      },
-    });
-
-    return NextResponse.json({ success: true, data });
-
-
-  } catch (error) {
-    return NextResponse.json(
-      { error: (error as Error).message },
-      { status: 500 }
-    );
-  }
-}

src/app/api/mobile/notification/[id]/route.ts

@@ -1,67 +0,0 @@
-import { prisma } from "@/lib";
-import _ from "lodash";
-import { NextRequest, NextResponse } from "next/server";
-
-export async function GET(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const { id } = params;
-  const { searchParams } = new URL(request.url);
-  const category = searchParams.get("category");
-  
-  let fixData;
-  const fixCategory = _.upperCase(category || "");
-
-  try {
-    const data = await prisma.notifikasi.findMany({
-      orderBy: {
-        createdAt: "desc",
-      },
-      where: {
-        recipientId: id,
-        kategoriApp: fixCategory,
-      },
-    });
-
-    fixData = data;
-
-    return NextResponse.json({
-      success: true,
-      data: fixData,
-    });
-  } catch (error) {
-    return NextResponse.json(
-      { error: (error as Error).message },
-      { status: 500 }
-    );
-  }
-}
-
-export async function PUT(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const { id } = params;
-
-  try {
-    await prisma.notifikasi.update({
-      where: {
-        id: id,
-      },
-      data: {
-        isRead: true,
-      },
-    });
-
-    return NextResponse.json({
-      success: true,
-      message: "Notifications marked as read",
-    });
-  } catch (error) {
-    return NextResponse.json(
-      { error: (error as Error).message },
-      { status: 500 }
-    );
-  }
-}

src/app/api/mobile/notification/[id]/unread-count/route.ts

@@ -1,31 +0,0 @@
-import { prisma } from "@/lib";
-import { NextRequest, NextResponse } from "next/server";
-
-export async function GET(
-  request: NextRequest,
-  { params }: { params: { id: string } }
-) {
-  const { id } = params;
-  console.log("User ID:", id);
-
-  try {
-    const data = await prisma.notifikasi.count({
-      where: {
-        recipientId: id,
-        isRead: false,
-      },
-    });
-
-    console.log("List Notification >>", data);
-
-    return NextResponse.json({
-      success: true,
-      data: data,
-    });
-  } catch (error) {
-    return NextResponse.json({
-      success: false,
-      message: "Failed to get unread count",
-    });
-  }
-}

src/app/api/mobile/notification/route.ts

@@ -1,180 +0,0 @@
-// app/api/test/notifications/route.ts
-import { prisma } from "@/lib";
-import { adminMessaging } from "@/lib/firebase-admin";
-import { NextRequest, NextResponse } from "next/server";
-
-type NotificationProp = {
-  title: string;
-  body: string;
-  userLoginId: string;
-  appId?: string;
-  status?: string;
-  kategoriApp?: string;
-  type?: string;
-  deepLink?: string;
-};
-
-export async function POST(request: NextRequest) {
-  try {
-    const { data } = await request.json();
-
-    const {
-      title,
-      body: notificationBody,
-      userLoginId,
-      type,
-      kategoriApp,
-      appId,
-      status,
-      deepLink,
-    } = data as NotificationProp;
-
-    console.log("Notification Send >>", data);
-
-    // Cari user yang login
-    const findUserLogin = await prisma.user.findUnique({
-      where: {
-        id: userLoginId,
-      },
-    });
-
-    if (!findUserLogin) {
-      return NextResponse.json({ error: "User not found" }, { status: 404 });
-    }
-
-    // Cari token fcm user yang login
-    const checkFcmToken = await prisma.tokenUserDevice.findFirst({
-      where: {
-        userId: findUserLogin.id,
-      },
-    });
-
-    if (!checkFcmToken) {
-      return NextResponse.json(
-        { error: "FCM Token not found" },
-        { status: 404 }
-      );
-    }
-
-    // Jika user yang masuk maka notifikasik akan dikirim ke semua admin , begitu sebaliknya !
-    const filterByCurrentLoginId =
-      findUserLogin.masterUserRoleId === "1" ? "2" : "1";
-
-    // Cari user yang akan menerima notifikasi
-    const findAllUserBySendTo = await prisma.user.findMany({
-      where: {
-        masterUserRoleId: filterByCurrentLoginId,
-        NOT: {
-          id: findUserLogin.id,
-        },
-      },
-    });
-
-    console.log("Find All User By Send To >>", findAllUserBySendTo);
-
-    for (let a of findAllUserBySendTo) {
-      const responseCreatedNotifications = await createNotification({
-        title,
-        type: type as string,
-        createdAt: new Date(),
-        pesan: notificationBody || "",
-        appId: appId as string,
-        kategoriApp: kategoriApp as string,
-        userRoleId: findUserLogin.masterUserRoleId,
-        status: status,
-        deepLink: deepLink,
-        senderId: findUserLogin.id,
-        recipientId: a.id,
-      });
-
-      if (responseCreatedNotifications) {
-        const deviceToken = await prisma.tokenUserDevice.findMany({
-          where: {
-            userId: a.id,
-            isActive: true,
-          },
-        });
-
-        for (let i of deviceToken) {
-          const message = {
-            token: i.token,
-            notification: {
-              title,
-              body: notificationBody || "",
-            },
-            data: {
-              sentAt: new Date().toISOString(), // ✅ Simpan metadata di data
-              id: responseCreatedNotifications.id,
-              deepLink: deepLink || "",
-              // contoh: senderId, type, etc.
-            },
-          };
-
-          const response = await adminMessaging.send(message);
-          console.log("✅ FCM sent:", response);
-        }
-      } else {
-        return NextResponse.json({
-          success: false,
-          message: "Failed to create notification",
-        });
-      }
-    }
-
-    return NextResponse.json({
-      success: true,
-      message: "Notification sent successfully",
-    });
-  } catch (error: any) {
-    console.error("❌ FCM error:", error);
-    return NextResponse.json(
-      { error: error.message || "Failed to send FCM" },
-      { status: 500 }
-    );
-  }
-}
-
-async function createNotification({
-  title,
-  type,
-  createdAt,
-  appId,
-  kategoriApp,
-  pesan,
-  userRoleId,
-  status,
-  deepLink,
-  senderId,
-  recipientId,
-}: {
-  title: string;
-  type: string;
-  createdAt: Date;
-  appId: string;
-  kategoriApp: string;
-  userRoleId: string;
-  status?: string;
-  deepLink?: string;
-  pesan: string;
-
-  senderId: string;
-  recipientId: string;
-}) {
-  const createNotification = await prisma.notifikasi.create({
-    data: {
-      title,
-      type,
-      createdAt,
-      appId,
-      kategoriApp,
-      pesan,
-      userRoleId,
-      status,
-      deepLink,
-      senderId,
-      recipientId,
-    },
-  });
-
-  return createNotification;
-}

src/app/api/mobile/notifications/route.ts

@@ -0,0 +1,44 @@
+// app/api/test/notifications/route.ts
+import { adminMessaging } from "@/lib/firebase-admin";
+import { NextRequest, NextResponse } from "next/server";
+
+export async function POST(request: NextRequest) {
+  try {
+    const { data } = await request.json();
+    const { fcmToken, title, body: notificationBody } = data;
+
+    console.log("Data Notifikasi >>", data);
+
+    if (!fcmToken || !title) {
+      return NextResponse.json(
+        { error: "Missing fcmToken or title" },
+        { status: 400 }
+      );
+    }
+
+    const message = {
+      token: fcmToken,
+      notification: {
+        title,
+        body: notificationBody || "",
+      },
+      data: {
+        sentAt: new Date().toISOString(), // ✅ Simpan metadata di data
+        // contoh: senderId, type, etc.
+      },
+    };
+
+    console.log("[MSG]", message);
+
+    const response = await adminMessaging.send(message);
+    console.log("✅ FCM sent:", response);
+
+    return NextResponse.json({ success: true, messageId: response });
+  } catch (error: any) {
+    console.error("❌ FCM error:", error);
+    return NextResponse.json(
+      { error: error.message || "Failed to send FCM" },
+      { status: 500 }
+    );
+  }
+}

x.sh

@@ -3,13 +3,10 @@ URL="http://localhost:3000"
 # curl -X GET -H "Authorization: Bearer $TOKEN" ${URL}/api/middleware
 # curl -X GET -H "Cookie: hipmi-key=$TOKEN; user_id=789" ${URL}/dev/home | tee test.html
 
-curl -X POST ${URL}/api/mobile/notification \
+curl -X POST ${URL}/api/mobile/notifications \
   -H "Content-Type: application/json" \
   -d '{
     "fcmToken": "cVmHm-3P4E-1vjt6AA9kSF:APA91bHTkHjGTLxrFsb6Le6bZmzboZhwMGYXU4p0FP9yEeXixLDXNKS4F5vLuZV3sRgSnjjQsPpLOgstVLHJB8VJTObctKLdN-CxAp4dnP7Jbc_mH53jWvs",
     "title": "Test dari Backend (App Router)!",
-    "body": "Berhasil di App Router!",
-    "userLoginId": "cmha7p6yc0000cfoe5w2e7gdr",
-    "type": "NOTIFICATION",
-    "kategoriApp": "PERCOBAAN"
+    "body": "Berhasil di App Router!"
   }'