Database edited. TypeORM

src/app.module.ts

@@ -8,12 +8,13 @@ import { UserModule } from './user/user.module';
 import { HttpErrorFilter } from './shared/http-error.filter';
 import { LoggingInterceptor } from './shared/logging.interceptor';
 import { MapMarkerModule } from './mapmarkers/mapmarkers.module';
+import { GameController } from './game/game.controller';
 
 
 
 @Module({
   imports: [TypeOrmModule.forRoot(), UserModule, MapMarkerModule],
-  controllers: [AppController],
+  controllers: [AppController, GameController],
   providers: [
     AppService, {
       provide: APP_FILTER,

src/game/coordinate.entity.ts

-import { Entity, Column, PrimaryGeneratedColumn, BeforeInsert, ManyToMany, OneToMany, ManyToOne, JoinTable } from 'typeorm';
+import { Entity, Column, PrimaryGeneratedColumn, BeforeInsert, ManyToMany, OneToMany, ManyToOne, JoinTable, Timestamp } from 'typeorm';
 import {Game_PersonEntity, ObjectivePointEntity, GameEntity} from './game.entity'
 import { FactionEntity } from './faction.entity'
 //import { MapEntity, MapDrawingEntity } from '../map/map.entity'
@@ -8,6 +8,7 @@ export class CoordinateEntity {
     @PrimaryGeneratedColumn('uuid') coordinateId: string;
     @Column({type: 'geometry'}) longitude: string;
     @Column({type: 'geometry'}) latitude: string;
+    @Column() coordinateTimestamp: Timestamp;
 
     @ManyToMany(type => MapDrawingEntity, mapDrawings => mapDrawings.mapDrawings_coordinates)
     mapDrawings: MapDrawingEntity[];

src/game/game.controller.spec.ts

+import { Test, TestingModule } from '@nestjs/testing';
+import { GameController } from './game.controller';
+
+describe('Game Controller', () => {
+  let controller: GameController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [GameController],
+    }).compile();
+
+    controller = module.get<GameController>(GameController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});

src/game/game.controller.ts

-import { Controller, Post, Body } from '@nestjs/common';
-import {CreateGameDTO} from './game.dto'
+import { Controller } from '@nestjs/common';
 
 @Controller('game')
-export class GameController{
-    @Post()
-    create(@Body() data: CreateGameDTO) {
-        return this//.gameService.register(data);
-    }
-}
+export class GameController {
+    
+}
\ No newline at end of file

src/game/game.dto.ts

@@ -22,9 +22,6 @@ export class CreateGameDTO {
     @IsArray() @IsNotEmpty()
     factions?: FactionEntity[];
 
-    @IsArray() @IsNotEmpty()
-    powerUps?: PowerUpDTO[];
-
     @IsArray() @IsNotEmpty()
     objectivePoint?: ObjectivePointDTO[];
 
@@ -44,7 +41,7 @@ export class FactionDTO {
 
 }
 
-export class PowerUpDTO {
+/*export class PowerUpDTO {
     @IsString() @IsNotEmpty()
     powerUpName: string;
 
@@ -56,7 +53,7 @@ export class PowerUpDTO {
 
     @IsNotEmpty()
     cooldown: string;
-}
+}*/
 
 export class ObjectivePointDTO {
     @IsString() @IsNotEmpty()

src/game/game.entity.ts

 import { Entity, Column, PrimaryGeneratedColumn, OneToMany, ManyToOne, ManyToMany, Timestamp, JoinTable } from 'typeorm';
+import * as bcrypt from 'bcryptjs';
 import {PersonEntity, PersonRoleEntity} from '../user/user.entity'
 import {FactionEntity} from './faction.entity'
-import {CoordinateEntity} from './coordinate.entity'
-import { MapEntity } from './coordinate.entity'
+import {CoordinateEntity, MapEntity} from './coordinate.entity'
 
 @Entity('Game')
 export class GameEntity {
@@ -23,8 +23,12 @@ export class GameEntity {
     objective_points: ObjectivePointEntity[];
     
     gameObject() {
-        const {gameId, gameName, gameDescription, startDate, endDate, GM_Password} = this;
-        return this;
+        const {gameId, gameName, gameDescription, startDate, endDate, factions, objective_points, map, GM_Password} = this;
+        return {gameId, gameName, gameDescription, startDate, endDate, factions, objective_points, map, GM_Password};
+    }
+
+    async comparePassword(attempt: string) {
+        return await bcrypt.compareSync(attempt, this.GM_Password);
     }
 }
 

src/game/game.module.ts

+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { GameController } from './game.controller';
+import { GameService } from './game.service';
+import { GameEntity } from './game.entity';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([GameEntity])],
+  controllers: [GameController],
+  providers: [GameService]
+})
+export class GameModule {}
\ No newline at end of file

src/game/game.service.ts

@@ -6,18 +6,18 @@ import { GameEntity } from './game.entity';
 import { CreateGameDTO } from './game.dto';
 
 @Injectable()
-export class UserService {
+export class GameService {
     constructor(@InjectRepository(GameEntity) private userRepository: Repository<GameEntity>){}
 
     async register(data: CreateGameDTO) {
         const { gameName } = data;
-        let user = await this.userRepository.findOne({where: {name}});
-        if (user) {
-            throw new HttpException('User already exists', HttpStatus.BAD_REQUEST);
+        let game = await this.userRepository.findOne({where: {gameName}});
+        if (game) {
+            throw new HttpException('Game with this name already exists', HttpStatus.BAD_REQUEST);
         }
-        user = await this.userRepository.create(data);
-        await this.userRepository.save(user);
-        return user.gameObject();
+        game = await this.userRepository.create(data);
+        await this.userRepository.save(game);
+        return game.gameObject();
     }
 
     /*async login(data: UserDTO) {

src/user/user.module.ts

@@ -3,7 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { UserController } from './user.controller';
 import { UserService } from './user.service';
-import { PersonEntity} from './user.entity';
+import { PersonEntity } from './user.entity';
 
 @Module({
   imports: [TypeOrmModule.forFeature([PersonEntity])],