♻️ Gather killer in one module

knex/migrations/20211204161156_create_table_room.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
 
-import { ROOM, RoomStatus } from '../../src/modules/room/constants';
+import { ROOM, RoomStatus } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.createTable(ROOM, (table) => {

knex/migrations/20211204162503_create_table_player.ts

@@ -2,10 +2,10 @@ import { Knex } from 'knex';
 
 import {
   PLAYER,
+  ROOM,
   PlayerRole,
   PlayerStatus,
-} from '../../src/modules/player/constants';
-import { ROOM } from '../../src/modules/room/constants';
+} from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.createTable(PLAYER, (table) => {

knex/migrations/20211204163342_create_table_mission.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
 
-import { MISSION } from '../../src/modules/mission/constants';
+import { MISSION } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.createTable(MISSION, (table) => {

knex/migrations/20211204174016_add_target_and_mission_to_player.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 
-import { MISSION } from '../../src/modules/mission/constants';
-import { PLAYER } from '../../src/modules/player/constants';
+import { MISSION, PLAYER } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.table(PLAYER, (table) => {

knex/migrations/20220108121230_room_code_primary_key.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 
-import { PLAYER } from '../../src/modules/player/constants';
-import { ROOM } from '../../src/modules/room/constants';
+import { PLAYER, ROOM } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   await knex.schema.table(PLAYER, (table) => {

knex/migrations/20220109142006_player_passcode_string.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
 
-import { PLAYER } from '../../src/modules/player/constants';
+import { PLAYER } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.alterTable(PLAYER, (table) => {

knex/migrations/20220122153520_create_mission_room.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
 
-import { MISSION_ROOM } from '../../src/modules/mission/constants';
+import { MISSION_ROOM } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.createTable(MISSION_ROOM, (table) => {

knex/migrations/20220205151550_add_mission_author_id.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 
-import { MISSION_ROOM } from '../../src/modules/mission/constants';
-import { PLAYER } from '../../src/modules/player/constants';
+import { MISSION_ROOM, PLAYER } from '../../src/modules/killer/constants';
 
 export async function up(knex: Knex): Promise<void> {
   return knex.schema.alterTable(MISSION_ROOM, (table) => {

knex/seeds/seed.ts

@@ -1,12 +1,13 @@
 import { Knex } from 'knex';
 
-import { MISSION, MISSION_ROOM } from '../../src/modules/mission/constants';
+import { MISSION, MISSION_ROOM } from '../../src/modules/killer/constants';
 import {
   PLAYER,
   PlayerRole,
   PlayerStatus,
-} from '../../src/modules/player/constants';
-import { ROOM, RoomStatus } from '../../src/modules/room/constants';
+  ROOM,
+  RoomStatus,
+} from '../../src/modules/killer/constants';
 
 export async function seed(knex: Knex): Promise<void> {
   // Deletes ALL existing entries

src/app.module.ts

@@ -16,9 +16,7 @@ import { I18nJsonParser, I18nModule } from 'nestjs-i18n';
 import { appConfig, databaseConfig, mercureConfig } from './app.config';
 import { HttpExceptionFilter } from './exceptions/http-exception.filter';
 import { DatabaseModule } from './modules/database/database.module';
-import { MissionModule } from './modules/mission/mission.module';
-import { PlayerModule } from './modules/player/player.module';
-import { RoomModule } from './modules/room/room.module';
+import { KillerModule } from './modules/killer/killer.module';
 import { SseModule } from './modules/sse/sse.module';
 
 @Module({
@@ -27,9 +25,6 @@ import { SseModule } from './modules/sse/sse.module';
       load: [appConfig, databaseConfig, mercureConfig],
       isGlobal: true,
     }),
-    PlayerModule,
-    RoomModule,
-    MissionModule,
     DatabaseModule,
     EventEmitterModule.forRoot({
       wildcard: true,
@@ -43,6 +38,7 @@ import { SseModule } from './modules/sse/sse.module';
       },
     }),
     SseModule,
+    KillerModule,
   ],
   providers: [
     {

src/declarations.d.ts

@@ -1,4 +1,4 @@
-import { PlayerModel } from './modules/player/player.model';
+import { PlayerModel } from './modules/killer/models/player.model';
 
 interface Class {
   new (...args: unknown[]): unknown;

src/exceptions/http-exception.filter.ts

@@ -1,7 +1,7 @@
 import {
-  ExceptionFilter,
-  Catch,
   ArgumentsHost,
+  Catch,
+  ExceptionFilter,
   HttpException,
 } from '@nestjs/common';
 import { Response } from 'express';

src/modules/mission/__tests__/mission.controller.spec.ts → src/modules/killer/__tests__/controllers/mission.controller.spec.ts

@@ -1,8 +1,8 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { MissionController } from '../mission.controller';
-import { MissionService } from '../mission.service';
+import { MissionController } from '../../controllers/mission.controller';
+import { MissionService } from '../../services/mission.service';
 
 describe('MissionController', () => {
   let controller: MissionController;

src/modules/player/__tests__/player.controller.spec.ts → src/modules/killer/__tests__/controllers/player.controller.spec.ts

@@ -2,8 +2,8 @@ import { ConfigModule } from '@nestjs/config';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Test } from '@nestjs/testing';
 
-import { PlayerController } from '../player.controller';
-import { PlayerService } from '../services/player.service';
+import { PlayerController } from '../../controllers/player.controller';
+import { PlayerService } from '../../services/player.service';
 
 describe('PlayerController', () => {
   let controller: PlayerController;

src/modules/room/__tests__/room.controller.spec.ts → src/modules/killer/__tests__/controllers/room.controller.spec.ts

@@ -1,8 +1,8 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { RoomController } from '../room.controller';
-import { RoomService } from '../services/room.service';
+import { RoomController } from '../../controllers/room.controller';
+import { RoomService } from '../../services/room.service';
 
 describe('RoomController', () => {
   let controller: RoomController;

src/modules/mission/__tests__/mission.service.spec.ts → src/modules/killer/__tests__/services/mission.service.spec.ts

@@ -1,10 +1,10 @@
 import { NotFoundException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DatabaseService } from '../../database/database.service';
-import { PlayerRole, PlayerStatus } from '../../player/constants';
-import { MissionRepository } from '../mission.repository';
-import { MissionService } from '../mission.service';
+import { DatabaseService } from '../../../database/database.service';
+import { PlayerRole, PlayerStatus } from '../../constants';
+import { MissionRepository } from '../../repositories/mission.repository';
+import { MissionService } from '../../services/mission.service';
 
 describe('MissionService', () => {
   let service: MissionService;

src/modules/player/__tests__/player.service.spec.ts → src/modules/killer/__tests__/services/player.service.spec.ts

@@ -3,14 +3,13 @@ import { ConfigModule } from '@nestjs/config';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DatabaseService } from '../../database/database.service';
-import { MissionRepository } from '../../mission/mission.repository';
-import { MissionService } from '../../mission/mission.service';
-import { RoomStatus } from '../../room/constants';
-import { PlayerRole, PlayerStatus } from '../constants';
-import { PlayerRepository } from '../player.repository';
-import { PlayerKilledService } from '../services/player-killed.service';
-import { PlayerService } from '../services/player.service';
+import { DatabaseService } from '../../../database/database.service';
+import { PlayerRole, PlayerStatus, RoomStatus } from '../../constants';
+import { MissionRepository } from '../../repositories/mission.repository';
+import { PlayerRepository } from '../../repositories/player.repository';
+import { MissionService } from '../../services/mission.service';
+import { PlayerKilledService } from '../../services/player-killed.service';
+import { PlayerService } from '../../services/player.service';
 
 describe('PlayerService', () => {
   let service: PlayerService;

src/modules/room/__tests__/room.service.spec.ts → src/modules/killer/__tests__/services/room.service.spec.ts

@@ -2,15 +2,14 @@ import { BadRequestException, NotFoundException } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DatabaseService } from '../../database/database.service';
-import { PlayerRole, PlayerStatus } from '../../player/constants';
-import { PlayerRepository } from '../../player/player.repository';
-import { PlayerKilledService } from '../../player/services/player-killed.service';
-import { PlayerService } from '../../player/services/player.service';
-import { RoomStatus } from '../constants';
-import { RoomRepository } from '../room.repository';
-import { GameStartingService } from '../services/game-starting.service';
-import { RoomService } from '../services/room.service';
+import { DatabaseService } from '../../../database/database.service';
+import { PlayerRole, PlayerStatus, RoomStatus } from '../../constants';
+import { PlayerRepository } from '../../repositories/player.repository';
+import { RoomRepository } from '../../repositories/room.repository';
+import { GameStartingService } from '../../services/game-starting.service';
+import { PlayerKilledService } from '../../services/player-killed.service';
+import { PlayerService } from '../../services/player.service';
+import { RoomService } from '../../services/room.service';
 
 describe('RoomService', () => {
   let service: RoomService;

src/modules/killer/constants.ts

@@ -0,0 +1,24 @@
+export const MISSION = 'mission';
+export const MISSION_ROOM = 'mission_room';
+
+export enum PlayerStatus {
+  ALIVE = 'ALIVE',
+  KILLED = 'KILLED',
+}
+
+export enum PlayerRole {
+  PLAYER = 'PLAYER',
+  ADMIN = 'ADMIN',
+}
+
+export const PLAYER = 'player';
+
+export enum RoomStatus {
+  PENDING = 'PENDING',
+  IN_GAME = 'IN_GAME',
+  ENDED = 'ENDED',
+}
+
+export const ROOM = 'room';
+
+export const MINIMUM_PLAYER_IN_ROOM = 3;

src/modules/mission/mission.controller.ts → src/modules/killer/controllers/mission.controller.ts

@@ -11,22 +11,19 @@ import {
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { ApiOperation } from '@nestjs/swagger';
 
-import { Serialize } from '../../interceptors/serializer.interceptor';
-import { PlayerRole } from '../player/constants';
-import { Player } from '../player/decorators/player.decorator';
-import { Role } from '../player/decorators/role.decorator';
-import { PlayerModel } from '../player/player.model';
-import { RoomStatus } from '../room/constants';
-import { Status } from '../room/decorators/status.decorator';
-import { MercureEvent } from '../sse/models/mercure-event';
-import { MercureEventType } from '../sse/models/mercure-event-types';
-
-import { MISSION } from './constants';
-import { CreateMissionDto } from './dtos/create-mission.dto';
-import { MissionDto } from './dtos/mission.dto';
-import { UpdateMissionDto } from './dtos/update-mission.dto';
-import { MissionModel } from './mission.model';
-import { MissionService } from './mission.service';
+import { Serialize } from '../../../interceptors/serializer.interceptor';
+import { MercureEvent } from '../../sse/models/mercure-event';
+import { MercureEventType } from '../../sse/models/mercure-event-types';
+import { MISSION, PlayerRole, RoomStatus } from '../constants';
+import { Player } from '../decorators/player.decorator';
+import { Role } from '../decorators/role.decorator';
+import { Status } from '../decorators/status.decorator';
+import { CreateMissionDto } from '../dtos/create-mission.dto';
+import { MissionDto } from '../dtos/mission.dto';
+import { UpdateMissionDto } from '../dtos/update-mission.dto';
+import { MissionModel } from '../models/mission.model';
+import { PlayerModel } from '../models/player.model';
+import { MissionService } from '../services/mission.service';
 
 @Controller(MISSION)
 @Serialize(MissionDto)

src/modules/player/player.controller.ts → src/modules/killer/controllers/player.controller.ts

@@ -14,20 +14,19 @@ import { ConfigService } from '@nestjs/config';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Response } from 'express';
 
-import { Serialize } from '../../interceptors/serializer.interceptor';
-import { MercureEvent } from '../sse/models/mercure-event';
-import { MercureEventType } from '../sse/models/mercure-event-types';
-
-import { PLAYER, PlayerRole } from './constants';
-import { Player } from './decorators/player.decorator';
-import { Role } from './decorators/role.decorator';
-import { CreatePlayerDto } from './dtos/create-player.dto';
-import { GetMyPlayerDto } from './dtos/get-my-player.dto';
-import { PlayerDto } from './dtos/player.dto';
-import { TargetDto } from './dtos/target.dto';
-import { UpdatePlayerDto } from './dtos/update-player.dto';
-import { PlayerModel } from './player.model';
-import { PlayerService } from './services/player.service';
+import { Serialize } from '../../../interceptors/serializer.interceptor';
+import { MercureEvent } from '../../sse/models/mercure-event';
+import { MercureEventType } from '../../sse/models/mercure-event-types';
+import { PLAYER, PlayerRole } from '../constants';
+import { Player } from '../decorators/player.decorator';
+import { Role } from '../decorators/role.decorator';
+import { CreatePlayerDto } from '../dtos/create-player.dto';
+import { GetMyPlayerDto } from '../dtos/get-my-player.dto';
+import { PlayerDto } from '../dtos/player.dto';
+import { TargetDto } from '../dtos/target.dto';
+import { UpdatePlayerDto } from '../dtos/update-player.dto';
+import { PlayerModel } from '../models/player.model';
+import { PlayerService } from '../services/player.service';
 
 @Controller(PLAYER)
 @Serialize(PlayerDto)

src/modules/room/room.controller.ts → src/modules/killer/controllers/room.controller.ts

@@ -9,18 +9,16 @@ import {
   Post,
 } from '@nestjs/common';
 
-import { Serialize } from '../../interceptors/serializer.interceptor';
-import { PlayerRole } from '../player/constants';
-import { Player } from '../player/decorators/player.decorator';
-import { Role } from '../player/decorators/role.decorator';
-import { PlayerListDto } from '../player/dtos/player-list.dto';
-import { PlayerModel } from '../player/player.model';
-
-import { ROOM } from './constants';
-import { PatchRoomPlayerDto } from './dtos/patch-room-player.dto';
-import { RoomDto } from './dtos/room.dto';
-import { UpdateRoomDto } from './dtos/update-room.dto';
-import { RoomService } from './services/room.service';
+import { Serialize } from '../../../interceptors/serializer.interceptor';
+import { PlayerRole, ROOM } from '../constants';
+import { Player } from '../decorators/player.decorator';
+import { Role } from '../decorators/role.decorator';
+import { PatchRoomPlayerDto } from '../dtos/patch-room-player.dto';
+import { PlayerListDto } from '../dtos/player-list.dto';
+import { RoomDto } from '../dtos/room.dto';
+import { UpdateRoomDto } from '../dtos/update-room.dto';
+import { PlayerModel } from '../models/player.model';
+import { RoomService } from '../services/room.service';
 
 @Controller(ROOM)
 export class RoomController {

src/modules/room/dtos/patch-room-player.dto.ts → src/modules/killer/dtos/patch-room-player.dto.ts

@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsOptional, IsString } from 'class-validator';
 
-import { PlayerRole } from '../../player/constants';
+import { PlayerRole } from '../constants';
 
 export class PatchRoomPlayerDto {
   @ApiProperty()