From 5b167058e879c41d3f2c9278445ec05bb9c8c548 Mon Sep 17 00:00:00 2001
From: Romain Lebbadi-Breteau <romain@lebbadi.fr>
Date: Wed, 19 Apr 2023 14:02:35 -0400
Subject: [PATCH] server fixes
---
server/src/controllers/reservation.controller.ts | 1 -
server/src/services/vehicle.service.ts | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/src/controllers/reservation.controller.ts b/server/src/controllers/reservation.controller.ts
index 3d728c2..c3033df 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 cb5c66a..2ecb156 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);
--
GitLab