Loading backend/src/route/route.service.ts +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'; Loading @@ -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, Loading Loading @@ -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; Loading Loading
backend/src/route/route.service.ts +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'; Loading @@ -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, Loading Loading @@ -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; Loading