Merge branch 'join' into lukman/1-agustus-2024

src/module/seeder/data/admin.json

@@ -0,0 +1,26 @@
+[
+   {
+      "id": "devAmalia",
+      "idAdminRole": "dev",
+      "name": "Amalia",
+      "phone": "628980185458",
+      "email": "amalia@bip.com",
+      "gender": "F"
+   },
+   {
+      "id": "devLukman",
+      "idAdminRole": "dev",
+      "name": "Lukman",
+      "phone": "6287701790942",
+      "email": "lukman@bip.com",
+      "gender": "M"
+   },
+   {
+      "id": "devLukman",
+      "idAdminRole": "dev",
+      "name": "Malik",
+      "phone": "6289697338821",
+      "email": "malik@bip.com",
+      "gender": "M"
+   }
+]

src/module/seeder/data/admin_role.json

@@ -0,0 +1,10 @@
+[
+   {
+      "id": "dev",
+      "name": "Developer"
+   },
+   {
+      "id": "admin",
+      "name": "Admin"
+   }
+]

src/module/seeder/data/desa.json

@@ -0,0 +1,7 @@
+[
+   {
+      "id": "desa1",
+      "name": "Darmasaba",
+      "desc": "-"
+   }
+]

src/module/seeder/data/group.json

@@ -0,0 +1,7 @@
+[
+   {
+      "id": "group1",
+      "idVillage": "desa1",
+      "name": "Dinas"
+   }
+]

src/module/seeder/data/position.json

@@ -0,0 +1,7 @@
+[
+   {
+      "id": "position1",
+      "idGroup": "group1",
+      "name": "Perbekel"
+   }
+]

src/module/seeder/data/user.json

@@ -1,29 +1,14 @@
 [
    {
-      "id": "devAmalia",
-      "idUserRole": "dev",
+      "id": "supadminAmalia",
+      "idUserRole": "supadmin",
+      "idVillage": "desa1",
+      "idGroup": "group1",
+      "idPosition": "position1",
       "nik": "1111111",
       "name": "Amalia",
       "phone": "628980185458",
       "email": "amalia@bip.com",
       "gender": "F"
-   },
-   {
-      "id": "devLukman",
-      "idUserRole": "dev",
-      "nik": "2222222",
-      "name": "Lukman",
-      "phone": "6287701790942",
-      "email": "lukman@bip.com",
-      "gender": "M"
-   },
-   {
-      "id": "devMalik",
-      "idUserRole": "dev",
-      "nik": "3333333",
-      "name": "Malik",
-      "phone": "6289697338821",
-      "email": "malik@bip.com",
-      "gender": "M"
    }
 ]

src/module/seeder/data/user_role.json

@@ -1,9 +1,4 @@
 [
-   {
-      "id": "dev",
-      "name": "Developer",
-      "desc": "-"
-   },
    {
       "id": "supadmin",
       "name": "Super Admin",

src/module/seeder/index.ts

@@ -1,4 +1,9 @@
+import seederAdminRole from "./data/admin_role.json";
+import seederAdmin from "./data/admin.json";
 import seederUserRole from "./data/user_role.json";
 import seederUser from "./data/user.json";
+import seederDesa from "./data/desa.json";
+import seederGroup from "./data/group.json";
+import seederPosition from "./data/position.json";
 
-export { seederUserRole, seederUser }
+export { seederAdminRole, seederAdmin, seederDesa, seederGroup, seederPosition, seederUserRole, seederUser, }

src/module/user/api/get/getAllUser.ts

@@ -11,8 +11,10 @@ export async function getAllUser(req: NextRequest) {
     const users = await prisma.user.findMany({
       where: {
         isActive: active == "true" ? true : false,
-        idVillage: idVillage,
-        idGroup: idGroup,
+        idUserRole: String(idUserRole),
+        idPosition: String(idPosition),
+        idVillage: String(idVillage),
+        idGroup: String(idGroup),
       },
       select: {
         id: true,