From 67f7d0e8ec3cba8d7c5effa8cb01c57eec6debe0 Mon Sep 17 00:00:00 2001 From: batche Date: Fri, 16 Dec 2022 10:51:40 +0100 Subject: [PATCH] =?UTF-8?q?Suite=20de=20l'int=C3=A9gratyion=20du=20jeu.=20?= =?UTF-8?q?De=20nombreux=20paquets=20sont=20indisponibles.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api_back/src/game/dto/create-party.dto.ts | 16 ----------- .../api_back/src/game/entity/game.entity.ts | 26 +++++++++++++++++ .../api_back/src/game/entity/user.entity.ts | 22 --------------- .../nestjs/api_back/src/game/game.module.ts | 16 +++++------ .../api_back/src/game/game.service.spec.ts | 28 +++++++++---------- .../nestjs/api_back/src/game/game.service.ts | 7 +++-- .../api_back/src/redis/redis.service.ts | 1 + 7 files changed, 53 insertions(+), 63 deletions(-) delete mode 100644 srcs/requirements/nestjs/api_back/src/game/dto/create-party.dto.ts create mode 100644 srcs/requirements/nestjs/api_back/src/game/entity/game.entity.ts delete mode 100644 srcs/requirements/nestjs/api_back/src/game/entity/user.entity.ts create mode 100644 srcs/requirements/nestjs/api_back/src/redis/redis.service.ts diff --git a/srcs/requirements/nestjs/api_back/src/game/dto/create-party.dto.ts b/srcs/requirements/nestjs/api_back/src/game/dto/create-party.dto.ts deleted file mode 100644 index 14d2e14c..00000000 --- a/srcs/requirements/nestjs/api_back/src/game/dto/create-party.dto.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IsBoolean, IsEmail, IsNotEmpty, IsString } from 'class-validator'; - -export class CreateUsersDto { - @IsString() - @IsNotEmpty() - readonly username: string; - readonly fortyTwoId: string; - @IsEmail() - readonly email: string; - @IsString() - readonly image_url: string; - @IsString() - readonly status: string; - @IsBoolean() - readonly isEnabledTwoFactorAuth: boolean; -} diff --git a/srcs/requirements/nestjs/api_back/src/game/entity/game.entity.ts b/srcs/requirements/nestjs/api_back/src/game/entity/game.entity.ts new file mode 100644 index 00000000..b93d2088 --- /dev/null +++ b/srcs/requirements/nestjs/api_back/src/game/entity/game.entity.ts @@ -0,0 +1,26 @@ +import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; + +@Entity('game') +export class game { + + @PrimaryGeneratedColumn() + id: number; + + @Column() + playerOneUsername: string + + @Column() + playerTwoUsername: string + + @Column() + playerOneUsernameResult : number + + @Column() + playerTwoUsernameResult : number + + @Column() + gameServerIdOfTheMatch: string + + @Column({default: false}) //éric pourra trouver un meilleur mot : ongoing ? + isMatchIsFinished: boolean +} diff --git a/srcs/requirements/nestjs/api_back/src/game/entity/user.entity.ts b/srcs/requirements/nestjs/api_back/src/game/entity/user.entity.ts deleted file mode 100644 index 6c45d3a5..00000000 --- a/srcs/requirements/nestjs/api_back/src/game/entity/user.entity.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; - - - -@Entity('gameParty') -export class gameParty { - - @PrimaryGeneratedColumn() - id: number; - - @Column() - playerOne: string - - @Column() - playerTwo: string - - @Column() - resultOfTheMatch: string - - @Column() - gameServerIdOfTheMatch: string -} diff --git a/srcs/requirements/nestjs/api_back/src/game/game.module.ts b/srcs/requirements/nestjs/api_back/src/game/game.module.ts index 17a50c06..b9909dd5 100644 --- a/srcs/requirements/nestjs/api_back/src/game/game.module.ts +++ b/srcs/requirements/nestjs/api_back/src/game/game.module.ts @@ -1,9 +1,9 @@ -import { Module } from '@nestjs/common'; -import { GameController } from './game.controller'; -import { GameService } from './game.service'; +// import { Module } from '@nestjs/common'; +// import { GameController } from './game.controller'; +// import { GameService } from './game.service'; -@Module({ - controllers: [GameController], - providers: [GameService] -}) -export class GameModule {} +// @Module({ +// controllers: [GameController], +// providers: [GameService] +// }) +// export class GameModule {} diff --git a/srcs/requirements/nestjs/api_back/src/game/game.service.spec.ts b/srcs/requirements/nestjs/api_back/src/game/game.service.spec.ts index f4a1db7e..d91fa17d 100644 --- a/srcs/requirements/nestjs/api_back/src/game/game.service.spec.ts +++ b/srcs/requirements/nestjs/api_back/src/game/game.service.spec.ts @@ -1,18 +1,18 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { GameService } from './game.service'; +// import { Test, TestingModule } from '@nestjs/testing'; +// // import { GameService } from './game.service'; -describe('GameService', () => { - let service: GameService; +// describe('GameService', () => { +// let service: GameService; - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [GameService], - }).compile(); +// beforeEach(async () => { +// const module: TestingModule = await Test.createTestingModule({ +// providers: [GameService], +// }).compile(); - service = module.get(GameService); - }); +// service = module.get(GameService); +// }); - it('should be defined', () => { - expect(service).toBeDefined(); - }); -}); +// it('should be defined', () => { +// expect(service).toBeDefined(); +// }); +// }); diff --git a/srcs/requirements/nestjs/api_back/src/game/game.service.ts b/srcs/requirements/nestjs/api_back/src/game/game.service.ts index 18ca270d..554d73dd 100644 --- a/srcs/requirements/nestjs/api_back/src/game/game.service.ts +++ b/srcs/requirements/nestjs/api_back/src/game/game.service.ts @@ -1,4 +1,5 @@ -import { Injectable } from '@nestjs/common'; +// import { Injectable } from '@nestjs/common'; + +// @Injectable('game') +// export class GameService {} -@Injectable() -export class GameService {} diff --git a/srcs/requirements/nestjs/api_back/src/redis/redis.service.ts b/srcs/requirements/nestjs/api_back/src/redis/redis.service.ts new file mode 100644 index 00000000..1bf70bcf --- /dev/null +++ b/srcs/requirements/nestjs/api_back/src/redis/redis.service.ts @@ -0,0 +1 @@ +import {RedisService} from "@nestjs/redis"