Merge pull request 'amalia/07-okt-25' (#58 ) from amalia/07-okt-25 into join

Reviewed-on: bip/sistem-desa-mandiri#58
upd: api version
2025-10-07 17:42:53 +08:00 · 2025-10-07 17:11:18 +08:00 · 2025-10-07 17:09:36 +08:00 · 2025-10-07 16:36:34 +08:00 · 2025-10-07 15:09:20 +08:00 · 2025-10-07 12:01:19 +08:00
15 changed files with 253 additions and 97 deletions
--- a/src/app/api/home/route.ts
+++ b/src/app/api/home/route.ts
@@ -1,4 +1,3 @@
-import { DivisionProject } from './../../../../node_modules/.prisma/client/index.d';
 import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import _, { ceil } from "lodash";
@@ -36,22 +35,28 @@ export async function GET(request: Request) {
                  isActive: true,
               }
            }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         } else {
            kondisi = {
               isActive: true,
               idGroup: idGroup
            }
-         } else {
-            kondisi = {
-               isActive: true,
-               idGroup: idGroup,
-               ProjectMember: {
-                  some: {
-                     idUser: user.id
-                  }
-               }
-            }
         }
+         //  else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         //    kondisi = {
+         //       isActive: true,
+         //       idGroup: idGroup
+         //    }
+         // } else {
+         //    kondisi = {
+         //       isActive: true,
+         //       idGroup: idGroup,
+         //       ProjectMember: {
+         //          some: {
+         //             idUser: user.id
+         //          }
+         //       }
+         //    }
+         // }

         const data = await prisma.project.findMany({
            skip: 0,
@@ -96,22 +101,28 @@ export async function GET(request: Request) {
                  isActive: true,
               }
            }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         } else {
            kondisi = {
               isActive: true,
               idGroup: idGroup
            }
-         } else {
-            kondisi = {
-               isActive: true,
-               idGroup: idGroup,
-               DivisionMember: {
-                  some: {
-                     idUser: user.id
-                  }
-               }
-            }
         }
+         // else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         //    kondisi = {
+         //       isActive: true,
+         //       idGroup: idGroup
+         //    }
+         // } else {
+         //    kondisi = {
+         //       isActive: true,
+         //       idGroup: idGroup,
+         //       DivisionMember: {
+         //          some: {
+         //             idUser: user.id
+         //          }
+         //       }
+         //    }
+         // }

         const data = await prisma.division.findMany({
            where: kondisi,
@@ -134,7 +145,9 @@ export async function GET(request: Request) {
            jumlah: v.DivisionProject.length,
         }))

-         allData = _.orderBy(format, 'jumlah', 'desc').slice(0, 5)
+         const filter = format.filter((v: any) => v.jumlah > 0)
+
+         allData = _.orderBy(filter, 'jumlah', 'desc').slice(0, 5)

      } else if (kategori == "progress") {
         let kondisi
@@ -143,37 +156,50 @@ export async function GET(request: Request) {
         if (roleUser == "supadmin" || roleUser == "developer") {
            kondisi = {
               isActive: true,
-               Division: {
+               idVillage: idVillage,
+               Group: {
                  isActive: true,
-                  idVillage: idVillage,
-                  Group: {
-                     isActive: true,
-                  }
-               }
-            }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
-            kondisi = {
-               isActive: true,
-               Division: {
-                  isActive: true,
-                  idGroup: idGroup
               }
            }
+            // kondisi = {
+            //    isActive: true,
+            //    Division: {
+            //       isActive: true,
+            //       idVillage: idVillage,
+            //       Group: {
+            //          isActive: true,
+            //       }
+            //    }
+            // }
         } else {
            kondisi = {
               isActive: true,
-               Division: {
-                  isActive: true,
-                  DivisionMember: {
-                     some: {
-                        idUser: user.id
-                     }
-                  }
-               }
+               idGroup: idGroup
            }
         }
+         // else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         //    kondisi = {
+         //       isActive: true,
+         //       Division: {
+         //          isActive: true,
+         //          idGroup: idGroup
+         //       }
+         //    }
+         // } else {
+         //    kondisi = {
+         //       isActive: true,
+         //       Division: {
+         //          isActive: true,
+         //          DivisionMember: {
+         //             some: {
+         //                idUser: user.id
+         //             }
+         //          }
+         //       }
+         //    }
+         // }

-         const data = await prisma.divisionProject.groupBy({
+         const data = await prisma.project.groupBy({
            where: kondisi,
            by: ["status"],
            _count: true
@@ -218,7 +244,7 @@ export async function GET(request: Request) {
                  }
               }
            }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         } else {
            kondisi = {
               isActive: true,
               category: 'FILE',
@@ -227,20 +253,30 @@ export async function GET(request: Request) {
                  idGroup: idGroup
               }
            }
-         } else {
-            kondisi = {
-               isActive: true,
-               category: 'FILE',
-               Division: {
-                  isActive: true,
-                  DivisionMember: {
-                     some: {
-                        idUser: user.id
-                     }
-                  }
-               }
-            }
         }
+         // else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         //    kondisi = {
+         //       isActive: true,
+         //       category: 'FILE',
+         //       Division: {
+         //          isActive: true,
+         //          idGroup: idGroup
+         //       }
+         //    }
+         // } else {
+         //    kondisi = {
+         //       isActive: true,
+         //       category: 'FILE',
+         //       Division: {
+         //          isActive: true,
+         //          DivisionMember: {
+         //             some: {
+         //                idUser: user.id
+         //             }
+         //          }
+         //       }
+         //    }
+         // }

         const data = await prisma.divisionDocumentFolderFile.findMany({
            where: kondisi,
@@ -377,7 +413,7 @@ export async function GET(request: Request) {
                  }
               }
            }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         } else {
            kondisi = {
               isActive: true,
               status: 1,
@@ -386,20 +422,30 @@ export async function GET(request: Request) {
                  isActive: true
               }
            }
-         } else {
-            kondisi = {
-               isActive: true,
-               status: 1,
-               Division: {
-                  isActive: true,
-                  DivisionMember: {
-                     some: {
-                        idUser: user.id
-                     }
-                  }
-               }
-            }
         }
+         // else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         //    kondisi = {
+         //       isActive: true,
+         //       status: 1,
+         //       Division: {
+         //          idGroup: idGroup,
+         //          isActive: true
+         //       }
+         //    }
+         // } else {
+         //    kondisi = {
+         //       isActive: true,
+         //       status: 1,
+         //       Division: {
+         //          isActive: true,
+         //          DivisionMember: {
+         //             some: {
+         //                idUser: user.id
+         //             }
+         //          }
+         //       }
+         //    }
+         // }

         const data = await prisma.divisionDisscussion.findMany({
            skip: 0,
--- a/src/app/api/mobile/announcement/route.ts
+++ b/src/app/api/mobile/announcement/route.ts
@@ -255,15 +255,20 @@ export async function POST(request: Request) {


        const dataNotifFilter = dataNotif.filter((v: any) => v.idUserTo != undefined && v.idUserTo != null && v.idUserTo != "" && v.idUserTo != userId)
+        const dataNotifFilterUnique = dataNotifFilter
+            .filter((v: any, index: number, self: any[]) =>
+                index === self.findIndex((t: any) => t.idUserTo == v.idUserTo)
+            )

        const pushNotif = dataPush.filter((item) => item.subscription != undefined)

        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Pengumuman Baru', body: title } })
        const insertNotif = await prisma.notifications.createMany({
-            data: dataNotifFilter
+            data: dataNotifFilterUnique
        })

        const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
+
        await sendFCMNotificationMany({
            token: tokenUnique,
            title: "Pengumuman Baru",
--- a/src/app/api/mobile/discussion-general/[id]/comment/route.ts
+++ b/src/app/api/mobile/discussion-general/[id]/comment/route.ts
@@ -37,6 +37,29 @@ export async function POST(request: Request, context: { params: { id: string } }
         }
      })

+      const dataDiscussion = await prisma.discussion.findUnique({
+         where: {
+            id
+         },
+         select: {
+            createdBy: true,
+            User: {
+               select: {
+                  Subscribe: {
+                     select: {
+                        subscription: true
+                     }
+                  },
+                  TokenDeviceUser: {
+                     select: {
+                        token: true
+                     }
+                  }
+               }
+            }
+         }
+      })
+
      const member = await prisma.discussionMember.findMany({
         where: {
            idDiscussion: id,
@@ -70,7 +93,10 @@ export async function POST(request: Request, context: { params: { id: string } }
         }
      })

-      const memberFilter = member.filter((v: any) => v.idUser != userMobile.id)
+      const memberFilter = [...member, { idUser: dataDiscussion?.createdBy, User: dataDiscussion?.User }].filter((v: any) => v.idUser != userMobile.id)
+         .filter((v: any, index: number, self: any[]) =>
+            index === self.findIndex((t) => t.idUser === v.idUser)
+         );

      const dataFCM = memberFilter.map((v: any) => ({
         ..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
--- a/src/app/api/mobile/discussion-general/route.ts
+++ b/src/app/api/mobile/discussion-general/route.ts
@@ -210,9 +210,13 @@ export async function POST(request: Request) {
      }

      dataNotif.filter((v: any) => v.idUserTo != undefined && v.idUserTo != null && v.idUserTo != "" && v.idUserTo != userId)
+      const dataNotifUnique = dataNotif
+         .filter((v: any, index: number, self: any[]) =>
+            index === self.findIndex((t: any) => t.idUserTo == v.idUserTo)
+         )

      const insertNotif = await prisma.notifications.createMany({
-         data: dataNotif
+         data: dataNotifUnique
      })

      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
--- a/src/app/api/mobile/discussion/[id]/comment/route.ts
+++ b/src/app/api/mobile/discussion/[id]/comment/route.ts
@@ -50,6 +50,21 @@ export async function POST(request: Request, context: { params: { id: string } }
            },
            select: {
                idDivision: true,
+                createdBy: true,
+                User: {
+                    select: {
+                        Subscribe: {
+                            select: {
+                                subscription: true
+                            }
+                        },
+                        TokenDeviceUser: {
+                            select: {
+                                token: true
+                            }
+                        }
+                    }
+                }
            }
        })

@@ -86,7 +101,10 @@ export async function POST(request: Request, context: { params: { id: string } }
            }
        })

-        const memberFilter = member.filter((v: any) => v.idUser != userMobile.id)
+        const memberFilter = [...member, { idUser: dataDivision?.createdBy, User: dataDivision?.User }].filter((v: any) => v.idUser != userMobile.id)
+            .filter((v: any, index: number, self: any[]) =>
+                index === self.findIndex((t) => t.idUser === v.idUser)
+            );

        const dataFCM = memberFilter.map((v: any) => ({
            ..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
--- a/src/app/api/mobile/discussion/route.ts
+++ b/src/app/api/mobile/discussion/route.ts
@@ -263,12 +263,16 @@ export async function POST(request: Request) {
      }

      const dataNotifFilter = dataNotif.filter((v: any) => v.idUserTo != undefined && v.idUserTo != null && v.idUserTo != "" && v.idUserTo != userId)
+      const dataNotifFilterUnique = dataNotifFilter
+         .filter((v: any, index: number, self: any[]) =>
+            index === self.findIndex((t: any) => t.idUserTo == v.idUserTo)
+         )

      const pushNotif = dataPush.filter((item) => item.subscription != undefined)

      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: deskripsiNotif, title: 'Diskusi Baru' } })
      const insertNotif = await prisma.notifications.createMany({
-         data: dataNotifFilter
+         data: dataNotifFilterUnique
      })

      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
--- a/src/app/api/mobile/division/route.ts
+++ b/src/app/api/mobile/division/route.ts
@@ -314,12 +314,16 @@ export async function POST(request: Request) {
      }

      const dataNotifFilter = dataNotif.filter((v: any) => v.idUserTo != undefined && v.idUserTo != null && v.idUserTo != "" && v.idUserTo != userId)
+      const dataNotifFilterUnique = dataNotifFilter
+         .filter((v: any, index: number, self: any[]) =>
+            index === self.findIndex((t: any) => t.idUserTo == v.idUserTo)
+         )

      const pushNotif = dataPush.filter((item) => item.subscription != undefined)

      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Divisi Baru', body: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.` } })
      const insertNotif = await prisma.notifications.createMany({
-         data: dataNotifFilter
+         data: dataNotifFilterUnique
      })

      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
@@ -338,4 +342,45 @@ export async function POST(request: Request) {
      console.error(error);
      return NextResponse.json({ success: false, message: "Gagal menambahkan divisi, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
   }
+};
+
+
+// CEK DATA DIVISI (NAME DI DESA DAN GROUP YG SAMA)
+export async function PUT(request: Request) {
+   try {
+
+      const sent = (await request.json())
+      const user = sent.user
+      const userMobile = await funGetUserById({ id: String(user) })
+      if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
+         return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
+      }
+
+      let fixGroup
+      if (sent.data.idGroup == "null" || sent.data.idGroup == undefined || sent.data.idGroup == "") {
+         fixGroup = userMobile.idGroup
+      } else {
+         fixGroup = sent.data.idGroup
+      }
+
+      const checkData = await prisma.division.count({
+         where: {
+            name: {
+               equals: sent.data.name,
+               mode: "insensitive"
+            },
+            idGroup: fixGroup,
+            idVillage: String(userMobile.idVillage)
+         }
+      })
+
+      if (checkData > 0) {
+         return NextResponse.json({ success: true, message: "Divisi dengan nama ini sudah ada", available: false }, { status: 200 });
+      }
+
+      return NextResponse.json({ success: true, message: "Berhasil cek data divisi", available: true }, { status: 200 });
+   } catch (error) {
+      console.error(error);
+      return NextResponse.json({ success: false, message: "Gagal menambahkan divisi, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
+   }
 };
--- a/src/app/api/mobile/home/route.ts
+++ b/src/app/api/mobile/home/route.ts
@@ -425,19 +425,19 @@ export async function GET(request: Request) {
               isActive: true,
               status: 1,
               idVillage: idVillage
-            },
+            }

-               kondisi = {
+            kondisi = {
+               isActive: true,
+               status: 1,
+               Division: {
                  isActive: true,
-                  status: 1,
-                  Division: {
+                  idVillage: idVillage,
+                  Group: {
                     isActive: true,
-                     idVillage: idVillage,
-                     Group: {
-                        isActive: true,
-                     }
                  }
               }
+            }
         } else {
            kondisiUmum = {
               isActive: true,
--- a/src/app/api/mobile/project/[id]/route.ts
+++ b/src/app/api/mobile/project/[id]/route.ts
@@ -71,7 +71,7 @@ export async function GET(request: Request, context: { params: { id: string } })
                    createdAt: true
                },
                orderBy: {
-                    createdAt: 'asc'
+                    dateStart: 'asc'
                }
            })

--- a/src/app/api/mobile/project/route.ts
+++ b/src/app/api/mobile/project/route.ts
@@ -385,11 +385,15 @@ export async function POST(request: Request) {
        }

        const dataNotifFilter = dataNotif.filter((item) => item.idUserTo != undefined && item.idUserTo != null && item.idUserTo != "" && item.idUserTo != userId)
+        const dataNotifFilterUnique = dataNotifFilter
+            .filter((v: any, index: number, self: any[]) =>
+                index === self.findIndex((t: any) => t.idUserTo == v.idUserTo)
+            )
        const pushNotif = dataPush.filter((item) => item.subscription != undefined)

        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Kegiatan Baru', body: title } })
        const insertNotif = await prisma.notifications.createMany({
-            data: dataNotifFilter
+            data: dataNotifFilterUnique
        })

        const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
--- a/src/app/api/mobile/task/[id]/route.ts
+++ b/src/app/api/mobile/task/[id]/route.ts
@@ -76,7 +76,7 @@ export async function GET(request: Request, context: { params: { id: string } })
               dateEnd: true,
            },
            orderBy: {
-               createdAt: 'asc'
+               dateStart: 'asc'
            }
         })

--- a/src/app/api/mobile/task/route.ts
+++ b/src/app/api/mobile/task/route.ts
@@ -356,11 +356,15 @@ export async function POST(request: Request) {
      }

      const dataNotifFilter = dataNotif.filter((v: any) => v.idUserTo != undefined && v.idUserTo != null && v.idUserTo != "" && v.idUserTo != userId)
+      const dataNotifFilterUnique = dataNotifFilter
+         .filter((v: any, index: number, self: any[]) =>
+            index === self.findIndex((t: any) => t.idUserTo == v.idUserTo)
+         )
      const pushNotif = dataPush.filter((item) => item.subscription != undefined)

      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: title, title: 'Tugas Divisi Baru' } })
      const insertNotif = await prisma.notifications.createMany({
-         data: dataNotifFilter
+         data: dataNotifFilterUnique
      })

      const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
--- a/src/app/api/project/[id]/route.ts
+++ b/src/app/api/project/[id]/route.ts
@@ -68,7 +68,7 @@ export async function GET(request: Request, context: { params: { id: string } })
                    createdAt: true
                },
                orderBy: {
-                    createdAt: 'asc'
+                    dateStart: 'asc'
                }
            })

@@ -78,8 +78,8 @@ export async function GET(request: Request, context: { params: { id: string } })
                dateEnd: moment(v.dateEnd).format("DD-MM-YYYY"),
                createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
            }))
-            const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
-            allData = dataFix
+            // const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
+            allData = formatData

        } else if (kategori == "file") {
            const dataFile = await prisma.projectFile.findMany({
--- a/src/app/api/task/[id]/route.ts
+++ b/src/app/api/task/[id]/route.ts
@@ -75,7 +75,7 @@ export async function GET(request: Request, context: { params: { id: string } })
               dateEnd: true,
            },
            orderBy: {
-               createdAt: 'asc'
+               dateStart: 'asc'
            }
         })

--- a/src/app/api/version-app/route.ts
+++ b/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: "2.0.4", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -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; -api jenna ai; -privacy policy" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "2.0.6", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -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; -api jenna ai; -privacy policy" }, { 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 });
Author	SHA1	Message	Date
amaliadwiy	389f115923	Merge pull request 'amalia/07-okt-25' (#58 ) from amalia/07-okt-25 into join Reviewed-on: bip/sistem-desa-mandiri#58	2025-10-07 17:42:53 +08:00
amaliadwiy	2251818908	upd: api version	2025-10-07 17:11:18 +08:00
amaliadwiy	b625150eb5	upd: api home website Deskripsi: - update home api website jadi sama kyk mobile NO Issues	2025-10-07 17:09:36 +08:00
amaliadwiy	bae91db60a	upd: penerima notifikasi Deskripsi: - pembuat data mendapat notifikasi saat user memberi komentar walaupun pembuat data bukan merupakan anggota dari diskusi umum maupun anggota divisi - diskusi umum dan diskusi divis No Issues	2025-10-07 16:36:34 +08:00
amaliadwiy	150151e823	upd: order tugas Deskripsi: - order tugas pada tugas divisi dan kegiatan NO Issues'	2025-10-07 15:09:20 +08:00
amaliadwiy	d1a591a63a	upd: api mobile Deskripsi: - check nama divisi No Issues	2025-10-07 12:01:19 +08:00
amaliadwiy	7e80a1f311	Merge pull request 'fix:api mobile' (#57 ) from amalia/06-okt-25 into join Reviewed-on: bip/sistem-desa-mandiri#57	2025-10-06 17:23:56 +08:00
amaliadwiy	b648735b06	fix:api mobile Deskripsi: - filter notif duplikat pada fitur pengumuman, diskusi umum, diskusi divisi, divisi, kegiatan dan tugas divisi NO Issues	2025-10-06 17:08:07 +08:00
amaliadwiy	a3d8bf1e92	Merge pull request 'upd: home api mobile' (#56 ) from amalia/03-okt-25 into join Reviewed-on: bip/sistem-desa-mandiri#56	2025-10-03 17:32:20 +08:00
amaliadwiy	c2c52ed5fd	upd: home api mobile	2025-10-03 16:53:31 +08:00