Merge pull request #210 from ahsanzizan/main

Major fixes in organisasi segment

Author: ahsanzizan

prisma/migrations/20240612030730_add_organisasi_image_description/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `image_description` to the `Organisasi` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE `Organisasi` ADD COLUMN `image_description` VARCHAR(191) NOT NULL;

prisma/schema.prisma

@@ -196,21 +196,22 @@ model Period_Year {
 }
 
 model Organisasi {
-  id              String          @id @default(uuid()) @map("suborgan_id") @db.Char(36)
-  period_id       String
-  period          Period_Year     @relation(fields: [period_id], references: [id])
-  organisasi      Organisasi_Type
-  organisasi_name String          @map("organisasi_name")
-  logo            String
-  description     String          @db.LongText
-  vision          String
-  mission         String
-  image           String
-  companion       String
-  structure       String          @db.LongText
-  contact         String
-  created_at      DateTime        @default(now())
-  updated_at      DateTime        @updatedAt
+  id                String          @id @default(uuid()) @map("suborgan_id") @db.Char(36)
+  period_id         String
+  period            Period_Year     @relation(fields: [period_id], references: [id])
+  organisasi        Organisasi_Type
+  organisasi_name   String          @map("organisasi_name")
+  logo              String
+  description       String          @db.LongText
+  vision            String
+  mission           String
+  image             String
+  image_description String
+  companion         String
+  structure         String          @db.LongText
+  contact           String
+  created_at        DateTime        @default(now())
+  updated_at        DateTime        @updatedAt
 
   @@unique([organisasi, period_id])
   @@map("Organisasi")

src/actions/organisasi.ts

@@ -30,6 +30,7 @@ export async function suborganCreate(data: FormData) {
     const companion = data.get("companion") as string;
     const structure = data.get("structure") as string;
     const contact = data.get("contact") as string;
+    const imageDescription = data.get("image_description") as string;
 
     const image = data.get("image") as File;
     const logo = data.get("logo") as File;
@@ -55,6 +56,7 @@ export async function suborganCreate(data: FormData) {
       structure: structure,
       contact: contact,
       period: period,
+      image_description: imageDescription,
     });
   } catch (e) {
     console.log(e);

src/app/(admin)/admin/organisasi/[slug]/[period]/page.tsx

@@ -1,8 +1,22 @@
+import { Organisasi_Type } from "@prisma/client";
+
+import { findOrganisasi } from "@/utils/database/organisasi.query";
+import { findLatestPeriod } from "@/utils/database/period.query";
+
 export default async function Edit({
   params,
 }: {
   params: { organisasi: string };
 }) {
-  console.log(params);
+  const latestPeriod = await findLatestPeriod();
+  const organisasi = await findOrganisasi({
+    organisasi_period_id: {
+      period_id: latestPeriod.id,
+      organisasi: params.organisasi as Organisasi_Type,
+    },
+  });
+
+  console.log(organisasi);
+
   return <></>;
 }

src/app/(admin)/admin/organisasi/[slug]/page.tsx

@@ -1,5 +1,9 @@
 import { H1 } from "@/app/_components/global/Text";
 
-export default function SubOrgan() {
-  return <H1>Sub-organ</H1>;
+export default function SuborAdmin() {
+  return (
+    <>
+      <H1>TOLONG DISLICE</H1>
+    </>
+  );
 }

src/app/(admin)/admin/organisasi/create/page.tsx

@@ -0,0 +1,24 @@
+import { Organisasi_Type } from "@prisma/client";
+import { notFound } from "next/navigation";
+
+import { findOrganisasi } from "@/utils/database/organisasi.query";
+import { findPeriod } from "@/utils/database/period.query";
+
+export default async function OrganisasiByPeriod({
+  param,
+}: {
+  param: { slug: string; period: string };
+}) {
+  const period = await findPeriod(param.period);
+  if (!period) return notFound();
+
+  const organisasi = await findOrganisasi({
+    organisasi_period_id: {
+      organisasi: param.slug.toUpperCase() as Organisasi_Type,
+      period_id: period.id,
+    },
+  });
+  console.log(organisasi);
+
+  return <></>;
+}