Merge pull request #70 from bipproduction/amalia/29-jul-24

Amalia/29 jul 24

prisma/schema.prisma

@@ -280,28 +280,30 @@ model DivisionProjectFile {
 }
 
 model DivisionDisscussion {
-  id         String   @id @default(cuid())
+  id                         String                       @id @default(cuid())
-  Division   Division @relation(fields: [idDivision], references: [id])
+  Division                   Division                     @relation(fields: [idDivision], references: [id])
-  idDivision String
+  idDivision                 String
-  title      String
+  title                      String
-  desc       String   @db.Text
+  desc                       String                       @db.Text
-  status     Int      @default(1) // 1 = open, 2 = close
+  status                     Int                          @default(1) // 1 = open, 2 = close
-  isActive   Boolean  @default(true)
+  isActive                   Boolean                      @default(true)
-  User       User     @relation(fields: [createdBy], references: [id])
+  User                       User                         @relation(fields: [createdBy], references: [id])
-  createdBy  String
+  createdBy                  String
-  createdAt  DateTime @default(now())
+  createdAt                  DateTime                     @default(now())
-  updatedAt  DateTime @updatedAt
+  updatedAt                  DateTime                     @updatedAt
+  DivisionDisscussionComment DivisionDisscussionComment[]
 }
 
 model DivisionDisscussionComment {
-  id            String   @id @default(cuid())
+  id                  String              @id @default(cuid())
-  idDisscussion String
+  DivisionDisscussion DivisionDisscussion @relation(fields: [idDisscussion], references: [id])
-  comment       String   @db.Text
+  idDisscussion       String
-  isActive      Boolean  @default(true)
+  comment             String              @db.Text
-  User          User     @relation(fields: [createdBy], references: [id])
+  isActive            Boolean             @default(true)
-  createdBy     String
+  User                User                @relation(fields: [createdBy], references: [id])
-  createdAt     DateTime @default(now())
+  createdBy           String
-  updatedAt     DateTime @updatedAt
+  createdAt           DateTime            @default(now())
+  updatedAt           DateTime            @updatedAt
 }
 
 model DivisionDocumentFolderFile {

src/module/group/api/api_group.ts

@@ -3,12 +3,12 @@ import { API_INDEX_GROUP } from "./api_index";
 
 type Method = "GET" | "POST";
 export async function apiGroup(req: NextRequest, method: Method) {
-    const { searchParams } = new URL(req.url);
+  const { searchParams } = new URL(req.url);
-    const path = searchParams.get("path");
+  const path = searchParams.get("path");
-    const act = API_INDEX_GROUP.find((v) => v.path === path && v.method === method);
+  const act = API_INDEX_GROUP.find((v) => v.path === path && v.method === method);
-    if (!path)
+  if (!path)
-      return Response.json({ message: "page not found" }, { status: 404 });
+    return Response.json({ success: false, message: "page not found" }, { status: 404 });
   if (act) return act.bin(req);
-  
+
-    return Response.json({ message: "404" });
+  return Response.json({ success: false, message: "404" });
-  }
+}

src/module/group/api/get/listGroup.ts

@@ -2,7 +2,7 @@ import { prisma } from "@/module/_global";
 import { NextRequest } from "next/server";
 
 export async function listGroups(req: NextRequest): Promise<Response> {
-  
+
   try {
     const searchParams = req.nextUrl.searchParams
     const villaId = searchParams.get('villageId');
@@ -20,6 +20,6 @@ export async function listGroups(req: NextRequest): Promise<Response> {
     return Response.json(groups);
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/group/api/post/createGroup.ts

@@ -1,13 +1,13 @@
 import { prisma } from "@/module/_global";
 
-export async function createGroup(req: Request){
+export async function createGroup(req: Request) {
   try {
-      const data = await req.json();
+    const data = await req.json();
-      
+
 
     if (!data || !data.name) {
       return Response.json(
-        { message: "Nama grup harus diisi" },
+        { success: false, message: "Nama grup harus diisi" },
         { status: 400 }
       );
     }
@@ -27,6 +27,6 @@ export async function createGroup(req: Request){
     return Response.json(group, { status: 201 });
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/position/api/api_position.ts

@@ -4,12 +4,12 @@ import { API_INDEX_POSITION } from "./api_index";
 
 type Method = "GET" | "POST";
 export async function apiPosition(req: NextRequest, method: Method) {
-    const { searchParams } = new URL(req.url);
+  const { searchParams } = new URL(req.url);
-    const path = searchParams.get("path");
+  const path = searchParams.get("path");
-    const act = API_INDEX_POSITION.find((v) => v.path === path && v.method === method);
+  const act = API_INDEX_POSITION.find((v) => v.path === path && v.method === method);
-    if (!path)
+  if (!path)
-      return Response.json({ message: "page not found" }, { status: 404 });
+    return Response.json({ success: false, message: "page not found" }, { status: 404 });
   if (act) return act.bin(req);
-  
+
-    return Response.json({ message: "404" });
+  return Response.json({ success: false, message: "404" });
-  }
+}

src/module/position/api/get/getAllPosition.ts

@@ -19,6 +19,6 @@ export async function getAllPosition(req: NextRequest) {
     return Response.json(positions);
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/position/api/post/createPosition.ts

@@ -19,6 +19,6 @@ export async function createlPosition(req: Request) {
     return Response.json(positions, { status: 201 });
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/user/api/api_user.ts

@@ -4,12 +4,12 @@ import { API_INDEX_USER } from "./api_index";
 
 type Method = "GET" | "POST";
 export async function apiUser(req: NextRequest, method: Method) {
-    const { searchParams } = new URL(req.url);
+  const { searchParams } = new URL(req.url);
-    const path = searchParams.get("path");
+  const path = searchParams.get("path");
-    const act = API_INDEX_USER.find((v) => v.path === path && v.method === method);
+  const act = API_INDEX_USER.find((v) => v.path === path && v.method === method);
-    if (!path)
+  if (!path)
-      return Response.json({ message: "page not found" }, { status: 404 });
+    return Response.json({ success: false, message: "page not found" }, { status: 404 });
   if (act) return act.bin(req);
-  
+
-    return Response.json({ message: "404" });
+  return Response.json({ success: false, message: "404" });
-  }
+}

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

@@ -31,6 +31,6 @@ export async function getAllUser(req: NextRequest) {
     return Response.json(users);
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/user/api/post/createUser.ts

@@ -30,6 +30,6 @@ export async function createUser(req: NextRequest) {
     return Response.json(users, { status: 200 });
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/village/api/api_village.ts

@@ -8,8 +8,8 @@ export async function apiViilage(req: Request, method: Method) {
     (v) => v.path === path && v.method === method
   );
   if (!path)
-    return Response.json({ message: "page not found" }, { status: 404 });
+    return Response.json({ success: false, message: "page not found" }, { status: 404 });
   if (act) return act.bin(req);
 
-  return Response.json({ message: "404" });
+  return Response.json({ success: false, message: "404" });
 }

src/module/village/api/get/getAllVillage.ts

@@ -16,6 +16,6 @@ export async function getAllVillage(req: Request) {
     return Response.json(villages);
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }

src/module/village/api/post/createVillage.ts

@@ -19,6 +19,6 @@ export async function createVillage(req: Request) {
     return Response.json(village, { status: 201 });
   } catch (error) {
     console.error(error);
-    return Response.json({ message: "Internal Server Error" }, { status: 500 });
+    return Response.json({ success: false, message: "Internal Server Error" }, { status: 500 });
   }
 }