upd: komentar diskusi
- Deskripsi: - upd database - tampilan api mobile komentar diskusi umum dan diskusi divisi No Issues
This commit is contained in:
@@ -420,6 +420,7 @@ model DivisionDisscussionComment {
|
|||||||
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
|
||||||
|
isEdited Boolean @default(false)
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
}
|
}
|
||||||
@@ -615,6 +616,7 @@ model DiscussionComment {
|
|||||||
idUser String
|
idUser String
|
||||||
comment String @db.Text
|
comment String @db.Text
|
||||||
isActive Boolean @default(true)
|
isActive Boolean @default(true)
|
||||||
|
isEdited Boolean @default(false)
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ export async function GET(request: Request, context: { params: { id: string } })
|
|||||||
id: true,
|
id: true,
|
||||||
comment: true,
|
comment: true,
|
||||||
createdAt: true,
|
createdAt: true,
|
||||||
|
updatedAt: true,
|
||||||
|
isEdited: true,
|
||||||
idUser: true,
|
idUser: true,
|
||||||
User: {
|
User: {
|
||||||
select: {
|
select: {
|
||||||
@@ -79,8 +81,9 @@ export async function GET(request: Request, context: { params: { id: string } })
|
|||||||
})
|
})
|
||||||
|
|
||||||
dataFix = data.map((v: any) => ({
|
dataFix = data.map((v: any) => ({
|
||||||
..._.omit(v, ["createdAt", "User",]),
|
..._.omit(v, ["createdAt", "User", "updatedAt"]),
|
||||||
createdAt: countTime(v.createdAt),
|
createdAt: countTime(v.createdAt),
|
||||||
|
updatedAt: moment(v.updatedAt).format("ll"),
|
||||||
username: v.User.name,
|
username: v.User.name,
|
||||||
img: v.User.img
|
img: v.User.img
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -44,6 +44,9 @@ export async function GET(request: Request, context: { params: { id: string } })
|
|||||||
id: true,
|
id: true,
|
||||||
comment: true,
|
comment: true,
|
||||||
createdAt: true,
|
createdAt: true,
|
||||||
|
updatedAt: true,
|
||||||
|
isEdited: true,
|
||||||
|
createdBy: true,
|
||||||
User: {
|
User: {
|
||||||
select: {
|
select: {
|
||||||
name: true,
|
name: true,
|
||||||
@@ -54,10 +57,12 @@ export async function GET(request: Request, context: { params: { id: string } })
|
|||||||
})
|
})
|
||||||
|
|
||||||
const omitMember = data.map((v: any) => ({
|
const omitMember = data.map((v: any) => ({
|
||||||
..._.omit(v, ["User", "createdAt"]),
|
..._.omit(v, ["User", "createdBy", "createdAt", "updatedAt"]),
|
||||||
|
idUser: v.createdBy,
|
||||||
username: v.User.name,
|
username: v.User.name,
|
||||||
img: v.User.img,
|
img: v.User.img,
|
||||||
createdAt: countTime(v.createdAt),
|
createdAt: countTime(v.createdAt),
|
||||||
|
updatedAt: moment(v.updatedAt).format("ll")
|
||||||
}))
|
}))
|
||||||
|
|
||||||
return NextResponse.json({ success: true, message: "Berhasil mendapatkan komentar", data: omitMember }, { status: 200 });
|
return NextResponse.json({ success: true, message: "Berhasil mendapatkan komentar", data: omitMember }, { status: 200 });
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export function countTime(date: Date) {
|
|||||||
const seconds = totalSeconds;
|
const seconds = totalSeconds;
|
||||||
|
|
||||||
if (days > 0) {
|
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) {
|
} else if (hours > 0) {
|
||||||
return `${hours} jam`
|
return `${hours} jam`
|
||||||
} else if (minutes > 0) {
|
} else if (minutes > 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user