server/src/challenge-actions/challenge-actions.service.ts

@@ -1,7 +1,7 @@
-import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common'
+import { BadRequestException, Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common'
 import { CreateChallengeActionDto } from './dto/create-challenge-action.dto'
 import { UpdateChallengeActionDto } from './dto/update-challenge-action.dto'
-import { ChallengeAction, MoneyUpdateType, Player } from '@prisma/client'
+import { ChallengeAction, Player } from '@prisma/client'
 import { PrismaService } from 'src/prisma/prisma.service'
 import { QueryPaginationDto } from 'src/common/dto/pagination-query.dto'
 import { paginate } from 'src/common/utils/pagination.utils'
@@ -68,17 +68,6 @@ export class ChallengeActionsService {
         active: false,
         end: now,
       }
-
-      // Crédit du nombre de points remportés grâce au défi
-      const challenge = await this.prisma.challenge.findUnique({ where: { id: challengeAction.challengeId } })
-      await this.prisma.moneyUpdate.create({
-        data: {
-          playerId: player.id,
-          amount: challenge.reward,
-          reason: MoneyUpdateType.WIN_CHALLENGE,
-          actionId: challengeAction.id,
-        }
-      })
     }
     else {
       data = {

server/src/game/game.service.ts

@@ -27,7 +27,7 @@ export class GameService {
         })
       }
     }
-    const runnerId = alreadyStarted ? game.currentRunnerId : players[Math.floor(players.length * Math.random())].id
+    const runnerId = alreadyStarted ? game.currentRunnerId : players[Math.trunc(players.length * Math.random())].id
     return await this.prisma.game.update({
       where: { id: 1 },
       data: {

server/src/trains/trains.controller.ts

@@ -95,7 +95,6 @@ export class TrainsController {
    * Importation d'un trajet en train à partir de Rail Planner
    * 
    * @throws {401} Non authentifié⋅e
-   * @throws {409} Le voyage Interrail est déjà importé
    * @throws {422} Le voyage Interrail à importer contient plusieurs trajets ou plusieurs trains
    */
   @Post("/import")

server/src/trains/trains.service.ts

@@ -1,8 +1,8 @@
-import { ConflictException, HttpException, Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common'
+import { Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common'
 import { CreateTrainDto } from './dto/create-train.dto'
 import { UpdateTrainDto } from './dto/update-train.dto'
 import { PrismaService } from 'src/prisma/prisma.service'
-import { MoneyUpdateType, Player, TrainTrip } from '@prisma/client'
+import { Player, TrainTrip } from '@prisma/client'
 import { QueryPaginationDto } from 'src/common/dto/pagination-query.dto'
 import { paginate } from 'src/common/utils/pagination.utils'
 import { ImportTrainDto } from './dto/import-train.dto'
@@ -54,9 +54,6 @@ export class TrainsService {
   }
 
   async import(player: Player, { id: trainId }: ImportTrainDto): Promise<TrainTrip> {
-    if (this.findOne(trainId))
-      throw new ConflictException(`Le train avec l'identifiant ${trainId} est déjà importé`)
-
     const interrailResult: InterrailJourney = await fetch(`https://3uiwjsimnh.execute-api.eu-central-1.amazonaws.com/Prod/journey-import?id=${trainId}`)
       .then(data => data.json())
     if (interrailResult.data.travels.length !== 1)
@@ -83,10 +80,12 @@ export class TrainsService {
           const oldCoordinates = legInfoJson.trainStopStations.at(index - 1).coordinates
           return distance + distanceCoordinates({ from: oldCoordinates, to: coordinates })
         }, 0)
-    const cost = 10 * 10 * Math.ceil(distance / 1000)
 
-    const train = await this.prisma.trainTrip.create({
+    return this.prisma.trainTrip.upsert({
-      data: {
+      where: {
+        id: trainId,
+      },
+      create: {
         id: trainId,
         playerId: player.id,
         distance: distance,
@@ -96,16 +95,15 @@ export class TrainsService {
         arrivalTime: arrival,
         infoJson: leg.infoJson,
       },
-    })
+      update: {
-    // Ajout du trajet en points
-    await this.prisma.moneyUpdate.create({
-      data: {
         playerId: player.id,
-        amount: -cost,
+        distance: distance,
-        reason: MoneyUpdateType.BUY_TRAIN,
+        from: travel.from,
-        tripId: train.id,
+        to: travel.to,
+        departureTime: departure,
+        arrivalTime: arrival,
+        infoJson: leg.infoJson,
       }
     })
-    return train
   }
 }