Merge branch 'release/3.2.0'

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.2.0](https://github.com/allohamora/chepi-back/compare/v3.1.1...v3.2.0) (2022-03-16)
+
+### Features
+
+- add get pizza by id route ([2da9a95](https://github.com/allohamora/chepi-back/commits/2da9a95188710cf35d4c8ff570168e6c3fcc550b))
+
 ### [3.1.1](https://github.com/allohamora/chepi-back/compare/v3.1.0...v3.1.1) (2022-03-16)
 
 ### Features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chepi-back",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "back-end for chepi",
   "author": "https://github.com/allohamora",
   "license": "MIT",

src/exceptions/entity-not-found.exception.ts

@@ -0,0 +1,3 @@
+import { NotFoundException } from '@nestjs/common';
+
+export class EntityNotFoundException extends NotFoundException {}

src/pizza/pizza.controller.ts

@@ -1,5 +1,5 @@
-import { Body, Controller, Get, HttpCode, Param, Post } from '@nestjs/common';
-import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { Body, Controller, Get, HttpCode, Post, Query } from '@nestjs/common';
+import { ApiNotFoundResponse, ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { GetPizzaByIdDto, GetPizzaByIdResultDto } from './dto/getPizzaById.dto';
 import { GetPizzaResultDto, GetPizzasDto } from './dto/getPizzas.dto';
 import { GetPizzasByIdsDto, GetPizzasByIdsResultDto } from './dto/getPizzasByIds.dto';
@@ -19,6 +19,14 @@ export class PizzaController {
     return await this.pizzaService.getPizzas(getPizzasDto);
   }
 
+  @ApiOperation({ summary: 'Get pizza by id' })
+  @ApiOkResponse({ description: 'Return pizza by id or null', type: GetPizzaByIdResultDto })
+  @ApiNotFoundResponse({ description: 'Pizza not found' })
+  @Get('/')
+  public async getPizzaById(@Query() { id }: GetPizzaByIdDto): Promise<GetPizzaByIdResultDto> {
+    return await this.pizzaService.getPizzaById(id);
+  }
+
   @ApiOperation({ summary: 'Get pizzas by ids' })
   @ApiOkResponse({
     description: 'Return found pizzas by ids. For not found id return nothing',
@@ -30,13 +38,6 @@ export class PizzaController {
     return await this.pizzaService.getPizzasByIds(ids);
   }
 
-  @ApiOperation({ summary: 'Get pizza by id' })
-  @ApiOkResponse({ description: 'Return pizza by id or null', type: GetPizzaByIdResultDto })
-  @Get('/id/:id')
-  public async getPizzaById(@Param() { id }: GetPizzaByIdDto): Promise<GetPizzaByIdResultDto> {
-    return await this.pizzaService.getPizzaById(id);
-  }
-
   @ApiOperation({ summary: 'Get pizzas stats' })
   @ApiOkResponse({ description: 'Return pizzas.json stats', type: PizzasStatsResultDto })
   @Get('/stats')

src/pizza/pizza.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, OnModuleInit } from '@nestjs/common';
+import { Injectable, NotFoundException, OnModuleInit } from '@nestjs/common';
 import { GetPizzasDto } from './dto/getPizzas.dto';
 import { Pizza } from './entities/pizza.entity';
 import { ElasticsearchService } from '@nestjs/elasticsearch';
@@ -158,6 +158,10 @@ export class PizzaService implements OnModuleInit {
 
     const value = hits.map(({ _source }) => _source)[0];
 
+    if (value === undefined) {
+      throw new NotFoundException();
+    }
+
     return { value };
   }