Compare commits

..

8 Commits

Author SHA1 Message Date
f05571caa4 Simpan notifikasi ke database
Add:
- prisma/migrations/20251218071503_add_type_on_db_notifikasi/
- src/app/api/mobile/notification/

Fix:
- modified:   prisma/schema.prisma
- modified:   src/app/api/mobile/auth/device-tokens/route.ts
- deleted:    src/app/api/mobile/notifications/route.ts
- modified:   x.sh

###No Issue
2025-12-19 16:38:33 +08:00
6507bdcd35 chore(release): 1.5.30 2025-12-19 16:35:08 +08:00
e2c8a1edbc chore(release): 1.5.29 2025-12-17 17:41:02 +08:00
02b25ffc84 Penerapaan ke database untuk token device
Add:
src/app/api/mobile/auth/device-tokens/[id]/

Fix:
modified:   src/app/api/mobile/auth/device-tokens/route.ts
modified:   src/app/api/mobile/notifications/route.ts

### No Issue
2025-12-17 17:40:56 +08:00
3e0d2743fb Fix DB table donasi:
- Relasi ke master bank dengan nilai default NULL

### No issue
2025-12-17 14:43:09 +08:00
fc3ee6724e chore(release): 1.5.28 2025-12-17 14:42:19 +08:00
a72cf866fa Fix API Login dan filter 0 di input nomor
### No Issue
2025-12-17 11:40:01 +08:00
c50e0ceaf7 chore(release): 1.5.27 2025-12-17 11:07:15 +08:00
15 changed files with 355 additions and 73 deletions

View File

@@ -2,6 +2,14 @@
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.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)
## [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)

View File

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

View File

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

View File

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

View File

@@ -587,7 +587,7 @@ model Donasi_Invoice {
imageId String?
MasterBank MasterBank? @relation(fields: [masterBankId], references: [id])
masterBankId String? @default("null")
masterBankId String?
}
model Donasi_Kabar {
@@ -987,6 +987,7 @@ model Notifikasi {
isRead Boolean @default(false)
readAt DateTime? // kapan user membaca notifikasi ini
deepLink String? // misal: "announcement/123", "user/profile/cmha6wb9w0001cfndwl9fcse6"
type String?
Role MasterUserRole? @relation(fields: [userRoleId], references: [id])
userRoleId String

View File

@@ -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}`,
{ cache: "no-cache" }
`https://cld-dkr-prod-wajs-server.wibudev.com/api/wa/code?nom=${nomor}&text=${msg}`,
{
cache: "no-cache",
headers: {
Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
},
}
);
const sendWa = await res.json();
if (sendWa.status !== "success")
if (res.status !== 200)
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 }
);
}
}
}

View File

@@ -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(
`https://wa.wibudev.com/code?nom=${nomor}&text=${msg}`,
{ cache: "no-cache" }
const res = await fetch(
`https://cld-dkr-prod-wajs-server.wibudev.com/api/wa/code?nom=${nomor}&text=${msg}`,
{
cache: "no-cache",
headers: {
Authorization: `Bearer ${process.env.WA_SERVER_TOKEN}`,
},
}
);
const sendWa = await res.json();
if (sendWa.status !== "success")
if (res.status !== 200)
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,

View File

@@ -0,0 +1,44 @@
import { NextRequest, NextResponse } from "next/server";
import { prisma } from "@/lib";
export { DELETE };
async function DELETE(
request: NextRequest,
{ params }: { params: { id: string } }
) {
const { id } = params;
try {
const findFirst = await prisma.tokenUserDevice.findFirst({
where: {
userId: id,
},
});
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 }
);
}
}

View File

@@ -1,13 +1,14 @@
import { NextRequest, NextResponse } from "next/server";
import { prisma } from "@/lib";
export async function POST(request: NextRequest) {
export { POST, GET };
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,6 +24,9 @@ export async function POST(request: NextRequest) {
},
});
console.log("✅ EX", existing);
let deviceToken;
if (existing) {
@@ -62,3 +66,22 @@ export 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 }
);
}
}

View File

@@ -0,0 +1,49 @@
import { prisma } from "@/lib";
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");
try {
let fixData;
if (category === "count-as-unread") {
const data = await prisma.notifikasi.findMany({
where: {
userId: id,
isRead: false,
},
});
fixData = data.length;
} else if (category === "all") {
const data = await prisma.notifikasi.findMany({
where: {
userId: id,
},
});
fixData = data;
} else {
return NextResponse.json({
success: false,
message: "Invalid category",
});
}
return NextResponse.json({
success: true,
data: fixData,
});
} catch (error) {
return NextResponse.json(
{ error: (error as Error).message },
{ status: 500 }
);
}
}

View File

@@ -0,0 +1,32 @@
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("Id >>", id);
try {
const data = await prisma.notifikasi.findMany({
where: {
userId: id,
isRead: false,
},
});
console.log("Data >>", data);
return NextResponse.json({
success: true,
data: data.length,
});
} catch (error) {
return NextResponse.json({
success: false,
message: "Failed to get unread count",
});
}
}

View File

@@ -0,0 +1,124 @@
// app/api/test/notifications/route.ts
import { adminMessaging } from "@/lib/firebase-admin";
import { NextRequest, NextResponse } from "next/server";
import { prisma } from "@/lib";
export async function POST(request: NextRequest) {
try {
const { data } = await request.json();
const {
fcmToken,
title,
body: notificationBody,
userLoginId,
type,
kategoriApp,
} = data;
console.log("Data Notifikasi >>", data);
if (!fcmToken || !title) {
return NextResponse.json(
{ error: "Missing fcmToken or title" },
{ status: 400 }
);
}
const findUserLogin = await prisma.user.findUnique({
where: {
id: userLoginId,
},
});
if (!findUserLogin) {
return NextResponse.json({ error: "User not found" }, { status: 404 });
}
const deviceToken = await prisma.tokenUserDevice.findMany({
where: {
isActive: true,
NOT: {
userId: findUserLogin.id,
},
},
include: {
user: true,
},
});
for (let i of deviceToken) {
const message = {
token: i.token,
notification: {
title,
body: notificationBody || "",
},
data: {
sentAt: new Date().toISOString(), // ✅ Simpan metadata di data
// contoh: senderId, type, etc.
},
};
console.log("[MSG]", message);
if (i.user?.masterUserRoleId === "1") {
const createNotification = await prisma.notifikasi.create({
data: {
title,
type,
createdAt: message.data.sentAt,
appId: "test-id-app",
userRoleId: findUserLogin.masterUserRoleId,
kategoriApp: "PERCOBAAN",
pesan: notificationBody || "",
userId: i.userId,
},
});
if (createNotification) {
const response = await adminMessaging.send(message);
console.log("✅ FCM sent:", response);
} else {
return NextResponse.json({
success: false,
message: "Failed to create notification",
});
}
} else {
const createNotification = await prisma.notifikasi.create({
data: {
title,
type,
createdAt: message.data.sentAt,
appId: "test-id-app",
userRoleId: findUserLogin.masterUserRoleId,
kategoriApp: "PERCOBAAN",
pesan: notificationBody || "",
adminId: i.userId,
},
});
if (createNotification) {
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 }
);
}
}

View File

@@ -1,44 +0,0 @@
// 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 }
);
}
}

View File

@@ -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) => {
setPhone(val);
inputStyle={{ width: "100%", backgroundColor: MainColor.login }}
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);
}}
/>

7
x.sh
View File

@@ -3,10 +3,13 @@ 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/notifications \
curl -X POST ${URL}/api/mobile/notification \
-H "Content-Type: application/json" \
-d '{
"fcmToken": "cVmHm-3P4E-1vjt6AA9kSF:APA91bHTkHjGTLxrFsb6Le6bZmzboZhwMGYXU4p0FP9yEeXixLDXNKS4F5vLuZV3sRgSnjjQsPpLOgstVLHJB8VJTObctKLdN-CxAp4dnP7Jbc_mH53jWvs",
"title": "Test dari Backend (App Router)!",
"body": "Berhasil di App Router!"
"body": "Berhasil di App Router!",
"userLoginId": "cmha7p6yc0000cfoe5w2e7gdr",
"type": "NOTIFICATION",
"kategoriApp": "PERCOBAAN"
}'