diff --git a/src/app/api/mobile/home/route.ts b/src/app/api/mobile/home/route.ts
index 98dbddc..068d399 100644
--- a/src/app/api/mobile/home/route.ts
+++ b/src/app/api/mobile/home/route.ts
@@ -37,22 +37,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,
@@ -97,24 +103,30 @@ 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,
             select: {
@@ -147,42 +159,63 @@ 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
                }
             }
          } else {
             kondisi = {
                isActive: true,
-               Division: {
-                  isActive: true,
-                  DivisionMember: {
-                     some: {
-                        idUser: user.id
-                     }
-                  }
-               }
+               idGroup: idGroup
             }
          }
 
-         const data = await prisma.divisionProject.groupBy({
+         // if (roleUser == "supadmin" || roleUser == "developer") {
+         //    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: {
+         //          isActive: true,
+         //          DivisionMember: {
+         //             some: {
+         //                idUser: user.id
+         //             }
+         //          }
+         //       }
+         //    }
+         // }
+
+         const data = await prisma.project.groupBy({
             where: kondisi,
             by: ["status"],
             _count: true
          })
 
+         // const data = await prisma.divisionProject.groupBy({
+         //    where: kondisi,
+         //    by: ["status"],
+         //    _count: true
+         // })
+
          const dataStatus = [{ name: 'Segera dikerjakan', status: 0, color: '#177AD5' }, { name: 'Dikerjakan', status: 1, color: '#fac858' }, { name: 'Selesai dikerjakan', status: 2, color: '#92cc76' }, { name: 'Dibatalkan', status: 3, color: '#ED6665' }]
          const hasil: any[] = []
          let input
@@ -225,7 +258,7 @@ export async function GET(request: Request) {
                   }
                }
             }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+         } else {
             kondisi = {
                isActive: true,
                category: 'FILE',
@@ -234,21 +267,32 @@ 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,
          })
@@ -373,22 +417,34 @@ export async function GET(request: Request) {
          }))
 
       } else if (kategori == "discussion") {
-         let kondisi
+         let kondisi, kondisiUmum
 
          // klo perbekel/developer == semua grup
          if (roleUser == "supadmin" || roleUser == "developer") {
-            kondisi = {
+            kondisiUmum = {
                isActive: true,
                status: 1,
-               Division: {
+               idVillage: idVillage
+            },
+
+               kondisi = {
                   isActive: true,
-                  idVillage: idVillage,
-                  Group: {
+                  status: 1,
+                  Division: {
                      isActive: true,
+                     idVillage: idVillage,
+                     Group: {
+                        isActive: true,
+                     }
                   }
                }
+         } else {
+            kondisiUmum = {
+               isActive: true,
+               status: 1,
+               idGroup: idGroup,
             }
-         } else if (roleUser == "admin" || roleUser == "cosupadmin") {
+
             kondisi = {
                isActive: true,
                status: 1,
@@ -397,20 +453,52 @@ 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
+         //             }
+         //          }
+         //       }
+         //    }
+         // }
+
+
+         // TODO: 
+         // const dataUmum = await prisma.discussion.findMany({
+         //    skip: 0,
+         //    take: 5,
+         //    where: kondisiUmum,
+         //    select: {
+         //       id: true,
+         //       title: true,
+         //       desc: true,
+         //       createdAt: true,
+         //       User: {
+         //          select: {
+         //             name: true
+         //          }
+         //       }
+         //    },
+         //    orderBy: {
+         //       createdAt: "desc"
+         //    }
+         // })
 
          const data = await prisma.divisionDisscussion.findMany({
             skip: 0,