wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #482 from bipproduction/amalia/02-jul-25

Browse Source 
Amalia/02 jul 25
This commit is contained in:
Amalia
2025-07-02 15:32:25 +08:00
committed by GitHub
parent de866a3bea bf468f36e6
commit 2e9a5bcd74
7 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/api/mobile/announcement/route.ts
View File

@@ -100,16 +100,6 @@ export async function GET(request: Request) {
createdAt: moment(v.createdAt).format("ll")
}))
// await sendFCMNotification('c89yuexsS_uc1tOErVPu5a:APA91bEb6tEKXAfReZjFVJ2mMyOzoW_RXryLSnSJTpbIVV3G0L_DCNkLuRvJ02Ip-Erz88QCQBAt-C2SN8eCRxu3-v1sBzXzKPtDv-huXpkjXsyrkifqvUo')
await sendFCMNotificationMany({
token: [
'c89yuexsS_uc1tOErVPu5a:APA91bEb6tEKXAfReZjFVJ2mMyOzoW_RXryLSnSJTpbIVV3G0L_DCNkLuRvJ02Ip-Erz88QCQBAt-C2SN8eCRxu3-v1sBzXzKPtDv-huXpkjXsyrkifqvUo',
'cRz96GHKTRaQaRJ35e8Hxa:APA91bEUSxE0VPbqKSzseQ_zGhbYsDofMexKykRw7o_3z2aPM9YFmZbeA2enrmb3qjdZ2g4-QQtiNHAyaZqAT1ITOrwo9jVJlShTeABmEFYP5GLEUZ3dlLc'
],
title: "Judul Notifikasi Pengumuman",
body: "Pengumuman untuk perangkat",
data: { id: "cm1eqwkwj00067j2bzejyh9u7", category: "division", content: "cm1eqwkvu00017j2b8qnisp9g" }
})
return NextResponse.json({ success: true, message: "Berhasil mendapatkan pengumuman", data: allData, }, { status: 200 });
} catch (error) {
@@ -184,6 +174,11 @@ export async function POST(request: Request) {
select: {
subscription: true
}
},
TokenDeviceUser:{
select:{
token: true
}
}
}
}
@@ -192,10 +187,17 @@ export async function POST(request: Request) {
// mengirim notifikasi
// dataFCM untuk push notifikasi mobile
// datanotif untuk realtime notifikasi
// datapush untuk web push notifikasi ketika aplikasi tidak aktif
const dataFCM = memberNotif.map((v: any) => ({
..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
tokens: v.User.TokenDeviceUser.map((v: any) => v.token)
}))
const tokenDup = dataFCM.filter((v: any) => v.tokens.length > 0).map((v: any) => v.tokens).flat();
const dataNotif = memberNotif.map((v: any) => ({
..._.omit(v, ["idUser", "User", "Subscribe"]),
..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
idUserTo: v.idUser,
idUserFrom: userId,
category: 'announcement',
@@ -204,12 +206,14 @@ export async function POST(request: Request) {
desc: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.'
}))
const dataPush = memberNotif.map((v: any) => ({
..._.omit(v, ["idUser", "User", "Subscribe"]),
..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
idUser: v.idUser,
subscription: v.User.Subscribe?.subscription,
}))
if (userRoleLogin != "supadmin") {
const perbekel = await prisma.user.findFirst({
where: {
@@ -223,10 +227,16 @@ export async function POST(request: Request) {
select: {
subscription: true
}
},
TokenDeviceUser:{
select:{
token: true
}
}
}
})
tokenDup.push(perbekel?.TokenDeviceUser.map((v: any) => v.token).flat())
dataNotif.push({
idUserTo: perbekel?.id,
@@ -244,6 +254,8 @@ export async function POST(request: Request) {
}
const pushNotif = dataPush.filter((item) => item.subscription != undefined)
const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Pengumuman Baru', body: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.' } })
@@ -251,6 +263,14 @@ export async function POST(request: Request) {
data: dataNotif
})
const tokenUnique = [...new Set(tokenDup)];
await sendFCMNotificationMany({
token: tokenUnique,
title: "Pengumuman Baru",
body: "Anda memiliki pengumuman baru. Silahkan periksa detailnya.",
data: { id: data.id, category: "announcement", content: data.id }
})
// create log user
const log = await createLogUserMobile({ act: 'CREATE', desc: 'User membuat data pengumuman baru', table: 'announcement', data: data.id, user: userMobile.id })

8
src/app/api/mobile/fcm/[[...slug]]/route.ts
View File

@@ -9,10 +9,12 @@ const ApiV2 = new elysia({
await sendFCMNotificationMany({
token: [
'c89yuexsS_uc1tOErVPu5a:APA91bEb6tEKXAfReZjFVJ2mMyOzoW_RXryLSnSJTpbIVV3G0L_DCNkLuRvJ02Ip-Erz88QCQBAt-C2SN8eCRxu3-v1sBzXzKPtDv-huXpkjXsyrkifqvUo',
'cRz96GHKTRaQaRJ35e8Hxa:APA91bEUSxE0VPbqKSzseQ_zGhbYsDofMexKykRw7o_3z2aPM9YFmZbeA2enrmb3qjdZ2g4-QQtiNHAyaZqAT1ITOrwo9jVJlShTeABmEFYP5GLEUZ3dlLc'
'cRz96GHKTRaQaRJ35e8Hxa:APA91bEUSxE0VPbqKSzseQ_zGhbYsDofMexKykRw7o_3z2aPM9YFmZbeA2enrmb3qjdZ2g4-QQtiNHAyaZqAT1ITOrwo9jVJlShTeABmEFYP5GLEUZ3dlLc',
'gagal_device1',
'gagal_device2'
],
title: "Judul Notifikasi Pengumuman",
body: "Pengumuman untuk perangkat",
title: "Judul Notifikasi Pengumuman Elysia",
body: "Pengumuman untuk perangkat Elysia",
data: { id: "cm1eqwkwj00067j2bzejyh9u7", category: "division", content: "cm1eqwkvu00017j2b8qnisp9g" }
})
return {

2
src/app/api/version-app/route.ts
View File

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
export async function GET(request: Request) {
try {
return NextResponse.json({ success: true, version: "1.5.3", tahap: "beta", update: "-percobaan firebase admin fcm many device" }, { status: 200 });
return NextResponse.json({ success: true, version: "1.5.4", tahap: "beta", update: "-percobaan firebase admin fcm many device (tambah pengumuman)" }, { 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 });

1
src/lib/firebase/fcm.ts
View File

@@ -44,7 +44,6 @@ export async function sendFCM(token: string[], title: string, body: string) {
tokens: token,
...message,
})
console.log("✅ FCM berhasil dikirim:", result);
if (result.failureCount > 0) {
const failedTokens: any[] = [];
result.responses.forEach((resp, idx) => {

17
src/module/_global/fun/delete_device_error.ts Normal file
View File

@@ -0,0 +1,17 @@
import { prisma } from "@/module/_global";
export default async function deleteDeviceError({ device }: { device: string[] }) {
try {
const deleteToken = await prisma.tokenDeviceUser.deleteMany({
where: {
token: {
in: device
}
}
});
return { success: true, message: "Success" }
} catch (error) {
console.error(error)
return { success: false, message: "Internal Server Error" }
}
}

4
src/module/_global/index.ts
View File

@@ -30,6 +30,7 @@ import { funSendWebPush } from "./fun/send_web_push";
import ViewFilterData from "./view/view_filter_kategori_data";
import LayoutModalNew from "./layout/layout_modal_new";
import { funReadPdf } from "./fun/read_pdf";
import deleteDeviceError from "./fun/delete_device_error";
export { WARNA };
export { LayoutLogin };
@@ -68,4 +69,5 @@ export { funViewDir }
export { funSendWebPush }
export { ViewFilterData }
export { LayoutModalNew }
export { funReadPdf }
export { funReadPdf }
export { deleteDeviceError }

15
xsendMany.ts
View File

@@ -1,4 +1,4 @@
// Impor Firebase Admin SDK
import { deleteDeviceError } from '@/module/_global';
import CryptoJs from 'crypto-js';
import { cert, getApps, initializeApp } from "firebase-admin/app";
import { getMessaging } from "firebase-admin/messaging";
@@ -46,8 +46,17 @@ export async function sendFCMNotificationMany({ token, title, body, data }: { to
tokens: token,
...message,
} as any);
console.log("Notifikasi berhasil dikirim:", response);
return response;
if (response.failureCount > 0) {
const failedTokens: any[] = [];
response.responses.forEach((resp, idx) => {
if (!resp.success) {
failedTokens.push(token[idx]);
}
});
const del = await deleteDeviceError({ device: failedTokens });
}
return { success: true, message: "Notifikasi berhasil dikirim", };
} catch (error) {
console.error("Error mengirim notifikasi:", error);
throw error;