Commit d055c292 authored by Omar Luna Hernández's avatar Omar Luna Hernández
Browse files

Merge branch 'main' of https://labsol.cozcyt.gob.mx/git/Xarom/pueblosmagicosconia

parents 0b4f1b1e 19b630e8

backend/src/category/category.controller.ts

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

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

import { CategoryService } from './category.service';

import { AuthAdminGuard } from 'src/auth/admin/authAdmin.guard';

import { Roles } from 'src/auth/role.decorator';
@@ -22,16 +22,11 @@ export class CategoryController { 
    return { message: 'Category created successfully' };

  }



  @Get(':lang')

  findAll(@Param('lang') lang: LANGUAGES) {

  @Get('')

  findAll(@Query('lang') lang: LANGUAGES) {

    return this.categoryService.findAll(lang);

  }



  // @Patch(':id')

  // update(@Param('id') id: string, @Body() updateCategoryDto: UpdateCategoryDto) {

  //   return this.categoryService.update(+id, updateCategoryDto);

  // }



  @UseGuards(AuthAdminGuard)

  @Roles(SUPERADMIN_ROLES)

  @ApiBearerAuth('jwt')

backend/src/pointOfInterest/PointOfInterest.controller.ts

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ export class PointOfInterestController { 
    return file;

  }



  @Get('point/:idPoint?lang')

  @Get('point/:idPoint')

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

  async findOne(@Param('idPoint') idPoint: number, @Query('lang') lang: string) {

    return await this.pointService.findOne(idPoint, lang as LANGUAGES);

  }

backend/src/user/user.controller.ts

+5 −5
Original line number Diff line number Diff line 
import { Body, Controller, Get, Param, Patch, Req, UseGuards } from '@nestjs/common';

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

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

import { UpdatePreferedCategoriesDto } from './dto/update-preferedCategories.dto';

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

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

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

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

import { LANGUAGES } from 'src/shared/enum/languages.enum';
@@ -28,11 +28,11 @@ export class UserController { 
    }

  }



  @Get('prefered-categories:lang')

  @Get('prefered-categories')

  @ApiBearerAuth('jwt')

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

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

  @UseGuards(AuthUserGuard)

  async getPreferedCategories(@Req() req: CustomUserRequest, @Param('lang') lang: string) {

  async getPreferedCategories(@Req() req: CustomUserRequest, @Query('lang') lang: string) {

    try {

      const { email } = req.user;

      return await this.userService.getPreferedCategories(email, lang as LANGUAGES);