Merge pull request 'join' (#33) from join into staging

Reviewed-on: bip/sistem-desa-mandiri#33

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

@@ -263,7 +263,7 @@ export async function POST(request: Request) {
             data: dataNotifFilter
         })
 
-        const tokenUnique = [...new Set(tokenDup.flat())];
+        const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
         await sendFCMNotificationMany({
             token: tokenUnique,
             title: "Pengumuman Baru",

src/app/api/mobile/discussion-general/[id]/comment/route.ts

@@ -103,7 +103,7 @@ export async function POST(request: Request, context: { params: { id: string } }
          tokenDup.push(perbekel?.TokenDeviceUser.map((v: any) => v.token).flat())
       }
 
-      const tokenUnique = [...new Set(tokenDup.flat())];
+      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Komentar Baru",

src/app/api/mobile/discussion-general/route.ts

@@ -215,7 +215,7 @@ export async function POST(request: Request) {
          data: dataNotif
       })
 
-      const tokenUnique = [...new Set(tokenDup.flat())];
+      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Diskusi Umum Baru",

src/app/api/mobile/discussion/[id]/comment/route.ts

@@ -119,7 +119,7 @@ export async function POST(request: Request, context: { params: { id: string } }
             tokenDup.push(perbekel?.TokenDeviceUser.map((v: any) => v.token).flat())
         }
 
-        const tokenUnique = [...new Set(tokenDup.flat())];
+        const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
         await sendFCMNotificationMany({
             token: tokenUnique,
             title: "Komentar Baru",

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

@@ -269,7 +269,7 @@ export async function POST(request: Request) {
          data: dataNotifFilter
       })
 
-      const tokenUnique = [...new Set(tokenDup.flat())];
+      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
 
       await sendFCMNotificationMany({
          token: tokenUnique,

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

@@ -392,7 +392,7 @@ export async function POST(request: Request) {
             data: dataNotifFilter
         })
 
-        const tokenUnique = [...new Set(tokenDup.flat())];
+        const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
         await sendFCMNotificationMany({
             token: tokenUnique,
             title: "Kegiatan Baru",

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

@@ -363,7 +363,7 @@ export async function POST(request: Request) {
          data: dataNotifFilter
       })
 
-      const tokenUnique = [...new Set(tokenDup.flat())];
+      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Tugas Baru",

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: "1.7.6", tahap: "beta", update: "-api mobile; -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "1.7.7", tahap: "beta", update: "-api mobile; -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas 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 });

xsendMany.ts

@@ -43,10 +43,8 @@ export async function sendFCMNotificationMany({ token, title, body, data }: { to
             },
          },
       };
-      console.log("masuk", token.length, token)
 
       if (token.length > 0) {
-         console.log("Token", token.length)
          // Kirim pesan
          const response = await getMessaging().sendEachForMulticast(message as any);
          if (response.failureCount > 0) {