Commit 58e31751 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

Corrigiendo el parametro de lang

See merge request ltrpro/pueblosmagicosconia!47
parents b6f9ed29 c0de5960

backend/src/category/category.controller.ts

+2 −7
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';
@@ -23,15 +23,10 @@ export class CategoryController { 
  }



  @Get(':lang')

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

  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/user/user.controller.ts

+4 −4
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';
@@ -30,9 +30,9 @@ export class UserController { 


  @Get('prefered-categories:lang')

  @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);