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

Made Delete msg take Recipe instead of id and made alert for recipe mourning.

Browse source
This commit is contained in:
Oskar Rasieński 2026-01-16 19:13:35 +01:00
commit caeacf86e0
2 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
View file

@ -122,7 +122,7 @@ public class FoodpalApplicationCtrl implements LocaleAware {
}; };
case DeleteRecipeMessage _ -> (m) -> { case DeleteRecipeMessage _ -> (m) -> {
DeleteRecipeMessage drm = (DeleteRecipeMessage) m; DeleteRecipeMessage drm = (DeleteRecipeMessage) m;
logger.info("Server informs us of the deletion of recipe with ID: " + drm.getRecipeId()); logger.info("Server informs us of the deletion of recipe: " + drm.getRecipe());
return handleDeleteRecipeMessage(drm); return handleDeleteRecipeMessage(drm);
}; };
case FavouriteRecipeMessage _ -> (m) -> { case FavouriteRecipeMessage _ -> (m) -> {
@ -155,12 +155,28 @@ public class FoodpalApplicationCtrl implements LocaleAware {
return new ImmutablePair<>(recipe.getId(), recipe); return new ImmutablePair<>(recipe.getId(), recipe);
} }
private Pair<Long, Recipe> handleDeleteRecipeMessage(DeleteRecipeMessage drm) { private Pair<Long, Recipe> handleDeleteRecipeMessage(DeleteRecipeMessage drm) {
this.recipeList.getItems().remove(findRecipeById(drm.getRecipeId()).orElseThrow( Recipe recipe = drm.getRecipe();
() -> new InvalidModificationException("Invalid recipe id during delete: " + drm.getRecipeId())
// If it's not pending means other client deleted.
boolean externalDelete = !dataService.isPending(recipe.getId());
this.recipeList.getItems().remove(findRecipeById(recipe.getId()).orElseThrow(
() -> new InvalidModificationException("Invalid recipe id during delete: " + recipe.getId())
)); ));
dataService.add(drm.getRecipeId());
// TODO Make it an Optional<Recipe> so that we don't need to touch Null? // Show an alert to mourn a lost comrade (recipe).
return new ImmutablePair<>(drm.getRecipeId(), null); if (externalDelete && config.isFavourite(recipe.getId())) {
Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Mourn your loss!!!");
alert.setHeaderText(null);
alert.setContentText("Your most beloved recipe by the name of \"" +
recipe.getName() + "\" has been removed.");
alert.showAndWait();
}
dataService.add(recipe.getId());
return new ImmutablePair<>(recipe.getId(), recipe);
} }
// TODO Implementation // TODO Implementation
private Pair<Long, Recipe> handleFavouriteRecipeMessage(FavouriteRecipeMessage frm) { private Pair<Long, Recipe> handleFavouriteRecipeMessage(FavouriteRecipeMessage frm) {

20
commons/src/main/java/commons/ws/messages/DeleteRecipeMessage.java
View file

@ -1,17 +1,19 @@
package commons.ws.messages; package commons.ws.messages;
import commons.Recipe;
/** /**
* Message sent when a recipe is deleted. * Message sent when a recipe is deleted.
* *
* @see commons.ws.messages.Message.Type#RECIPE_DELETE * @see commons.ws.messages.Message.Type#RECIPE_DELETE
*/ */
public class DeleteRecipeMessage implements Message { public class DeleteRecipeMessage implements Message {
private Long recipeId; private Recipe recipe;
public DeleteRecipeMessage() {} // for jackson public DeleteRecipeMessage() {} // for jackson
public DeleteRecipeMessage(Long recipeId) { public DeleteRecipeMessage(Recipe recipe) {
this.recipeId = recipeId; this.recipe = recipe;
} }
@Override @Override
@ -20,16 +22,16 @@ public class DeleteRecipeMessage implements Message {
} }
/** /**
* Get the ID of the deleted recipe. * Get the deleted recipe.
* *
* @return The ID of the deleted recipe. * @return The deleted recipe.
*/ */
public Long getRecipeId() { public Recipe getRecipe() {
return recipeId; return recipe;
} }
// for jackson // for jackson
public void setRecipeId(Long recipeId) { public void setRecipe(Recipe recipe) {
this.recipeId = recipeId; this.recipe = recipe;
} }
} }