feat: 이벤트 CRUD (#14)

* feat: Group 속성에 `events` 추가

* feat: Event CRUD

* feat: Group.members > `any`

* feat: [GET] /group/member 수정

* feat: groupService > addEvent, deleteEvent

* feat: Event CRUD

* feat: excel 서비스 common/excel로 이전

* lint: format @trivago/prettier-plugin-sort-imports

* refactor: /common /excel 분리

* fix: eventService Update

* fix: member.controller.spec.ts module dependency

* fix: eslint.yml

* feat: member/excel 엔드포인트 변경

.github/workflows/eslint.yml

@@ -44,7 +44,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: eslint-results.sarif
           wait-for-processing: true

.prettierrc

@@ -1,8 +1,22 @@
 {
   "printWidth": 80,
+  "tabWidth": 2,
   "trailingComma": "all",
   "singleQuote": true,
   "semi": true,
+  "plugins": [
+    "@trivago/prettier-plugin-sort-imports"
+  ],
+  "importOrderParserPlugins": [
+    "typescript",
+    "decorators-legacy"
+  ],
+  "importOrder": [
+    "^@core/(.*)$",
+    "^@server/(.*)$",
+    "^@ui/(.*)$",
+    "^[./]"
+  ],
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true
-}
+}

src/app.module.ts

@@ -1,10 +1,11 @@
 import { Module } from '@nestjs/common';
-import { UserModule } from './user/user.module';
-import { GroupModule } from './group/group.module';
-import { AuthModule } from './auth/auth.module';
-import { MemberModule } from './member/member.module';
 import { ConfigModule } from '@nestjs/config';
+
+import { AuthModule } from './auth/auth.module';
 import { EventModule } from './event/event.module';
+import { GroupModule } from './group/group.module';
+import { MemberModule } from './member/member.module';
+import { UserModule } from './user/user.module';
 
 @Module({
   imports: [

src/auth/auth.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
-import { AuthService } from './auth.service';
+
 import { AuthController } from './auth.controller';
+import { AuthService } from './auth.service';
 
 @Module({
   controllers: [AuthController],

src/config.swagger.ts → src/common/configs/swagger.config.ts

@@ -1,7 +1,7 @@
 import { INestApplication } from '@nestjs/common';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 
-export const configSwagger = (app: INestApplication<any>) => {
+export const swaggerConfig = (app: INestApplication<any>) => {
   const config = new DocumentBuilder()
     .setTitle('sometime API')
     .addTag('Group', '모임 관련 API')

src/api-file.decorator.ts → src/common/decorators/api-file.decorator.ts

@@ -1,6 +1,6 @@
-import { ApiBody, ApiConsumes } from '@nestjs/swagger';
+import { UseInterceptors, applyDecorators } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { applyDecorators, UseInterceptors } from '@nestjs/common';
+import { ApiBody, ApiConsumes } from '@nestjs/swagger';
 
 export function ApiFile(fieldName: string = 'file') {
   return applyDecorators(

src/database/database.module.ts

@@ -1,4 +1,5 @@
 import { Module } from '@nestjs/common';
+
 import { databaseProviders } from './database.providers';
 
 @Module({

src/database/database.providers.ts

@@ -1,5 +1,5 @@
-import * as mongoose from 'mongoose';
 import { ConfigService } from '@nestjs/config';
+import * as mongoose from 'mongoose';
 
 export const databaseProviders = [
   {

src/event/dto/create-event.dto.ts

@@ -1 +1,33 @@
-export class CreateEventDto {}
+import { ApiProperty } from '@nestjs/swagger';
+
+export class CreateEventDto {
+  @ApiProperty({
+    description: '이벤트 이름',
+    example: '2024년 1학기 모임',
+  })
+  name: string;
+
+  @ApiProperty({
+    description: '이벤트 설명',
+    example: '2024년 1학기 모임입니다.',
+  })
+  description: string;
+
+  @ApiProperty({
+    description: '이벤트 시작일',
+    example: new Date().toISOString(),
+  })
+  startDate: Date;
+
+  @ApiProperty({
+    description: '이벤트 종료일',
+    example: new Date(),
+  })
+  endDate: Date;
+
+  @ApiProperty({
+    description: '이벤트 참가비',
+    example: 10000,
+  })
+  fee: number;
+}

src/event/dto/update-event.dto.ts

@@ -1,4 +1,5 @@
 import { PartialType } from '@nestjs/swagger';
+
 import { CreateEventDto } from './create-event.dto';
 
 export class UpdateEventDto extends PartialType(CreateEventDto) {}

src/event/entities/event.entity.ts

@@ -1 +1,8 @@
-export class Event {}
+export class Event {
+  name: string;
+  description: string;
+  startDate: Date;
+  endDate: Date;
+  fee: number;
+  attendees: string[];
+}

src/event/event.controller.ts

@@ -7,10 +7,11 @@ import {
   Patch,
   Post,
 } from '@nestjs/common';
-import { EventService } from './event.service';
+import { ApiOperation, ApiParam, ApiTags } from '@nestjs/swagger';
+
 import { CreateEventDto } from './dto/create-event.dto';
 import { UpdateEventDto } from './dto/update-event.dto';
-import { ApiParam, ApiTags } from '@nestjs/swagger';
+import { EventService } from './event.service';
 
 @ApiTags('Event')
 @Controller('group/:groupId/event')
@@ -23,20 +24,35 @@ export class EventController {
   constructor(private readonly eventService: EventService) {}
 
   @Post()
-  create(@Body() createEventDto: CreateEventDto) {
-    return this.eventService.create(createEventDto);
+  @ApiOperation({
+    summary: '이벤트 생성',
+    description: '모임의 이벤트를 생성합니다.',
+  })
+  create(
+    @Param('groupId') groupId: string,
+    @Body() createEventDto: CreateEventDto,
+  ) {
+    return this.eventService.create(groupId, createEventDto);
   }
 
   @Get()
-  findAll() {
-    return this.eventService.findAll();
+  @ApiOperation({
+    summary: '모임 모든 이벤트 조회',
+    description: '모임의 모든 이벤트를 조회합니다.',
+  })
+  findAll(@Param('groupId') groupId: string) {
+    return this.eventService.findAll(groupId);
   }
 
   @Get(':eventId')
+  @ApiOperation({
+    summary: '이벤트 상세 조회',
+    description: '특정 이벤트를 조회합니다.',
+  })
   @ApiParam({
-    name: 'memberId',
+    name: 'eventId',
     required: true,
-    description: '모임 회원 ID',
+    description: '이벤트 ID',
   })
   findOne(
     @Param('groupId') groupId: string,
@@ -46,25 +62,34 @@ export class EventController {
   }
 
   @Patch(':eventId')
+  @ApiOperation({
+    summary: '이벤트 수정',
+    description: '특정 이벤트를 수정합니다.',
+  })
   @ApiParam({
-    name: 'memberId',
+    name: 'eventId',
     required: true,
-    description: '모임 회원 ID',
+    description: '이벤트 ID',
   })
   update(
+    @Param('groupId') groupId: string,
     @Param('eventId') eventId: string,
     @Body() updateEventDto: UpdateEventDto,
   ) {
-    return this.eventService.update(+eventId, updateEventDto);
+    return this.eventService.update(groupId, eventId, updateEventDto);
   }
 
   @Delete(':eventId')
+  @ApiOperation({
+    summary: '이벤트 삭제',
+    description: '특정 이벤트를 삭제합니다.',
+  })
   @ApiParam({
-    name: 'memberId',
+    name: 'eventId',
     required: true,
-    description: '모임 회원 ID',
+    description: '이벤트 ID',
   })
-  remove(@Param('eventId') eventId: string) {
-    return this.eventService.remove(+eventId);
+  remove(@Param('groupId') groupId: string, @Param('eventId') eventId: string) {
+    return this.eventService.remove(groupId, eventId);
   }
 }

src/event/event.module.ts

@@ -1,9 +1,15 @@
 import { Module } from '@nestjs/common';
-import { EventService } from './event.service';
+
+import { DatabaseModule } from '../database/database.module';
+import { GroupModule } from '../group/group.module';
 import { EventController } from './event.controller';
+import { eventProviders } from './event.providers';
+import { EventRepository } from './event.repository';
+import { EventService } from './event.service';
 
 @Module({
+  imports: [DatabaseModule, GroupModule],
   controllers: [EventController],
-  providers: [EventService],
+  providers: [EventService, ...eventProviders, EventRepository],
 })
 export class EventModule {}

src/event/event.providers.ts

@@ -0,0 +1,12 @@
+import { Connection } from 'mongoose';
+
+import { EventSchema } from './schemas/event.schema';
+
+export const eventProviders = [
+  {
+    provide: 'EVENT_MODEL',
+    useFactory: (connection: Connection) =>
+      connection.model('Event', EventSchema),
+    inject: ['MONGODB_CONNECTION'],
+  },
+];

src/event/event.repository.ts

@@ -0,0 +1,35 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Model } from 'mongoose';
+
+import { CreateEventDto } from './dto/create-event.dto';
+import { Event } from './interfaces/event.interface';
+
+@Injectable()
+export class EventRepository {
+  constructor(
+    @Inject('EVENT_MODEL')
+    private readonly eventModel: Model<Event>,
+  ) {}
+
+  async create(createEventDto: CreateEventDto): Promise<Event> {
+    return await this.eventModel.create(createEventDto);
+  }
+
+  findAll(): Promise<Event[]> {
+    return this.eventModel.find().exec();
+  }
+
+  async findOne(eventId: string): Promise<Event> {
+    return await this.eventModel.findById(eventId).exec();
+  }
+
+  update(eventId: string, event: Event): Promise<Event> {
+    return this.eventModel
+      .findByIdAndUpdate(eventId, event, { new: true })
+      .exec();
+  }
+
+  delete(eventId: string) {
+    this.eventModel.findByIdAndDelete(eventId);
+  }
+}

src/event/event.service.ts

@@ -1,29 +1,65 @@
 import { Injectable } from '@nestjs/common';
+
+import { GroupService } from '../group/group.service';
 import { CreateEventDto } from './dto/create-event.dto';
 import { UpdateEventDto } from './dto/update-event.dto';
+import { EventRepository } from './event.repository';
 
 @Injectable()
 export class EventService {
-  create(createEventDto: CreateEventDto) {
-    return createEventDto;
+  constructor(
+    private readonly eventRepository: EventRepository,
+    private readonly groupService: GroupService,
+  ) {}
+
+  async create(groupId: string, createEventDto: CreateEventDto) {
+    const createdEvent = await this.eventRepository.create(createEventDto);
+    await this.groupService.addEvent(groupId, createdEvent.id);
+
+    return createdEvent;
   }
 
-  findAll() {
-    return `This action returns all event`;
+  async findAll(groupId: string) {
+    const group = await this.groupService.findOne(groupId);
+
+    const events = [];
+    for (const eventId of group.events) {
+      events.push(await this.eventRepository.findOne(eventId));
+    }
+
+    return events;
   }
 
-  findOne(groupId: string, eventId: string) {
+  async findOne(groupId: string, eventId: string) {
+    const group = await this.groupService.findOne(groupId);
+    const event = await this.eventRepository.findOne(eventId);
+
     return {
-      groupId,
-      eventId,
+      group,
+      event,
     };
   }
 
-  update(eventId: number, updateEventDto: UpdateEventDto) {
-    return `This action updates a #${eventId} event` + updateEventDto;
+  async update(
+    groupId: string,
+    eventId: string,
+    updateEventDto: UpdateEventDto,
+  ) {
+    const group = await this.groupService.findOne(groupId);
+    const event = await this.eventRepository.findOne(eventId);
+
+    for (const key in updateEventDto) {
+      event[key] = updateEventDto[key];
+    }
+    await this.eventRepository.update(eventId, event);
+
+    return {
+      group,
+      event,
+    };
   }
 
-  remove(eventId: number) {
-    return `This action removes a #${eventId} event`;
+  async remove(groupId: string, eventId: string) {
+    return await this.groupService.deleteEvent(groupId, eventId);
   }
 }

src/event/interfaces/event.interface.ts

@@ -0,0 +1,10 @@
+import { Document } from 'mongoose';
+
+export interface Event extends Document {
+  name: string;
+  description: string;
+  startDate: Date;
+  endDate: Date;
+  fee: number;
+  attendees: string[];
+}