Commit 83fa3638 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

Agregando  endpoints para obtener todas las rutas, actualizar status de rutas y obtener por id

See merge request !74
parents 0dc6a243 45836c8a

backend/src/route/dto/updateRouteStatus.dto.ts

0 → 100644
+7 −0
Original line number Diff line number Diff line 
import { ApiProperty } from '@nestjs/swagger';

import { RouteStatus } from '../entities/route.entity';



export class UpdateRouteStatusDto {

  @ApiProperty({ enum: RouteStatus, enumName: 'RouteStatus', description: 'accepted, pending, rejected' })

  status: RouteStatus;

}

backend/src/route/entities/route.entity.ts

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import { Town } from 'src/town/entities/town.entity'; 
import { TravelPlace } from 'src/travel-place/entities/travel-place.entity';

import { User } from 'src/user/entities/user.entity';

import { PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, Entity, OneToMany } from 'typeorm';

enum RouteStatus {

export enum RouteStatus {

  PENDING = 'pending',

  ACCEPTED = 'accepted',

  REJECTED = 'rejected',

backend/src/route/route.controller.ts

+26 −8
Original line number Diff line number Diff line 
import { Controller, Param, UseGuards, Req, Query, Body, Post, Get } from '@nestjs/common';

import { Controller, Param, UseGuards, Req, Query, Body, Post, Get, Patch } from '@nestjs/common';

import { RouteService } from './route.service';

import { ApiBearerAuth, ApiBody, ApiParam, ApiQuery, ApiTags } from '@nestjs/swagger';

import { LANGUAGES } from 'src/shared/enum/languages.enum';

import { AuthUserGuard } from 'src/auth/user/authUser.guard';

import { CustomUserRequest } from 'src/auth/user/interface/customUserReq';

import { CreateRouteReq } from './dto/create-route-req';

import { RouteStatus } from './entities/route.entity';

import { UpdateRouteStatusDto } from './dto/updateRouteStatus.dto';



@Controller('route')

@ApiTags('route')

export class RouteController {

  constructor(private readonly routeService: RouteService) {}



  @Post('recommend/:idTown')

  @ApiQuery({ name: 'lang', type: String })

  @Post('/:idTown')

  @ApiParam({ name: 'idTown', type: Number })

  @ApiBody({ type: CreateRouteReq })

  @ApiBearerAuth('jwt')
@@ -33,13 +34,30 @@ export class RouteController { 
    );

  }



  @Get('recommend/:idTown')

  @ApiQuery({ name: 'lang', type: String })

  @ApiParam({ name: 'idTown', type: Number })

  @Get('')

  @ApiQuery({ name: 'routeStatus', type: String, schema: { enum: Object.values(RouteStatus) } })

  @ApiBearerAuth('jwt')

  @UseGuards(AuthUserGuard)

  async recommendRouteGet(@Req() req: CustomUserRequest, @Query('routeStatus') routeStatus: RouteStatus) {

    const { email } = req.user;

    return await this.routeService.getRouteAndPlacesByUser(email, routeStatus);

  }



  @Get('/:idRoute')

  @ApiParam({ name: 'idRoute', type: Number })

  @ApiBearerAuth('jwt')

  @UseGuards(AuthUserGuard)

  async recommendRouteGet(@Req() req: CustomUserRequest, @Query('lang') lang: string, @Param('idTown') idTown: number) {

  async getRoute(@Param('idRoute') idRoute: number, @Req() req: CustomUserRequest) {

    const { email } = req.user;

    return await this.routeService.getRouteAndPlacesByUser(email, lang as LANGUAGES, idTown);

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

  }



  @Patch('/:idRoute')

  @ApiParam({ name: 'idRoute', type: Number })

  @ApiBody({ type: UpdateRouteStatusDto, description: 'accepted, rejected, pending' })

  @ApiBearerAuth('jwt')

  @UseGuards(AuthUserGuard)

  async updateRoute(@Body() updateRouteStatusDto: UpdateRouteStatusDto, @Param('idRoute') idRoute: number) {

    return await this.routeService.updateRoute(idRoute, updateRouteStatusDto.status);

  }

}

backend/src/route/route.service.ts

+15 −4
Original line number Diff line number Diff line 
import { Injectable } from '@nestjs/common';

import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';

import { Route } from './entities/route.entity';

import { Route, RouteStatus } from './entities/route.entity';

import { DataSource, Repository } from 'typeorm';

import { User } from 'src/user/entities/user.entity';

import { Town } from 'src/town/entities/town.entity';
@@ -14,6 +14,7 @@ import { Visited } from 'src/visited/entities/visited.entity'; 
import { RecommendPlace } from './dto/recommend-route.dto';

import { CreateRouteDto } from './dto/create-route.dto';

import { CreateTravelPlaceDto } from 'src/travel-place/dto/create-travel-place.dto';

import { UserService } from 'src/user/user.service';



@Injectable()

export class RouteService {
@@ -25,6 +26,7 @@ export class RouteService { 
    @InjectDataSource() private dataSource: DataSource,

    private readonly placeService: PlaceService,

    private readonly visitedService: VisitedService,

    private readonly userService: UserService,

  ) {}



  async recommend(idTown: number, email: string, language: LANGUAGES, start, end) {
@@ -87,12 +89,21 @@ export class RouteService { 
    }

  }



  async getRouteAndPlacesByUser(email: string, language: LANGUAGES, idTown: number) {

    const res = await this.routeRepository.findOne({

  async getRouteAndPlacesByUser(email: string, routeStatus: RouteStatus) {

    const res = await this.routeRepository.find({

      relations: ['travelPlace'],

      where: { user: { email }, town: { townId: idTown } },

      where: { user: { email }, status: routeStatus },

    });



    return res;

  }



  async updateRoute(idRoute: number, status: RouteStatus) {

    await this.routeRepository.update({ idRoute }, { status });

  }



  async getRouteById(idRoute: number, email: string) {

    const user: User = await this.userService.findOne(email);

    return await this.routeRepository.findOneBy({ idRoute, user });

  }

}