From 2ca0852d2498192eb373c4a9930657476c1e566e Mon Sep 17 00:00:00 2001
From: amel <amel@amel.local>
Date: Tue, 12 Nov 2024 10:44:34 +0800
Subject: [PATCH 1/2] fix: jabatan

Deskripsi;
- order by name jabatan

No Issues'
---
 src/app/api/position/route.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/api/position/route.ts b/src/app/api/position/route.ts
index 0b0675d..4d12dfa 100644
--- a/src/app/api/position/route.ts
+++ b/src/app/api/position/route.ts
@@ -68,11 +68,14 @@ export async function GET(request: Request) {
         });
 
         const allData = positions.map((v: any) => ({
-            ..._.omit(v, ["Group"]),
+            ..._.omit(v, ["Group", "name"]),
+            name: v.name,
             group: v.Group.name
         }))
 
-        return NextResponse.json({ success: true, message: "Berhasil mendapatkan jabatan", data: allData, filter }, { status: 200 });
+        const dataFix = _.orderBy(allData, [data => data.name.toLowerCase()], ['asc']);
+
+        return NextResponse.json({ success: true, message: "Berhasil mendapatkan jabatan", data: dataFix, filter }, { status: 200 });
     } catch (error) {
         console.error(error);
         return NextResponse.json({ success: false, message: "Gagal mendapatkan jabatan, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

From 3b1733922151005cd6ce124e033aed7dc0bd6c3e Mon Sep 17 00:00:00 2001
From: amel <amel@amel.local>
Date: Tue, 12 Nov 2024 11:31:00 +0800
Subject: [PATCH 2/2] fix: dokument

Deskripsi;
- order by dokumen divisi

No Issues
---
 src/app/api/document/route.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/api/document/route.ts b/src/app/api/document/route.ts
index 8576245..3e9d5c0 100644
--- a/src/app/api/document/route.ts
+++ b/src/app/api/document/route.ts
@@ -142,8 +142,8 @@ export async function GET(request: Request) {
                extension: v.DivisionDocumentFolderFile.extension,
                path: v.DivisionDocumentFolderFile.path,
                createdBy: v.DivisionDocumentFolderFile.User.name,
-               createdAt: moment(v.DivisionDocumentFolderFile.createdAt).format("DD-MM-YYYY HH:mm"),
-               updatedAt: moment(v.DivisionDocumentFolderFile.updatedAt).format("DD-MM-YYYY HH:mm"),
+               createdAt: v.DivisionDocumentFolderFile.createdAt,
+               updatedAt: v.DivisionDocumentFolderFile.updatedAt,
                share: true
             }))
 
@@ -181,8 +181,8 @@ export async function GET(request: Request) {
       const allData = data.map((v: any) => ({
          ..._.omit(v, ["User", "createdAt", "updatedAt"]),
          createdBy: v.User.name,
-         createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
-         updatedAt: moment(v.updatedAt).format("DD-MM-YYYY HH:mm"),
+         createdAt: v.createdAt,
+         updatedAt: v.updatedAt,
          share: false
       }))
 
@@ -190,7 +190,13 @@ export async function GET(request: Request) {
          allData.push(...formatDataShare)
       }
 
-      const formatData = _.orderBy(allData, ['category', 'createdAt'], ['desc', 'asc']);
+      const formatData = _.orderBy(allData, ['category', 'createdAt'], ['desc', 'desc']);
+
+      const fixData = formatData.map((v: any) => ({
+         ..._.omit(v, ["createdAt", "updatedAt"]),
+         createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
+         updatedAt: moment(v.updatedAt).format("DD-MM-YYYY HH:mm"),
+      }))
 
       let pathNow = path
       let jalur = []
@@ -221,7 +227,7 @@ export async function GET(request: Request) {
       jalur.push({ id: 'home', name: 'home' })
       jalur = [...jalur].reverse()
 
-      return NextResponse.json({ success: true, message: "Berhasil mendapatkan item", data: formatData, jalur }, { status: 200 });
+      return NextResponse.json({ success: true, message: "Berhasil mendapatkan item", data: fixData, jalur }, { status: 200 });
 
    } catch (error) {
       console.error(error);