From 3a7e5f4b2b2d9a3601b91fb5f6d0feaeb4ef2340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Iv=C3=A1n?=
 <80365304+Diego-lvan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:50:35 -0600
Subject: [PATCH 1/4] agregando idTown y idPlace a dto

---
 backend/src/place/dto/get-place.dto.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/place/dto/get-place.dto.ts b/backend/src/place/dto/get-place.dto.ts
index ceca88a6..ece429a3 100644
--- a/backend/src/place/dto/get-place.dto.ts
+++ b/backend/src/place/dto/get-place.dto.ts
@@ -1,12 +1,13 @@
 import { Available } from 'src/pointOfInterest/enum/available.enum';
-import { Town } from 'src/town/entities/town.entity';
+import { Place } from '../entities/place.entity';
 
 export class GetPlaceDto {
+  idTown: number;
+  idPlace: Place;
   available: Available;
   name: string;
   description: string;
   imageName: string;
-  idTown: Town;
   coords: string;
   openAt: number;
   closeAt: number;
-- 
GitLab


From 64c4783d251aa4682511d7874f419f710f4174cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Iv=C3=A1n?=
 <80365304+Diego-lvan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:51:00 -0600
Subject: [PATCH 2/4] renombrando metodo para obtener un place

---
 backend/src/place/place.controller.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/place/place.controller.ts b/backend/src/place/place.controller.ts
index f8d9c2e2..c221715c 100644
--- a/backend/src/place/place.controller.ts
+++ b/backend/src/place/place.controller.ts
@@ -35,8 +35,8 @@ export class PlaceController {
     }
   }
 
-  @Get(':id')
-  findOne(@Param('id') id: string) {
-    return this.placeService.findOne(+id);
+  @Get(':idPlace')
+  findOne(@Param('idPlace') idPlace: number) {
+    return this.placeService.findOneAndTradAndAvailable(idPlace);
   }
 }
-- 
GitLab


From 9a208c50d20a8d486e1abfa35465bd201c256604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Iv=C3=A1n?=
 <80365304+Diego-lvan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:51:15 -0600
Subject: [PATCH 3/4] agregando campos faltantes en las queries

---
 backend/src/place/place.service.ts | 46 ++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/backend/src/place/place.service.ts b/backend/src/place/place.service.ts
index 69326996..443bfbc3 100644
--- a/backend/src/place/place.service.ts
+++ b/backend/src/place/place.service.ts
@@ -81,16 +81,19 @@ export class PlaceService {
         'place.closeAt AS closeAt',
         'availableDate.startDate AS startDate',
         'availableDate.endDate AS endDate',
+        'place.available AS available',
+        'place.idTown AS idTown',
       ])
       .where('place.idTown = :idTown', { idTown: idTown })
       .andWhere('placeTrad.language = :language', { language: lang })
       .getRawMany();
     const places: GetPlaceDto[] = res.map((place) => {
       return {
+        idTown: place.idTown,
+        idPlace: place.idPlace,
         available: place.available,
         description: place.description,
         coords: place.coords,
-        idTown: place.idTown,
         imageName: `${ServerConstants.HOST}/places/${place.imageName}`,
         name: place.name,
         openAt: place.openAt,
@@ -103,7 +106,44 @@ export class PlaceService {
   }
 
   async findOne(id: number) {
-    const place = await this.placeRepository.findOneBy({ idPlace: id });
-    return place;
+    return await this.placeRepository.findOneBy({ idPlace: id });
+  }
+
+  async findOneAndTradAndAvailable(idPlace: number) {
+    const place: GetPlaceDto = await this.dataSource
+      .getRepository(PlaceTraduction)
+      .createQueryBuilder('placeTrad')
+      .leftJoin('placeTrad.idPlace', 'place')
+      .leftJoin('place.availableDates', 'availableDate')
+      .select([
+        'place.idPlace AS idPlace',
+        'place.name AS name',
+        'place.imageName AS imageName',
+        'placeTrad.language AS language',
+        'placeTrad.description AS description',
+        'place.coords AS coords',
+        'place.openAt AS openAt',
+        'place.closeAt AS closeAt',
+        'availableDate.startDate AS startDate',
+        'availableDate.endDate AS endDate',
+        'place.idTown AS idTown',
+        'place.available AS available',
+      ])
+      .where('place.idPlace = :idPlace', { idPlace: idPlace })
+      .getRawOne();
+
+    return {
+      idTown: place.idTown,
+      idPlace: place.idPlace,
+      available: place.available,
+      description: place.description,
+      coords: place.coords,
+      imageName: `${ServerConstants.HOST}/places/${place.imageName}`,
+      name: place.name,
+      openAt: place.openAt,
+      closeAt: place.closeAt,
+      startDate: place.startDate,
+      endDate: place.endDate,
+    };
   }
 }
-- 
GitLab


From bf19a7867c0eb9c701fc922a70007ebe56e7931f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Iv=C3=A1n?=
 <80365304+Diego-lvan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:20:22 -0600
Subject: [PATCH 4/4] cambiando extension de la imagen por defecto

---
 backend/static/towns/{default.jpeg => default.jpg} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/static/towns/{default.jpeg => default.jpg} (100%)

diff --git a/backend/static/towns/default.jpeg b/backend/static/towns/default.jpg
similarity index 100%
rename from backend/static/towns/default.jpeg
rename to backend/static/towns/default.jpg
-- 
GitLab