Merge pull request #58 from nuon-dev/feature/newcomer/ghh

feat: 새신자 테이블 TypeORM 작성

Author: nrbns357

server/src/entity/newcomer.ts

@@ -0,0 +1,74 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  JoinColumn,
+  OneToMany,
+  CreateDateColumn,
+  UpdateDateColumn,
+} from "typeorm"
+import { User } from "./user"
+import { NewcomerStatus } from "./types"
+import { NewcomerEducation } from "./newcomerEducation"
+
+@Entity()
+export class Newcomer {
+  @PrimaryGeneratedColumn("uuid")
+  id: string
+
+  @Column()
+  name: string
+
+  @Column({ nullable: true })
+  yearOfBirth: number
+
+  @Column({ nullable: true })
+  gender: "man" | "woman" | ""
+
+  @Column({ nullable: true })
+  phone: string // 연락처
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: "guiderId" })
+  guider: User // 인도자
+
+  @Column({
+    type: "enum",
+    enum: NewcomerStatus,
+    default: NewcomerStatus.NORMAL,
+  })
+  status: NewcomerStatus
+
+  @Column({ nullable: true })
+  promotionDate: string // 등반일
+
+  @Column({ nullable: true })
+  assignment: string // 배정
+
+  @Column({ nullable: true })
+  deletionDate: string // 삭제일
+
+  @Column({ nullable: true })
+  pendingDate: string // 보류일
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: "managerId" })
+  manager: User
+
+  @OneToMany(() => NewcomerEducation, (education) => education.newcomer)
+  educationRecords: NewcomerEducation[]
+
+  @CreateDateColumn({
+    type: "timestamp",
+    default: () => "CURRENT_TIMESTAMP(6)",
+  })
+  createdAt: Date
+
+  @UpdateDateColumn({
+    type: "timestamp",
+    default: () => "CURRENT_TIMESTAMP(6)",
+    onUpdate: "CURRENT_TIMESTAMP(6)",
+  })
+  updatedAt: Date
+}

server/src/entity/newcomerEducation.ts

@@ -0,0 +1,33 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  JoinColumn,
+} from "typeorm"
+import { Newcomer } from "./newcomer"
+import { WorshipSchedule } from "./worshipSchedule"
+import { EducationLecture } from "./types"
+
+@Entity()
+export class NewcomerEducation {
+  @PrimaryGeneratedColumn("uuid")
+  id: string
+
+  @ManyToOne(() => Newcomer, (newcomer) => newcomer.educationRecords)
+  @JoinColumn({ name: "newcomerId" })
+  newcomer: Newcomer
+
+  @ManyToOne(() => WorshipSchedule)
+  @JoinColumn({ name: "worshipScheduleId" })
+  worshipSchedule: WorshipSchedule
+
+  @Column({
+    type: "enum",
+    enum: EducationLecture,
+  })
+  lectureType: EducationLecture
+
+  @Column({ type: "text", nullable: true })
+  memo: string
+}

server/src/entity/types.ts

@@ -57,3 +57,19 @@ export enum AttendStatus {
   ABSENT = "ABSENT",
   ETC = "ETC",
 }
+
+export enum EducationLecture {
+  OT = "OT",
+  L1 = "L1",
+  L2 = "L2",
+  L3 = "L3",
+  L4 = "L4",
+  L5 = "L5",
+}
+
+export enum NewcomerStatus {
+  NORMAL = "NORMAL",
+  PROMOTED = "PROMOTED",
+  DELETED = "DELETED",
+  PENDING = "PENDING",
+}

server/src/migration/1769693832000-CreateNewcomer.ts

@@ -0,0 +1,47 @@
+import { MigrationInterface, QueryRunner } from "typeorm"
+
+export class CreateNewcomer1769693832000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Newcomer 테이블 생성
+    await queryRunner.query(`
+      CREATE TABLE \`newcomer\` (
+        \`id\` varchar(36) NOT NULL,
+        \`name\` varchar(255) NOT NULL,
+        \`yearOfBirth\` int NULL,
+        \`gender\` varchar(10) NULL,
+        \`phone\` varchar(255) NULL COMMENT '연락처',
+        \`guiderId\` varchar(36) NULL COMMENT '인도자',
+        \`status\` enum ('NORMAL', 'PROMOTED', 'DELETED', 'PENDING') NOT NULL DEFAULT 'NORMAL',
+        \`promotionDate\` varchar(255) NULL COMMENT '등반일',
+        \`assignment\` varchar(255) NULL COMMENT '배정',
+        \`deletionDate\` varchar(255) NULL COMMENT '삭제일',
+        \`pendingDate\` varchar(255) NULL COMMENT '보류일',
+        \`managerId\` varchar(36) NULL,
+        \`createdAt\` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
+        \`updatedAt\` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
+        PRIMARY KEY (\`id\`),
+        CONSTRAINT \`FK_newcomer_guider\` FOREIGN KEY (\`guiderId\`) REFERENCES \`user\`(\`id\`) ON DELETE SET NULL ON UPDATE NO ACTION,
+        CONSTRAINT \`FK_newcomer_manager\` FOREIGN KEY (\`managerId\`) REFERENCES \`user\`(\`id\`) ON DELETE SET NULL ON UPDATE NO ACTION
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
+    `)
+
+    // NewcomerEducation 테이블 생성
+    await queryRunner.query(`
+      CREATE TABLE \`newcomer_education\` (
+        \`id\` varchar(36) NOT NULL,
+        \`newcomerId\` varchar(36) NULL,
+        \`worshipScheduleId\` int NULL,
+        \`lectureType\` enum ('OT', 'L1', 'L2', 'L3', 'L4', 'L5') NOT NULL,
+        \`memo\` text NULL,
+        PRIMARY KEY (\`id\`),
+        CONSTRAINT \`FK_newcomer_education_newcomer\` FOREIGN KEY (\`newcomerId\`) REFERENCES \`newcomer\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION,
+        CONSTRAINT \`FK_newcomer_education_worship\` FOREIGN KEY (\`worshipScheduleId\`) REFERENCES \`worship_schedule\`(\`id\`) ON DELETE SET NULL ON UPDATE NO ACTION
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
+    `)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE \`newcomer_education\``)
+    await queryRunner.query(`DROP TABLE \`newcomer\``)
+  }
+}

server/src/model/dataSource.ts

@@ -14,6 +14,8 @@ import { AttendData } from "../entity/attendData"
 import { WorshipContest } from "../entity/event/worshipContest"
 import { AIChat } from "../entity/ai/aiChat"
 import { AIChatRoom } from "../entity/ai/aiChatRoom"
+import { Newcomer } from "../entity/newcomer"
+import { NewcomerEducation } from "../entity/newcomerEducation"
 
 const dataSource = new DataSource(require("../../ormconfig.js"))
 
@@ -34,5 +36,8 @@ export const aiChatDatabase = dataSource.getRepository(AIChat)
 export const aiChatRoomDatabase = dataSource.getRepository(AIChatRoom)
 
 export const worshipContestDatabase = dataSource.getRepository(WorshipContest)
+export const newcomerDatabase = dataSource.getRepository(Newcomer)
+export const newcomerEducationDatabase =
+  dataSource.getRepository(NewcomerEducation)
 
 export default dataSource