diff --git a/server/src/controllers/reservation.controller.ts b/server/src/controllers/reservation.controller.ts index 3d728c22002ea1fbc6fbe5518713ff8eebb06332..c3033dfcefd8c1de3ff5404e095918060e33015c 100644 --- a/server/src/controllers/reservation.controller.ts +++ b/server/src/controllers/reservation.controller.ts @@ -6,7 +6,6 @@ import { HttpStatus, Post, } from '@nestjs/common'; -import { HttpAdapterHost } from '@nestjs/core'; import { ApiTags } from '@nestjs/swagger'; import { DriverService } from '@src/services/driver.service'; import { EmplacementService } from '@src/services/emplacement.service'; diff --git a/server/src/services/vehicle.service.ts b/server/src/services/vehicle.service.ts index cb5c66a2ff09195334de4ca733e3fafbee7f93ab..2ecb15676febe37d34d1f23567113f943233cb7b 100644 --- a/server/src/services/vehicle.service.ts +++ b/server/src/services/vehicle.service.ts @@ -36,7 +36,7 @@ export class VehicleService { tempsFin: Date, ): Promise<(Vehicule | VehiculeHybride)[]> { const query = - 'SELECT * from vehicule ' + + 'SELECT *, vehicule.immatriculation from vehicule ' + 'LEFT OUTER JOIN reservation ON vehicule.immatriculation = reservation.immatriculation ' + 'AND (' + '(reservation.temps_debut > $3 AND reservation.temps_debut < $4) OR ' + @@ -53,7 +53,7 @@ export class VehicleService { tempsDebut, tempsFin, ]); - // console.log(result); + console.log(result); return await Promise.all( result.rows.map(async (row) => { return this.createVehicleFromRow(row, emplacement);