From 858bcfb8b2960087c65d08f23424eb1ef8695613 Mon Sep 17 00:00:00 2001 From: PleBea Date: Wed, 26 Feb 2025 01:23:10 +0900 Subject: [PATCH] dynamic club --- packages/server/src/admin/admin.service.ts | 4 +-- .../server/src/admin/dto/create-admin.dto.ts | 12 +++------ .../server/src/admin/entities/admin.entity.ts | 25 ++++++++----------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/packages/server/src/admin/admin.service.ts b/packages/server/src/admin/admin.service.ts index 9c02194..bb5d63e 100644 --- a/packages/server/src/admin/admin.service.ts +++ b/packages/server/src/admin/admin.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { Admin, AdminRole } from './entities/admin.entity'; +import { Admin } from './entities/admin.entity'; @Injectable() export class AdminService { @@ -10,7 +10,7 @@ export class AdminService { private readonly adminRepository: Repository, ) {} - async createAdmin(email: string, role: AdminRole = AdminRole.ADMIN) { + async createAdmin(email: string, role = 'admin') { const admin = new Admin(); admin.email = email; admin.role = role; diff --git a/packages/server/src/admin/dto/create-admin.dto.ts b/packages/server/src/admin/dto/create-admin.dto.ts index b67ae93..025a186 100644 --- a/packages/server/src/admin/dto/create-admin.dto.ts +++ b/packages/server/src/admin/dto/create-admin.dto.ts @@ -1,6 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { AdminRole } from '../entities/admin.entity'; -import { IsEmail, IsEnum } from 'class-validator'; +import { IsEmail } from 'class-validator'; export class CreateAdminDto { @ApiProperty({ @@ -16,13 +15,10 @@ export class CreateAdminDto { ) email: string; - @ApiProperty({ example: 'admin', description: '권한', enum: AdminRole }) - @IsEnum(AdminRole, { - message: '권한이 올바르지 않습니다.', - }) - role: AdminRole; + @ApiProperty({ example: 'admin', description: 'admin | none | club.name' }) + role: string; - constructor(email: string, role: AdminRole) { + constructor(email: string, role: string) { this.email = email; this.role = role; } diff --git a/packages/server/src/admin/entities/admin.entity.ts b/packages/server/src/admin/entities/admin.entity.ts index 102a720..b48652d 100644 --- a/packages/server/src/admin/entities/admin.entity.ts +++ b/packages/server/src/admin/entities/admin.entity.ts @@ -1,24 +1,21 @@ import { Column, Entity, PrimaryColumn } from 'typeorm'; -export enum AdminRole { - NONE = 'none', +// export enum AdminRole { +// NONE = 'none', - ADMIN = 'admin', +// ADMIN = 'admin', - LAYER7 = 'layer7', - TEAMLOG = 'teamlog', - UNIFOX = 'unifox', - NEFUS = 'nefus', - EMOTION = 'emotion', -} +// LAYER7 = 'layer7', +// TEAMLOG = 'teamlog', +// UNIFOX = 'unifox', +// NEFUS = 'nefus', +// EMOTION = 'emotion', +// } @Entity() export class Admin { @PrimaryColumn() email!: string; - @Column('enum', { - enum: AdminRole, - default: AdminRole.NONE, - }) - role!: AdminRole; + @Column('varchar') + role!: string; }