From fb60ac461e67228875b3ad2cc3e0c8fda241f1b7 Mon Sep 17 00:00:00 2001
From: Chiquita Ahsanunnisa <16521248@mahasiswa.itb.ac.id>
Date: Thu, 18 Apr 2024 08:04:48 +0700
Subject: [PATCH] fix: minor fix sidsem entities

---
 src/app.module.ts                    |  8 ++++----
 src/entities/pendaftaranSidsem.ts    | 22 +++++++++++++---------
 src/entities/pengujiSidsem.entity.ts |  2 +-
 src/entities/ruangan.entity.ts       | 22 +++++++++++-----------
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/app.module.ts b/src/app.module.ts
index 954b636..ac61f16 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -11,9 +11,9 @@ import { Kelas } from "./entities/kelas.entity";
 import { MahasiswaKelas } from "./entities/mahasiswaKelas";
 import { PengajarKelas } from "./entities/pengajarKelas.entity";
 import { PendaftaranTesis } from "./entities/pendaftaranTesis.entity";
-import { Ruangan } from "./entities/ruangan.entity";
+// import { Ruangan } from "./entities/ruangan.entity";
 import { Tugas } from "./entities/tugas.entity";
-import { PengujiSidang } from "./entities/pengujiSidsem.entity";
+import { PengujiSidsem } from "./entities/pengujiSidsem.entity";
 import { RegistrasiTesisModule } from "./registrasi-tesis/registrasi-tesis.module";
 import { ConfigModule } from "@nestjs/config";
 import { AuthModule } from "./auth/auth.module";
@@ -54,9 +54,9 @@ import { PendaftaranSidsem } from "./entities/pendaftaranSidsem";
         MahasiswaKelas,
         PengajarKelas,
         PendaftaranTesis,
-        Ruangan,
+        // Ruangan,
         Tugas,
-        PengujiSidang,
+        PengujiSidsem,
         Konfigurasi,
         MataKuliah,
         SubmisiTugas,
diff --git a/src/entities/pendaftaranSidsem.ts b/src/entities/pendaftaranSidsem.ts
index 12e0b79..a733c9c 100644
--- a/src/entities/pendaftaranSidsem.ts
+++ b/src/entities/pendaftaranSidsem.ts
@@ -6,9 +6,9 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { PendaftaranTesis } from "./pendaftaranTesis.entity";
-import { Ruangan } from "./ruangan.entity";
+// import { Ruangan } from "./ruangan.entity";
 import { ApiProperty } from "@nestjs/swagger";
-import { PengujiSidang } from "./pengujiSidsem.entity";
+import { PengujiSidsem } from "./pengujiSidsem.entity";
 
 export enum TipeSidsemEnum {
   SEMINAR_1 = "SEMINAR_1",
@@ -27,11 +27,11 @@ export class PendaftaranSidsem {
   tipe: TipeSidsemEnum;
 
   @ApiProperty()
-  @Column({ type: "boolean" })
+  @Column({ type: "boolean", default: false })
   ditolak: boolean;
 
   @ApiProperty()
-  @Column({ type: "boolean" })
+  @Column({ type: "boolean", nullable: true })
   lulus: boolean;
 
   @ApiProperty()
@@ -49,10 +49,14 @@ export class PendaftaranSidsem {
   @ManyToOne(() => PendaftaranTesis, (pendaftaranTesis) => pendaftaranTesis.id)
   pendaftaranTesis: PendaftaranTesis;
 
-  @ApiProperty({ type: Ruangan, nullable: true })
-  @ManyToOne(() => Ruangan, (ruangan) => ruangan.id)
-  ruangan: Ruangan;
+  // @ApiProperty({ type: Ruangan, nullable: true })
+  // @ManyToOne(() => Ruangan, (ruangan) => ruangan.id)
+  // ruangan: Ruangan;
 
-  @OneToMany(() => PengujiSidang, (pengujiSidsem) => pengujiSidsem.sidsem)
-  penguji: PengujiSidang[];
+  @ApiProperty()
+  @Column({ type: "text", nullable: true })
+  ruangan: string;
+
+  @OneToMany(() => PengujiSidsem, (pengujiSidsem) => pengujiSidsem.sidsem)
+  penguji: PengujiSidsem[];
 }
diff --git a/src/entities/pengujiSidsem.entity.ts b/src/entities/pengujiSidsem.entity.ts
index 9a652b7..09aebe7 100644
--- a/src/entities/pengujiSidsem.entity.ts
+++ b/src/entities/pengujiSidsem.entity.ts
@@ -3,7 +3,7 @@ import { Pengguna } from "./pengguna.entity";
 import { PendaftaranSidsem } from "./pendaftaranSidsem";
 
 @Entity()
-export class PengujiSidang {
+export class PengujiSidsem {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
diff --git a/src/entities/ruangan.entity.ts b/src/entities/ruangan.entity.ts
index 0c7683d..86dfaf8 100644
--- a/src/entities/ruangan.entity.ts
+++ b/src/entities/ruangan.entity.ts
@@ -1,13 +1,13 @@
-import { ApiProperty } from "@nestjs/swagger";
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+// import { ApiProperty } from "@nestjs/swagger";
+// import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 
-@Entity()
-export class Ruangan {
-  @ApiProperty({ example: "550e8400-e29b-41d4-a716-446655440000" })
-  @PrimaryGeneratedColumn("uuid")
-  id: string;
+// @Entity()
+// export class Ruangan {
+//   @ApiProperty({ example: "550e8400-e29b-41d4-a716-446655440000" })
+//   @PrimaryGeneratedColumn("uuid")
+//   id: string;
 
-  @ApiProperty()
-  @Column({ type: "text" })
-  nama: string;
-}
+//   @ApiProperty()
+//   @Column({ type: "text" })
+//   nama: string;
+// }
-- 
GitLab