Commit d606e5a1 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch pueblosmagicosconia:main into main

parents 7b886e85 3f17a69f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ export class RouteController {
  @ApiQuery({ name: 'routeStatus', type: String, schema: { enum: Object.values(RouteStatus) } })
  @ApiBearerAuth('jwt')
  @UseGuards(AuthUserGuard)
  async recommendRouteGet(@Req() req: CustomUserRequest, @Query('routeStatus') routeStatus: RouteStatus) {
  async getRecommendRoute(@Req() req: CustomUserRequest, @Query('routeStatus') routeStatus: RouteStatus) {
    const { email } = req.user;
    return await this.routeService.getRouteAndPlacesByUser(email, routeStatus);
  }
@@ -54,7 +54,7 @@ export class RouteController {

  @Patch('/:idRoute')
  @ApiParam({ name: 'idRoute', type: Number })
  @ApiBody({ type: UpdateRouteStatusDto, description: 'accepted, rejected, pending' })
  @ApiBody({ type: UpdateRouteStatusDto, description: 'accepted, pending' })
  @ApiBearerAuth('jwt')
  @UseGuards(AuthUserGuard)
  async updateRoute(@Body() updateRouteStatusDto: UpdateRouteStatusDto, @Param('idRoute') idRoute: number) {
+5 −4
Original line number Diff line number Diff line
import { Injectable } from '@nestjs/common';
import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
import { InjectRepository } from '@nestjs/typeorm';
import { Route, RouteStatus } from './entities/route.entity';
import { DataSource, Repository } from 'typeorm';
import { MoreThan, Repository } from 'typeorm';
import { User } from 'src/user/entities/user.entity';
import { Town } from 'src/town/entities/town.entity';
import { TravelPlaceService } from 'src/travel-place/travel-place.service';
@@ -23,7 +23,6 @@ export class RouteService {
    @InjectRepository(User) private userRepository: Repository<User>,
    @InjectRepository(Town) private townRepository: Repository<Town>,
    private readonly travelPlaceService: TravelPlaceService,
    @InjectDataSource() private dataSource: DataSource,
    private readonly placeService: PlaceService,
    private readonly visitedService: VisitedService,
    private readonly userService: UserService,
@@ -87,12 +86,14 @@ export class RouteService {

      await this.travelPlaceService.create(createTravelPlace);
    }

    return await this.getRouteById(idRoute, email);
  }

  async getRouteAndPlacesByUser(email: string, routeStatus: RouteStatus) {
    const res = await this.routeRepository.find({
      relations: ['travelPlace'],
      where: { user: { email }, status: routeStatus },
      where: { user: { email }, status: routeStatus, endDate: MoreThan(new Date()) },
    });

    return res;