From 10d14fe8695d14dc34cf0168cefdc99bed6c390b Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Mon, 1 Jul 2019 12:08:40 +0300
Subject: [PATCH] finished cleaning up code

---
 ormconfig.json                            | 12 ------------
 ormconfig.json.example                    | 22 +++++++++++-----------
 src/app.module.ts                         |  5 ++---
 src/draw/coordinate.entity.ts             |  1 +
 src/draw/draw.controller.ts               |  5 +++--
 src/draw/draw.module.ts                   |  6 +++---
 src/draw/draw.service.ts                  |  3 ++-
 src/draw/mapdrawing.dto.ts                |  5 +++--
 src/faction/faction.controller.ts         |  9 +++++----
 src/faction/faction.dto.ts                |  1 +
 src/faction/faction.entity.ts             |  1 +
 src/faction/faction.module.ts             | 13 ++++++++++++-
 src/faction/faction.service.ts            |  3 ++-
 src/game/game.dto.ts                      |  1 +
 src/game/game.entity.ts                   |  2 +-
 src/game/game.service.ts                  |  2 +-
 src/main.ts                               |  3 +--
 src/notifications/notifications.module.ts |  3 ++-
 src/task/task.controller.ts               |  2 +-
 src/task/task.entity.ts                   |  5 +++--
 src/user/user.entity.ts                   |  1 +
 21 files changed, 57 insertions(+), 48 deletions(-)
 delete mode 100644 ormconfig.json

diff --git a/ormconfig.json b/ormconfig.json
deleted file mode 100644
index 719a97d..0000000
--- a/ormconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "type": "postgres",
-  "host": "localhost",
-  "port": 5444,
-  "username": "postgres",
-  "password": "mysecretpassword",
-  "database": "test2",
-  "entities": ["src/**/*.entity{.ts,.js}"],
-  "synchronize": true,
-  "logging": true,
-  "dropSchema": true
-}
diff --git a/ormconfig.json.example b/ormconfig.json.example
index e5a401d..78ed436 100644
--- a/ormconfig.json.example
+++ b/ormconfig.json.example
@@ -1,12 +1,12 @@
-
 {
-    "type": "",
-    "host": "",
-    "port": ,
-    "username": "",
-    "password": "",
-    "database": "",
-    "entities": ["src/**/*.entity{.ts,.js}"],
-    "synchronize": true,
-    "logging": true
-  }
\ No newline at end of file
+  "type": "postgres",
+  "host": "localhost",
+  "port": 5432,
+  "username": "ehasa",
+  "password": "salasana",
+  "database": "ehasa",
+  "entities": ["src/**/*.entity{.ts,.js}"],
+  "synchronize": true,
+  "logging": true,
+  "dropSchema": true
+}
diff --git a/src/app.module.ts b/src/app.module.ts
index 3be0c38..738a6c1 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -1,9 +1,10 @@
 import { Module } from '@nestjs/common';
 import { APP_FILTER, APP_INTERCEPTOR, APP_GUARD } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
+import { Connection } from 'typeorm';
+
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import { Connection } from 'typeorm';
 import { UserModule } from './user/user.module';
 import { HttpErrorFilter } from './shared/http-error.filter';
 import { LoggingInterceptor } from './shared/logging.interceptor';
@@ -14,8 +15,6 @@ import { TaskModule } from './task/task.module';
 import { DrawModule } from './draw/draw.module';
 import { FactionModule } from './faction/faction.module';
 
-
-
 @Module({
   imports: [
     TypeOrmModule.forRoot(),
diff --git a/src/draw/coordinate.entity.ts b/src/draw/coordinate.entity.ts
index b8ddbaa..9cee16c 100644
--- a/src/draw/coordinate.entity.ts
+++ b/src/draw/coordinate.entity.ts
@@ -5,6 +5,7 @@ import {
   ManyToOne,
   Timestamp,
 } from 'typeorm';
+
 import { Game_PersonEntity, GameEntity } from '../game/game.entity';
 import { FactionEntity } from '../faction/faction.entity';
 
diff --git a/src/draw/draw.controller.ts b/src/draw/draw.controller.ts
index 361144a..21306d7 100644
--- a/src/draw/draw.controller.ts
+++ b/src/draw/draw.controller.ts
@@ -8,9 +8,10 @@ import {
   ValidationPipe,
   Body,
 } from '@nestjs/common';
-import { AuthGuard } from 'src/shared/auth.guard';
+
+import { AuthGuard } from '../shared/auth.guard';
 import { DrawService } from './draw.service';
-import { Roles } from 'src/shared/roles.decorator';
+import { Roles } from '../shared/roles.decorator';
 
 /*
       DrawController
diff --git a/src/draw/draw.module.ts b/src/draw/draw.module.ts
index f7599b6..a56cbbb 100644
--- a/src/draw/draw.module.ts
+++ b/src/draw/draw.module.ts
@@ -3,9 +3,9 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { DrawController } from './draw.controller';
 import { DrawService } from './draw.service';
-import { MapDrawingEntity } from 'src/draw/coordinate.entity';
-import { FactionEntity } from 'src/faction/faction.entity';
-import { Game_PersonEntity } from 'src/game/game.entity';
+import { MapDrawingEntity } from '../draw/coordinate.entity';
+import { FactionEntity } from '../faction/faction.entity';
+import { Game_PersonEntity } from '../game/game.entity';
 /*
 Draw
 - contains everything to do with mapdrawing data.
diff --git a/src/draw/draw.service.ts b/src/draw/draw.service.ts
index c680a3e..97556e6 100644
--- a/src/draw/draw.service.ts
+++ b/src/draw/draw.service.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { MapDrawingEntity } from 'src/draw/coordinate.entity';
 import { Repository } from 'typeorm';
 
+import { MapDrawingEntity } from '../draw/coordinate.entity';
+
 @Injectable()
 export class DrawService {
   constructor(
diff --git a/src/draw/mapdrawing.dto.ts b/src/draw/mapdrawing.dto.ts
index 53c4ddf..03eca2d 100644
--- a/src/draw/mapdrawing.dto.ts
+++ b/src/draw/mapdrawing.dto.ts
@@ -1,9 +1,10 @@
+import { IsUUID } from 'class-validator';
+
 import { GameDTO } from '../game/game.dto';
 import { GameEntity, Game_PersonEntity } from '../game/game.entity';
 import { FactionEntity } from '../faction/faction.entity';
-import { MapDrawingEntity } from '../draw/coordinate.entity';
-import { IsUUID } from 'class-validator';
 import { FactionDTO } from '../faction/faction.dto';
+import { MapDrawingEntity } from '../draw/coordinate.entity';
 
 export class MapDrawingDTO {
   data: JSON;
diff --git a/src/faction/faction.controller.ts b/src/faction/faction.controller.ts
index cdeccab..9ff84e5 100644
--- a/src/faction/faction.controller.ts
+++ b/src/faction/faction.controller.ts
@@ -8,12 +8,13 @@ import {
   Get,
   Put,
 } from '@nestjs/common';
-import { AuthGuard } from 'src/shared/auth.guard';
-import { ValidationPipe } from 'src/shared/validation.pipe';
-import { User } from 'src/user/user.decorator';
+
+import { AuthGuard } from '../shared/auth.guard';
+import { ValidationPipe } from '../shared/validation.pipe';
+import { User } from '../user/user.decorator';
 import { GameGroupDTO, PromotePlayerDTO, JoinFactionDTO } from './faction.dto';
 import { FactionService } from './faction.service';
-import { Roles } from 'src/shared/roles.decorator';
+import { Roles } from '../shared/roles.decorator';
 
 @Controller('faction')
 export class FactionController {
diff --git a/src/faction/faction.dto.ts b/src/faction/faction.dto.ts
index 4be940e..ccc7672 100644
--- a/src/faction/faction.dto.ts
+++ b/src/faction/faction.dto.ts
@@ -5,6 +5,7 @@ import {
   IsString,
   IsNotEmpty,
 } from 'class-validator';
+
 import { GameEntity } from '../game/game.entity';
 import { RoleValidation } from '../shared/custom-validation';
 import { GameDTO } from '../game/game.dto';
diff --git a/src/faction/faction.entity.ts b/src/faction/faction.entity.ts
index e1b04e0..da8c418 100644
--- a/src/faction/faction.entity.ts
+++ b/src/faction/faction.entity.ts
@@ -7,6 +7,7 @@ import {
   OneToOne,
   Timestamp,
 } from 'typeorm';
+
 import { GameEntity } from '../game/game.entity';
 import { Game_PersonEntity } from '../game/game.entity';
 import { MapDrawingEntity } from '../draw/coordinate.entity';
diff --git a/src/faction/faction.module.ts b/src/faction/faction.module.ts
index 0ef1521..dcb399a 100644
--- a/src/faction/faction.module.ts
+++ b/src/faction/faction.module.ts
@@ -1,9 +1,20 @@
 import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
 import { FactionController } from './faction.controller';
 import { FactionService } from './faction.service';
+import { GameGroupEntity, FactionEntity } from './faction.entity';
+import { Game_PersonEntity } from '../game/game.entity';
 
 @Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      FactionEntity,
+      Game_PersonEntity,
+      GameGroupEntity,
+    ]),
+  ],
   controllers: [FactionController],
-  providers: [FactionService]
+  providers: [FactionService],
 })
 export class FactionModule {}
diff --git a/src/faction/faction.service.ts b/src/faction/faction.service.ts
index df826f1..5814aeb 100644
--- a/src/faction/faction.service.ts
+++ b/src/faction/faction.service.ts
@@ -1,7 +1,8 @@
 import { Injectable, HttpException, HttpStatus } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { FactionEntity, GameGroupEntity } from './faction.entity';
 import { Repository } from 'typeorm';
+
+import { FactionEntity, GameGroupEntity } from './faction.entity';
 import { JoinFactionDTO, GameGroupDTO } from './faction.dto';
 import { Game_PersonEntity } from '../game/game.entity';
 
diff --git a/src/game/game.dto.ts b/src/game/game.dto.ts
index 89bc3cc..09c39b7 100644
--- a/src/game/game.dto.ts
+++ b/src/game/game.dto.ts
@@ -8,6 +8,7 @@ import {
   Min,
   Max,
 } from 'class-validator';
+
 import { ObjectivePointEntity } from './game.entity';
 import { CenterJSON } from '../shared/custom-validation';
 import { FactionDTO } from '../faction/faction.dto';
diff --git a/src/game/game.entity.ts b/src/game/game.entity.ts
index 519cdc3..9038b5a 100644
--- a/src/game/game.entity.ts
+++ b/src/game/game.entity.ts
@@ -9,10 +9,10 @@ import {
   JoinColumn,
 } from 'typeorm';
 
+import { MapDrawingEntity } from '../draw/coordinate.entity';
 import { PersonEntity } from '../user/user.entity';
 import { GameGroupEntity } from '../faction/faction.entity';
 import { FactionEntity } from '../faction/faction.entity';
-import { MapDrawingEntity } from '../draw/coordinate.entity';
 import { TaskEntity } from '../task/task.entity';
 
 // table that stores all created games
diff --git a/src/game/game.service.ts b/src/game/game.service.ts
index fd29f69..1bad6ae 100644
--- a/src/game/game.service.ts
+++ b/src/game/game.service.ts
@@ -11,7 +11,7 @@ import {
 import { GameDTO, FlagboxEventDTO } from './game.dto';
 import { PersonEntity } from '../user/user.entity';
 import { FactionEntity } from '../faction/faction.entity';
-import { NotificationGateway } from 'src/notifications/notifications.gateway';
+import { NotificationGateway } from '../notifications/notifications.gateway';
 
 @Injectable()
 export class GameService {
diff --git a/src/main.ts b/src/main.ts
index 1e3e4e1..68871be 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,7 +3,6 @@ import * as rateLimit from 'express-rate-limit';
 
 import { AppModule } from './app.module';
 
-
 /*
   Main.ts starts the server.
 */
@@ -13,7 +12,7 @@ import { AppModule } from './app.module';
 // see https://github.com/nfriedly/express-rate-limit/issues/138
 const limiter = (rateLimit as any)({
   windowMs: 60 * 1000, // one minute
-  max: 100 // limit each IP to 100 requests per windowMs
+  max: 100, // limit each IP to 100 requests per windowMs
 });
 
 async function bootstrap() {
diff --git a/src/notifications/notifications.module.ts b/src/notifications/notifications.module.ts
index 97cf59c..194c5c3 100644
--- a/src/notifications/notifications.module.ts
+++ b/src/notifications/notifications.module.ts
@@ -1,7 +1,8 @@
 import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
 import { NotificationGateway } from './notifications.gateway';
 import { NotificationEntity } from './notification.entity';
-import { TypeOrmModule } from '@nestjs/typeorm';
 
 @Module({
   imports: [TypeOrmModule.forFeature([NotificationEntity])],
diff --git a/src/task/task.controller.ts b/src/task/task.controller.ts
index 38a63bf..2cb030f 100644
--- a/src/task/task.controller.ts
+++ b/src/task/task.controller.ts
@@ -4,7 +4,7 @@ import { TaskService } from './task.service';
 import { CreateTaskDTO, EditTaskDTO } from './task.dto';
 import { Roles } from '../shared/roles.decorator';
 import { ValidationPipe } from '../shared/validation.pipe';
-import { User } from 'src/user/user.decorator';
+import { User } from '../user/user.decorator';
 
 @Controller('task')
 export class TaskController {
diff --git a/src/task/task.entity.ts b/src/task/task.entity.ts
index 0e56d13..85ee3c2 100644
--- a/src/task/task.entity.ts
+++ b/src/task/task.entity.ts
@@ -5,8 +5,9 @@ import {
   ManyToOne,
   JoinColumn,
 } from 'typeorm';
-import { FactionEntity } from 'src/faction/faction.entity';
-import { GameEntity } from 'src/game/game.entity';
+
+import { FactionEntity } from '../faction/faction.entity';
+import { GameEntity } from '../game/game.entity';
 
 @Entity('Task')
 export class TaskEntity {
diff --git a/src/user/user.entity.ts b/src/user/user.entity.ts
index 1e44121..20f16a0 100644
--- a/src/user/user.entity.ts
+++ b/src/user/user.entity.ts
@@ -7,6 +7,7 @@ import {
 } from 'typeorm';
 import * as bcrypt from 'bcryptjs';
 import * as jwt from 'jsonwebtoken';
+
 import { Game_PersonEntity } from '../game/game.entity';
 
 @Entity('Person')
-- 
GitLab