wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: wibu:amalia/06-okt-25
Branches Tags
wibu:amalia/02-okt-25 wibu:staging wibu:join wibu:amalia/05-feb-26 wibu:amalia/04-feb-26 wibu:amalia/03-feb-26 wibu:amalia/02-feb-26 wibu:amalia/30-jan-26 wibu:amalia/22-jan-26 wibu:amalia/19-jan-26 wibu:amalia/17-jan-26 wibu:amalia/15-jan-26 wibu:amalia/14-jan-26 wibu:amalia/16-okt-25 wibu:amalia/15-okt-25 wibu:amalia/14-okt-25 wibu:amalia/13-okt-25 wibu:amalia/08-okt-25 wibu:amalia/07-okt-25 wibu:amalia/06-okt-25 wibu:amalia/03-okt-25 wibu:amalia/06-agustus-25 wibu:amalia/31-jul-25 wibu:amalia/30-jul-25 wibu:amalia/31-des-24
...
pull from: wibu:amalia/08-okt-25
Branches Tags
wibu:staging wibu:join wibu:amalia/05-feb-26 wibu:amalia/04-feb-26 wibu:amalia/03-feb-26 wibu:amalia/02-feb-26 wibu:amalia/30-jan-26 wibu:amalia/22-jan-26 wibu:amalia/19-jan-26 wibu:amalia/17-jan-26 wibu:amalia/15-jan-26 wibu:amalia/14-jan-26 wibu:amalia/16-okt-25 wibu:amalia/15-okt-25 wibu:amalia/14-okt-25 wibu:amalia/13-okt-25 wibu:amalia/08-okt-25 wibu:amalia/07-okt-25 wibu:amalia/06-okt-25 wibu:amalia/03-okt-25 wibu:amalia/02-okt-25 wibu:amalia/06-agustus-25 wibu:amalia/31-jul-25 wibu:amalia/30-jul-25 wibu:amalia/31-des-24

8 Commits
amalia/06- ... amalia/08-

Author SHA1 Message Date
amaliadwiy
411037ec4a Merge pull request 'fix : api home' (#60) from amalia/08-okt-25 into join 
Reviewed-on: bip/sistem-desa-mandiri#60
 2025-10-08 16:20:18 +08:00
amaliadwiy
66ba6dfa91 fix : api home 
Deskripsi:
- update api home > kegiatan terupdate order by updatedate
- api version app

No Issues
 2025-10-08 16:14:30 +08:00
amaliadwiy
389f115923 Merge pull request 'amalia/07-okt-25' (#58) from amalia/07-okt-25 into join 
Reviewed-on: bip/sistem-desa-mandiri#58
 2025-10-07 17:42:53 +08:00
amaliadwiy
2251818908 upd: api version 2025-10-07 17:11:18 +08:00
amaliadwiy
b625150eb5 upd: api home website 
Deskripsi:
- update home api website jadi sama kyk mobile

NO Issues
 2025-10-07 17:09:36 +08:00
amaliadwiy
bae91db60a upd: penerima notifikasi 
Deskripsi:
- pembuat data mendapat notifikasi saat user memberi komentar walaupun pembuat data bukan merupakan anggota dari diskusi umum maupun anggota divisi
- diskusi umum dan diskusi divis

No Issues
 2025-10-07 16:36:34 +08:00
amaliadwiy
150151e823 upd: order tugas 
Deskripsi:
- order tugas pada tugas divisi dan kegiatan

NO Issues'
 2025-10-07 15:09:20 +08:00
amaliadwiy
d1a591a63a upd: api mobile 
Deskripsi:
- check nama divisi

No Issues
 2025-10-07 12:01:19 +08:00
10 changed files with 216 additions and 85 deletions
Expand all files Collapse all files

196
src/app/api/home/route.ts
View File

@@ -1,4 +1,3 @@
import { DivisionProject } from './../../../../node_modules/.prisma/client/index.d';
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import _, { ceil } from "lodash";
@@ -36,22 +35,28 @@ export async function GET(request: Request) {
isActive: true,
}
}
} else if (roleUser == "admin" || roleUser == "cosupadmin") {
} else {
kondisi = {
isActive: true,
idGroup: idGroup
}
} else {
kondisi = {
isActive: true,
idGroup: idGroup,
ProjectMember: {
some: {
idUser: user.id
}
}
}
}
// else if (roleUser == "admin" || roleUser == "cosupadmin") {
// kondisi = {
// isActive: true,
// idGroup: idGroup
// }
// } else {
// kondisi = {
// isActive: true,
// idGroup: idGroup,
// ProjectMember: {
// some: {
// idUser: user.id
// }
// }
// }
// }
const data = await prisma.project.findMany({
skip: 0,
@@ -74,7 +79,7 @@ export async function GET(request: Request) {
}
},
orderBy: {
createdAt: "desc"
updatedAt: "desc"
}
})
@@ -96,22 +101,28 @@ export async function GET(request: Request) {
isActive: true,
}
}
} else if (roleUser == "admin" || roleUser == "cosupadmin") {
} else {
kondisi = {
isActive: true,
idGroup: idGroup
}
} else {
kondisi = {
isActive: true,
idGroup: idGroup,
DivisionMember: {
some: {
idUser: user.id
}
}
}
}
// else if (roleUser == "admin" || roleUser == "cosupadmin") {
// kondisi = {
// isActive: true,
// idGroup: idGroup
// }
// } else {
// kondisi = {
// isActive: true,
// idGroup: idGroup,
// DivisionMember: {
// some: {
// idUser: user.id
// }
// }
// }
// }
const data = await prisma.division.findMany({
where: kondisi,
@@ -134,7 +145,9 @@ export async function GET(request: Request) {
jumlah: v.DivisionProject.length,
}))
allData = _.orderBy(format, 'jumlah', 'desc').slice(0, 5)
const filter = format.filter((v: any) => v.jumlah > 0)
allData = _.orderBy(filter, 'jumlah', 'desc').slice(0, 5)
} else if (kategori == "progress") {
let kondisi
@@ -143,37 +156,50 @@ export async function GET(request: Request) {
if (roleUser == "supadmin" || roleUser == "developer") {
kondisi = {
isActive: true,
Division: {
idVillage: idVillage,
Group: {
isActive: true,
idVillage: idVillage,
Group: {
isActive: true,
}
}
}
} else if (roleUser == "admin" || roleUser == "cosupadmin") {
kondisi = {
isActive: true,
Division: {
isActive: true,
idGroup: idGroup
}
}
// kondisi = {
// isActive: true,
// Division: {
// isActive: true,
// idVillage: idVillage,
// Group: {
// isActive: true,
// }
// }
// }
} else {
kondisi = {
isActive: true,
Division: {
isActive: true,
DivisionMember: {
some: {
idUser: user.id
}
}
}
idGroup: idGroup
}
}
// else if (roleUser == "admin" || roleUser == "cosupadmin") {
// kondisi = {
// isActive: true,
// Division: {
// isActive: true,
// idGroup: idGroup
// }
// }
// } else {
// kondisi = {
// isActive: true,
// Division: {
// isActive: true,
// DivisionMember: {
// some: {
// idUser: user.id
// }
// }
// }
// }
// }
const data = await prisma.divisionProject.groupBy({
const data = await prisma.project.groupBy({
where: kondisi,
by: ["status"],
_count: true
@@ -218,7 +244,7 @@ export async function GET(request: Request) {
}
}
}
} else if (roleUser == "admin" || roleUser == "cosupadmin") {
} else {
kondisi = {
isActive: true,
category: 'FILE',
@@ -227,20 +253,30 @@ export async function GET(request: Request) {
idGroup: idGroup
}
}
} else {
kondisi = {
isActive: true,
category: 'FILE',
Division: {
isActive: true,
DivisionMember: {
some: {
idUser: user.id
}
}
}
}
}
// else if (roleUser == "admin" || roleUser == "cosupadmin") {
// kondisi = {
// isActive: true,
// category: 'FILE',
// Division: {
// isActive: true,
// idGroup: idGroup
// }
// }
// } else {
// kondisi = {
// isActive: true,
// category: 'FILE',
// Division: {
// isActive: true,
// DivisionMember: {
// some: {
// idUser: user.id
// }
// }
// }
// }
// }
const data = await prisma.divisionDocumentFolderFile.findMany({
where: kondisi,
@@ -377,7 +413,7 @@ export async function GET(request: Request) {
}
}
}
} else if (roleUser == "admin" || roleUser == "cosupadmin") {
} else {
kondisi = {
isActive: true,
status: 1,
@@ -386,20 +422,30 @@ export async function GET(request: Request) {
isActive: true
}
}
} else {
kondisi = {
isActive: true,
status: 1,
Division: {
isActive: true,
DivisionMember: {
some: {
idUser: user.id
}
}
}
}
}
// else if (roleUser == "admin" || roleUser == "cosupadmin") {
// kondisi = {
// isActive: true,
// status: 1,
// Division: {
// idGroup: idGroup,
// isActive: true
// }
// }
// } else {
// kondisi = {
// isActive: true,
// status: 1,
// Division: {
// isActive: true,
// DivisionMember: {
// some: {
// idUser: user.id
// }
// }
// }
// }
// }
const data = await prisma.divisionDisscussion.findMany({
skip: 0,

28
src/app/api/mobile/discussion-general/[id]/comment/route.ts
View File

@@ -37,6 +37,29 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
const dataDiscussion = await prisma.discussion.findUnique({
where: {
id
},
select: {
createdBy: true,
User: {
select: {
Subscribe: {
select: {
subscription: true
}
},
TokenDeviceUser: {
select: {
token: true
}
}
}
}
}
})
const member = await prisma.discussionMember.findMany({
where: {
idDiscussion: id,
@@ -70,7 +93,10 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
const memberFilter = member.filter((v: any) => v.idUser != userMobile.id)
const memberFilter = [...member, { idUser: dataDiscussion?.createdBy, User: dataDiscussion?.User }].filter((v: any) => v.idUser != userMobile.id)
.filter((v: any, index: number, self: any[]) =>
index === self.findIndex((t) => t.idUser === v.idUser)
);
const dataFCM = memberFilter.map((v: any) => ({
..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),

20
src/app/api/mobile/discussion/[id]/comment/route.ts
View File

@@ -50,6 +50,21 @@ export async function POST(request: Request, context: { params: { id: string } }
},
select: {
idDivision: true,
createdBy: true,
User: {
select: {
Subscribe: {
select: {
subscription: true
}
},
TokenDeviceUser: {
select: {
token: true
}
}
}
}
}
})
@@ -86,7 +101,10 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
const memberFilter = member.filter((v: any) => v.idUser != userMobile.id)
const memberFilter = [...member, { idUser: dataDivision?.createdBy, User: dataDivision?.User }].filter((v: any) => v.idUser != userMobile.id)
.filter((v: any, index: number, self: any[]) =>
index === self.findIndex((t) => t.idUser === v.idUser)
);
const dataFCM = memberFilter.map((v: any) => ({
..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),

41
src/app/api/mobile/division/route.ts
View File

@@ -342,4 +342,45 @@ export async function POST(request: Request) {
console.error(error);
return NextResponse.json({ success: false, message: "Gagal menambahkan divisi, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
}
};
// CEK DATA DIVISI (NAME DI DESA DAN GROUP YG SAMA)
export async function PUT(request: Request) {
try {
const sent = (await request.json())
const user = sent.user
const userMobile = await funGetUserById({ id: String(user) })
if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
}
let fixGroup
if (sent.data.idGroup == "null" || sent.data.idGroup == undefined || sent.data.idGroup == "") {
fixGroup = userMobile.idGroup
} else {
fixGroup = sent.data.idGroup
}
const checkData = await prisma.division.count({
where: {
name: {
equals: sent.data.name,
mode: "insensitive"
},
idGroup: fixGroup,
idVillage: String(userMobile.idVillage)
}
})
if (checkData > 0) {
return NextResponse.json({ success: true, message: "Divisi dengan nama ini sudah ada", available: false }, { status: 200 });
}
return NextResponse.json({ success: true, message: "Berhasil cek data divisi", available: true }, { status: 200 });
} catch (error) {
console.error(error);
return NextResponse.json({ success: false, message: "Gagal menambahkan divisi, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
}
};

2
src/app/api/mobile/home/route.ts
View File

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

2
src/app/api/mobile/project/[id]/route.ts
View File

@@ -71,7 +71,7 @@ export async function GET(request: Request, context: { params: { id: string } })
createdAt: true
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})

2
src/app/api/mobile/task/[id]/route.ts
View File

@@ -76,7 +76,7 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: true,
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})

6
src/app/api/project/[id]/route.ts
View File

@@ -68,7 +68,7 @@ export async function GET(request: Request, context: { params: { id: string } })
createdAt: true
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})
@@ -78,8 +78,8 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: moment(v.dateEnd).format("DD-MM-YYYY"),
createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
}))
const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
allData = dataFix
// const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
allData = formatData
} else if (kategori == "file") {
const dataFile = await prisma.projectFile.findMany({

2
src/app/api/task/[id]/route.ts
View File

@@ -75,7 +75,7 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: true,
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})

2
src/app/api/version-app/route.ts
View File

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
export async function GET(request: Request) {
try {
return NextResponse.json({ success: true, version: "2.0.4", 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 });