Merge pull request #205 from bipproduction/amalia/17-des-24

Amalia/17 des 24

src/app/api/new/donasi/route.ts

@@ -46,23 +46,44 @@ export async function GET(request: Request) {
             ..._.omit(v, ["DonasiMaster_Durasi"]),
             nameDonasiDurasi: v.DonasiMaster_Durasi.name
          }))
-      } else {
+      } else if (kategori == "galang-dana") {
          const userLoginId = await funGetUserIdByToken()
          if (userLoginId == null) {
             return NextResponse.json({ success: false, message: "Gagal mendapatkan data, user id tidak ada" }, { status: 500 });
          }
 
-         dataFix = await prisma.donasi.findMany({
+         const data = await prisma.donasi.findMany({
             take: 5,
             skip: dataSkip,
             where: {
                authorId: userLoginId,
                donasiMaster_StatusDonasiId: status,
+               active: true,
+            },
+            select: {
+               id: true,
+               title: true,
+               imagesId: true,
+               target: true,
+               progres: true,
+               publishTime: true,
+               DonasiMaster_Durasi: {
+                  select: {
+                     name: true
+                  }
+               },
+               terkumpul: true,
+               imageId: true,
             },
             orderBy: {
                updatedAt: "desc",
             },
          });
+
+         dataFix = data.map((v: any) => ({
+            ..._.omit(v, ["DonasiMaster_Durasi"]),
+            nameDonasiDurasi: v.DonasiMaster_Durasi.name
+         }))
       }
 
       return NextResponse.json({ success: true, message: "Berhasil mendapatkan data", data: dataFix }, { status: 200 });

src/app/dev/donasi/main/galang_dana/[id]/page.tsx

@@ -1,27 +1,23 @@
-import { GalangDanaDonasiNew, PostingDonasi } from "@/app_modules/donasi";
-import { donasi_funGetAllStatusById } from "@/app_modules/donasi/fun";
-import { donasi_funMasterStatusDonasi } from "@/app_modules/donasi/fun/master/get_status_donasi";
+import { GalangDanaDonasiNew } from "@/app_modules/donasi";
 
 export default async function Page({ params }: { params: { id: string } }) {
-  const statusId = params.id;
+  // const statusId = params.id;
 
-  const listStatus = await donasi_funMasterStatusDonasi();
-  const dataDonasi = await donasi_funGetAllStatusById({
-    page: 1,
-    statusId: statusId,
-  });
+  // const listStatus = await donasi_funMasterStatusDonasi();
+  // const dataDonasi = await donasi_funGetAllStatusById({
+  //   page: 1,
+  //   statusId: statusId,
+  // });
 
   return (
     <>
-      <PostingDonasi
+      {/* <PostingDonasi
         statusId={statusId}
         dataStatus={dataDonasi}
         listStatus={listStatus}
-      />
+      /> */}
 
-
-      {/* NANTI AJA LANJUT -- KEJAR TAYANG :) */}
-      {/* <GalangDanaDonasiNew listStatus={listStatus}/> */}
+      <GalangDanaDonasiNew />
     </>
   );
 }

src/app/dev/investasi/main/portofolio/[id]/page.tsx

@@ -1,10 +1,8 @@
-import { investasi_funGetPortofolioByStatusId } from "@/app_modules/investasi/_fun";
-import { Investasi_UiPortofolio, Investasi_UiPortofolioNew } from "@/app_modules/investasi/_ui";
-import getStatusInvestasi from "@/app_modules/investasi/fun/master/get_status_investasi";
+import { Investasi_UiPortofolioNew } from "@/app_modules/investasi/_ui";
 
 export default async function Page({ params }: { params: { id: string } }) {
   // const statusId = params.id;
-  const listStatus = await getStatusInvestasi();
+  // const listStatus = await getStatusInvestasi();
   // const dataPortofolio = await investasi_funGetPortofolioByStatusId({
   //   page: 1,
   //   statusId: statusId,
@@ -17,7 +15,7 @@ export default async function Page({ params }: { params: { id: string } }) {
         listStatus={listStatus as any}
         dataPortofolio={dataPortofolio as any}
       /> */}
-      <Investasi_UiPortofolioNew listStatus={listStatus as any} />
+      <Investasi_UiPortofolioNew />
     </>
   );
 }