Merge pull request 'upd: komentar diskusi' (#62) from amalia/13-okt-25 into join

Reviewed-on: bip/sistem-desa-mandiri#62

prisma/schema.prisma

@@ -420,6 +420,7 @@ model DivisionDisscussionComment {
   isActive            Boolean             @default(true)
   User                User                @relation(fields: [createdBy], references: [id])
   createdBy           String
+  isEdited            Boolean             @default(false)
   createdAt           DateTime            @default(now())
   updatedAt           DateTime            @updatedAt
 }
@@ -615,6 +616,7 @@ model DiscussionComment {
   idUser       String
   comment      String     @db.Text
   isActive     Boolean    @default(true)
+  isEdited     Boolean    @default(false)
   createdAt    DateTime   @default(now())
   updatedAt    DateTime   @updatedAt
 }

src/app/api/home/route.ts

@@ -79,7 +79,7 @@ export async function GET(request: Request) {
                }
             },
             orderBy: {
-               createdAt: "desc"
+               updatedAt: "desc"
             }
          })
 

src/app/api/mobile/discussion-general/[id]/route.ts

@@ -68,6 +68,8 @@ export async function GET(request: Request, context: { params: { id: string } })
                id: true,
                comment: true,
                createdAt: true,
+               updatedAt: true,
+               isEdited: true,
                idUser: true,
                User: {
                   select: {
@@ -79,8 +81,9 @@ export async function GET(request: Request, context: { params: { id: string } })
          })
 
          dataFix = data.map((v: any) => ({
-            ..._.omit(v, ["createdAt", "User",]),
+            ..._.omit(v, ["createdAt", "User", "updatedAt"]),
             createdAt: countTime(v.createdAt),
+            updatedAt: moment(v.updatedAt).format("ll"),
             username: v.User.name,
             img: v.User.img
          }))

src/app/api/mobile/discussion/[id]/route.ts

@@ -44,6 +44,9 @@ export async function GET(request: Request, context: { params: { id: string } })
                     id: true,
                     comment: true,
                     createdAt: true,
+                    updatedAt: true,
+                    isEdited: true,
+                    createdBy: true,
                     User: {
                         select: {
                             name: true,
@@ -54,10 +57,12 @@ export async function GET(request: Request, context: { params: { id: string } })
             })
 
             const omitMember = data.map((v: any) => ({
-                ..._.omit(v, ["User", "createdAt"]),
+                ..._.omit(v, ["User", "createdBy", "createdAt", "updatedAt"]),
+                idUser: v.createdBy,
                 username: v.User.name,
                 img: v.User.img,
                 createdAt: countTime(v.createdAt),
+                updatedAt: moment(v.updatedAt).format("ll")
             }))
 
             return NextResponse.json({ success: true, message: "Berhasil mendapatkan komentar", data: omitMember }, { status: 200 });

src/app/api/mobile/home/route.ts

@@ -81,7 +81,7 @@ export async function GET(request: Request) {
                }
             },
             orderBy: {
-               createdAt: "desc"
+               updatedAt: "desc"
             }
          })
 

src/app/api/version-app/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "2.0.6", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi; -api jenna ai; -privacy policy" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "2.0.7", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi; -api jenna ai; -privacy policy" }, { status: 200 });
    } catch (error) {
       console.error(error);
       return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

src/module/_global/fun/count_time.ts

@@ -18,7 +18,7 @@ export function countTime(date: Date) {
    const seconds = totalSeconds;
 
    if (days > 0) {
-      return moment(date).format("ll")
+      return String(dateNow.getFullYear()) == moment(date).format("YYYY") ? moment(date).format("DD MMM") : moment(date).format("ll")
    } else if (hours > 0) {
       return `${hours} jam`
    } else if (minutes > 0) {