Merge pull request #285 from bipproduction/amalia/03-okt-24

Amalia/03 okt 24

src/app/(application)/web-push/page.tsx

@@ -2,10 +2,10 @@ import { NotificationManager } from "@/module/_global/components/notification_ma
 
 const publicKey = process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY!;
 
-console.log(
-  process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY,
-  process.env.VAPID_PRIVATE_KEY
-);
+// console.log(
+//   process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY,
+//   process.env.VAPID_PRIVATE_KEY
+// );
 
 export default function Page() {
   return (

src/app/api/home/route.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
-import _, { ceil } from "lodash";
+import _, { ceil, some } from "lodash";
 import moment from "moment";
 import "moment/locale/id";
 import { NextResponse } from "next/server";
@@ -35,11 +35,21 @@ export async function GET(request: Request) {
                   isActive: true,
                }
             }
-         } else {
+         } 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({
@@ -133,17 +143,31 @@ export async function GET(request: Request) {
             kondisi = {
                isActive: true,
                Division: {
+                  isActive: true,
                   idVillage: idVillage,
                   Group: {
                      isActive: true,
                   }
                }
             }
+         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+            kondisi = {
+               isActive: true,
+               Division: {
+                  isActive: true,
+                  idGroup: idGroup
+               }
+            }
          } else {
             kondisi = {
                isActive: true,
                Division: {
-                  idGroup: idGroup
+                  isActive: true,
+                  DivisionMember: {
+                     some: {
+                        idUser: user.id
+                     }
+                  }
                }
             }
          }
@@ -185,18 +209,33 @@ export async function GET(request: Request) {
                isActive: true,
                category: 'FILE',
                Division: {
+                  isActive: true,
                   idVillage: idVillage,
                   Group: {
                      isActive: true,
                   }
                }
             }
+         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+            kondisi = {
+               isActive: true,
+               category: 'FILE',
+               Division: {
+                  isActive: true,
+                  idGroup: idGroup
+               }
+            }
          } else {
             kondisi = {
                isActive: true,
                category: 'FILE',
                Division: {
-                  idGroup: idGroup
+                  isActive: true,
+                  DivisionMember: {
+                     some: {
+                        idUser: user.id
+                     }
+                  }
                }
             }
          }
@@ -284,7 +323,7 @@ export async function GET(request: Request) {
                dateEnd: true,
                createdAt: true,
                status: true,
-               idDivision:true,
+               idDivision: true,
                DivisionCalendar: {
                   select: {
                      title: true,
@@ -327,18 +366,33 @@ export async function GET(request: Request) {
                isActive: true,
                status: 1,
                Division: {
+                  isActive: true,
                   idVillage: idVillage,
                   Group: {
                      isActive: true,
                   }
                }
             }
+         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+            kondisi = {
+               isActive: true,
+               status: 1,
+               Division: {
+                  idGroup: idGroup,
+                  isActive: true
+               }
+            }
          } else {
             kondisi = {
                isActive: true,
                status: 1,
                Division: {
-                  idGroup: idGroup
+                  isActive: true,
+                  DivisionMember: {
+                     some: {
+                        idUser: user.id
+                     }
+                  }
                }
             }
          }

src/app/api/send-notification/route.ts

@@ -36,9 +36,9 @@ export async function POST() {
         const subscriptionData = sub.data as any;
 
         await webpush.sendNotification(subscriptionData, notificationPayload);
-        console.log(
-          `Notification sent successfully to ${subscriptionData.endpoint}`
-        );
+        // console.log(
+        //   `Notification sent successfully to ${subscriptionData.endpoint}`
+        // );
         successCount++;
       } catch (error: any) {
         console.error(

src/app/api/user/route.ts

@@ -167,7 +167,7 @@ export async function POST(request: Request) {
 
     const cekPhone = await prisma.user.count({
       where: {
-        phone: data.phone
+        phone: "62" + data.phone
       },
     });
 
@@ -177,7 +177,7 @@ export async function POST(request: Request) {
         data: {
           nik: data.nik,
           name: data.name,
-          phone: data.phone,
+          phone: "62" + data.phone,
           email: data.email,
           gender: data.gender,
           idGroup: groupFix,