add createOrUpdate for recipes
This commit is contained in:
parent
7252b072bd
commit
58ef7fbc00
4 changed files with 54 additions and 0 deletions
|
|
@ -16,6 +16,8 @@ const compactRecipeHandler = new CompactRecipeHandler(recipeRepository, compactR
|
||||||
/**
|
/**
|
||||||
* Load header data of all recipes
|
* Load header data of all recipes
|
||||||
* Responds with a list of CompactRecipeDtos
|
* Responds with a list of CompactRecipeDtos
|
||||||
|
* @todo request wrapper DTO
|
||||||
|
* @todo response wrapper DTO
|
||||||
*/
|
*/
|
||||||
router.get(
|
router.get(
|
||||||
"/",
|
"/",
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ const recipeController = new RecipeHandler(recipeRepository, recipeMapper);
|
||||||
* Create new recipe
|
* Create new recipe
|
||||||
* Consumes: RecipeDto
|
* Consumes: RecipeDto
|
||||||
* Responds with RecipeDto
|
* Responds with RecipeDto
|
||||||
|
* DEPRECATED!
|
||||||
*/
|
*/
|
||||||
router.post(
|
router.post(
|
||||||
"/",
|
"/",
|
||||||
|
|
@ -36,6 +37,23 @@ router.post(
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save or update recipe.
|
||||||
|
* Consumes: RecipeDto
|
||||||
|
* Responds with RecipeDto as saved in database
|
||||||
|
* A new recipe is created if the dto doesn't contain an ID. Otherwise, the
|
||||||
|
* existing recipe is updated. Throws an exception if the dto does contain an
|
||||||
|
* ID that's not present in the database
|
||||||
|
*/
|
||||||
|
router.post(
|
||||||
|
"/create-or-update",
|
||||||
|
asyncHandler(async(req, res) => {
|
||||||
|
const requestDto: RecipeDto = req.body;
|
||||||
|
const responseDto = await recipeController.createOrUpdateRecipe(requestDto);
|
||||||
|
res.status(201).json(responseDto);
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load recipe by id
|
* Load recipe by id
|
||||||
* Responds with RecipeDto
|
* Responds with RecipeDto
|
||||||
|
|
@ -54,6 +72,7 @@ router.get(
|
||||||
* Also handles changes to instructions steps and ingredient (groups)
|
* Also handles changes to instructions steps and ingredient (groups)
|
||||||
* Consumes: RecipeDto
|
* Consumes: RecipeDto
|
||||||
* Responds with RecipeDto
|
* Responds with RecipeDto
|
||||||
|
* DEPRECATED
|
||||||
*/
|
*/
|
||||||
router.put(
|
router.put(
|
||||||
"/:id",
|
"/:id",
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ export class CompactRecipeHandler {
|
||||||
*
|
*
|
||||||
* Recipe title must contain type string
|
* Recipe title must contain type string
|
||||||
* @todo Full text search??
|
* @todo Full text search??
|
||||||
|
|
||||||
*/
|
*/
|
||||||
async getMatchingRecipes(searchString : string){
|
async getMatchingRecipes(searchString : string){
|
||||||
if(!searchString || searchString.length===0){
|
if(!searchString || searchString.length===0){
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import { NotFoundError, ValidationError } from "../errors/httpErrors.js";
|
||||||
import { RecipeInstructionStepDto } from "../dtos/RecipeInstructionStepDto.js";
|
import { RecipeInstructionStepDto } from "../dtos/RecipeInstructionStepDto.js";
|
||||||
import { RecipeIngredientGroupDto } from "../dtos/RecipeIngredientGroupDto.js";
|
import { RecipeIngredientGroupDto } from "../dtos/RecipeIngredientGroupDto.js";
|
||||||
import { RecipeIngredientDto } from "../dtos/RecipeIngredientDto.js";
|
import { RecipeIngredientDto } from "../dtos/RecipeIngredientDto.js";
|
||||||
|
import { RecipeEntity } from "../entities/RecipeEntity.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Controls all recipe specific actions
|
* Controls all recipe specific actions
|
||||||
|
|
@ -28,6 +29,37 @@ export class RecipeHandler {
|
||||||
const recipeDto = this.mapper.toDto(recipeEntity);
|
const recipeDto = this.mapper.toDto(recipeEntity);
|
||||||
return recipeDto;
|
return recipeDto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save or update recipe depending on whether the DTO contains an ID
|
||||||
|
* @param dto recipe data
|
||||||
|
* @returns Recipe as saved in the database
|
||||||
|
*/
|
||||||
|
async createOrUpdateRecipe(dto: RecipeDto){
|
||||||
|
if (!this.isRecipeDtoValid(dto)) {
|
||||||
|
throw new ValidationError("recipe data is not valid!")
|
||||||
|
}
|
||||||
|
var savedEntity: RecipeEntity;
|
||||||
|
const recipeId = dto.id
|
||||||
|
if(recipeId === undefined){
|
||||||
|
// create new recipe
|
||||||
|
const recipeEntity = this.mapper.toEntity(dto)
|
||||||
|
savedEntity = await this.recipeRepository.create(recipeEntity);
|
||||||
|
throw new ValidationError("Trying to update recipe without ID!")
|
||||||
|
} else {
|
||||||
|
// save existing Recipe
|
||||||
|
// First: Load current version of recipe from database
|
||||||
|
const recipeEntity = await this.recipeRepository.findById(recipeId);
|
||||||
|
if(!recipeEntity){
|
||||||
|
throw new ValidationError("No recipe with ID " + recipeId + " found in database!")
|
||||||
|
}
|
||||||
|
// merge changes into entity
|
||||||
|
this.mapper.mergeDtoIntoEntity(dto, recipeEntity);
|
||||||
|
// persist changes
|
||||||
|
savedEntity = await this.recipeRepository.update(recipeEntity);
|
||||||
|
}
|
||||||
|
return this.mapper.toDto(savedEntity);
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Update recipe data
|
* Update recipe data
|
||||||
* @param RecipeDto containing the entire updated recipe
|
* @param RecipeDto containing the entire updated recipe
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue