42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix draw game

Browse Source 
+ status update in generateToken()
This commit is contained in:
LuckyLaszlo
2023-01-09 11:01:57 +01:00
parent 0f30a3d8d4
commit d55f3eedf5
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srcs/requirements/game_server/game_back/src/server/class/GameSession.ts
View File

@@ -274,7 +274,7 @@ export class GameSession {
gc.scoreRight = 3; gc.scoreRight = 3;
} }
else else
{ // TODO: match draw, verifier la getion coté Nest {
gc.scoreLeft = 0; gc.scoreLeft = 0;
gc.scoreRight = 0; gc.scoreRight = 0;
} }

9
srcs/requirements/nestjs/api_back/src/game/game.service.ts
View File

@@ -87,10 +87,12 @@ export class GameService {
if (user.status === STATUS.IN_POOL || user.status === STATUS.IN_GAME) if (user.status === STATUS.IN_POOL || user.status === STATUS.IN_GAME)
{ {
await this.deleteToken(user); await this.deleteToken(user);
user.status = STATUS.CONNECTED; if (user.status === STATUS.IN_POOL) {
user.status = STATUS.CONNECTED;
}
this.userRepository.save(user); this.userRepository.save(user);
} }
if (grantTicketDto.isGameIsWithInvitation === true) if (grantTicketDto.isGameIsWithInvitation === true && user.status !== STATUS.IN_GAME)
{ {
const secondUser : Partial<User> = await this.userService.findOne(grantTicketDto.playerTwoUsername) const secondUser : Partial<User> = await this.userService.findOne(grantTicketDto.playerTwoUsername)
if (!secondUser || secondUser.username === user.username) if (!secondUser || secondUser.username === user.username)
@@ -105,7 +107,7 @@ export class GameService {
this.userService.updateStatus(user.id, "In Pool") this.userService.updateStatus(user.id, "In Pool")
return res.status(HttpStatus.OK).json({ token : encryptedTextToReturn }); return res.status(HttpStatus.OK).json({ token : encryptedTextToReturn });
} }
else if (grantTicketDto.isGameIsWithInvitation === false) { else if (grantTicketDto.isGameIsWithInvitation === false && user.status !== STATUS.IN_GAME) {
const encryptedTextToReturn = await this.encryptToken(user.username + '_' const encryptedTextToReturn = await this.encryptToken(user.username + '_'
+ grantTicketDto.gameOptions + '_' + grantTicketDto.isGameIsWithInvitation + '_' + new Date()) + grantTicketDto.gameOptions + '_' + grantTicketDto.isGameIsWithInvitation + '_' + new Date())
const tok = this.tokenGameRepository.create(grantTicketDto); const tok = this.tokenGameRepository.create(grantTicketDto);
@@ -280,6 +282,7 @@ export class GameService {
{ {
this.userService.incrementDraws(playerOne.id) this.userService.incrementDraws(playerOne.id)
this.userService.incrementDraws(playerTwo.id) this.userService.incrementDraws(playerTwo.id)
console.log("DRAW NEST");
} }
else if (game.playerOneUsernameResult < game.playerTwoUsernameResult) else if (game.playerOneUsernameResult < game.playerTwoUsernameResult)
{ {

2
srcs/requirements/nestjs/api_back/src/users/users.service.ts
View File

@@ -193,7 +193,7 @@ export class UsersService {
.getOne(); .getOne();
if (!user.stats || !user) if (!user.stats || !user)
throw new HttpException(`The user's stats could not be found.`,HttpStatus.NOT_FOUND); throw new HttpException(`The user's stats could not be found.`,HttpStatus.NOT_FOUND);
user.stats.winGame++; user.stats.drawGame++;
user.stats.totalGame++; user.stats.totalGame++;
this.userRepository.save(user); this.userRepository.save(user);
} }