steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made a few tests for ingredients also did a TODO, made the code for RecipeControllerTest a little bit more readable too

Browse source
This commit is contained in:
Aysegul Aydinlik 2026-01-15 23:00:47 +01:00
commit e2ccad1116
3 changed files with 136 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

36
server/src/main/java/server/api/RecipeController.java
View file

@ -31,12 +31,14 @@ import java.util.logging.Logger;
@RequestMapping("/api")
public class RecipeController {
private static final Logger logger = Logger.getLogger(RecipeController.class.getName());
private static final Logger logger = Logger.getLogger(
RecipeController.class.getName());
private SimpMessagingTemplate messagingTemplate;
private RecipeService recipeService;
private RecipeRepository recipeRepository;
public RecipeController(RecipeService recipeService, SimpMessagingTemplate messagingTemplate) {
public RecipeController(RecipeService recipeService,
SimpMessagingTemplate messagingTemplate) {
this.recipeService = recipeService;
this.messagingTemplate = messagingTemplate;
logger.info("Initialized controller.");
@ -72,24 +74,26 @@ public class RecipeController {
) {
logger.info("GET /recipes called.");
// TODO: maybe refactor this. this is horrid and evil and nightmare
var recipes = locales
.map(loc -> {
return limit.map(lim -> {
return recipeService.findAllWithLocales(loc, lim);
})
.orElseGet(() -> {
return recipeService.findAllWithLocales(loc);
});
})
.orElseGet(
// Choose the right overload. One has a limit, other doesn't.
() -> limit.map(recipeService::findAll).orElseGet(recipeService::findAll));
List<Recipe> recipes = locales
.map(loc -> findWithLocales(loc, limit))
.orElseGet(() -> findAll(limit));
return ResponseEntity.ok(recipes);
}
private List<Recipe> findWithLocales(List<String> locales, Optional<Integer> limit) {
return limit
.map(lim -> recipeService.findAllWithLocales(locales, lim))
.orElseGet(() -> recipeService.findAllWithLocales(locales));
}
private List<Recipe> findAll(Optional<Integer> limit) {
return limit
.map(recipeService::findAll)
.orElseGet(recipeService::findAll);
}
/**
* Mapping for <code>POST /recipe/{id}</code>.
* Also creates the ingredient elements if they do not exist.