diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/CompanyRemoverController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/CompanyRemoverController.java index 92c4afb..ea30cb7 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/CompanyRemoverController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/CompanyRemoverController.java @@ -5,6 +5,7 @@ import dev.fyloz.trial.colorrecipesexplorer.core.exception.model.EntityNotFoundE import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ModelResponseBuilder; import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ResponseCode; import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ResponseDataType; +import dev.fyloz.trial.colorrecipesexplorer.core.model.Company; import dev.fyloz.trial.colorrecipesexplorer.core.services.model.CompanyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -39,9 +40,9 @@ public class CompanyRemoverController { ModelResponseBuilder modelResponseBuilder = new ModelResponseBuilder(""); try { - companyService.deleteById(id); - - modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_COMPANY, companyService.getById(id).getName()); + Company company = companyService.getById(id); + companyService.delete(company); + modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_COMPANY, company.getName()); } catch (EntityLinkedException ex) { modelResponseBuilder.addResponseCode(ResponseCode.COMPANY_LINKED, companyService.getById(id).getName()); } catch (EntityNotFoundException ex) { diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialRemoverController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialRemoverController.java index df2273f..5a79373 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialRemoverController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialRemoverController.java @@ -43,9 +43,9 @@ public class MaterialRemoverController { ModelResponseBuilder modelResponseBuilder = new ModelResponseBuilder(); try { - materialService.deleteById(id); - - modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_MATERIAL, materialService.getById(id).getName()); + Material material = materialService.getById(id); + materialService.delete(material); + modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_MATERIAL, material.getName()); } catch (EntityLinkedException ex) { modelResponseBuilder.addResponseCode(ResponseCode.MATERIAL_LINKED, materialService.getById(id).getName()); } catch (EntityNotFoundException ex) { diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialTypeRemoverController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialTypeRemoverController.java index 016b28d..9753bd8 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialTypeRemoverController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialTypeRemoverController.java @@ -44,9 +44,9 @@ public class MaterialTypeRemoverController { ModelResponseBuilder modelResponseBuilder = new ModelResponseBuilder(); try { - materialTypeService.deleteById(id); - - modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_MATERIAL_TYPE, materialTypeService.getById(id).getName()); + MaterialType materialType = materialTypeService.getById(id); + materialTypeService.delete(materialType); + modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_MATERIAL_TYPE, materialType.getName()); } catch (EntityLinkedException ex) { modelResponseBuilder.addResponseCode(ResponseCode.MATERIAL_TYPE_LINKED, materialTypeService.getById(id).getName()); } catch (EntityNotFoundException ex) { diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MixRemoverController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MixRemoverController.java index 87fde33..f7bc577 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MixRemoverController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MixRemoverController.java @@ -28,7 +28,6 @@ public class MixRemoverController { try { Mix mix = mixService.getById(id); mixService.delete(mix); - return modelResponseBuilder .withRedirect(EDITOR_RECIPE_SPECIFIC, mix.getRecipe().getId()) .build(); diff --git a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/RecipeRemoverController.java b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/RecipeRemoverController.java index 287983b..342cba6 100644 --- a/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/RecipeRemoverController.java +++ b/src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/RecipeRemoverController.java @@ -4,6 +4,7 @@ import dev.fyloz.trial.colorrecipesexplorer.core.exception.model.EntityNotFoundE import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ModelResponseBuilder; import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ResponseCode; import dev.fyloz.trial.colorrecipesexplorer.core.io.response.ResponseDataType; +import dev.fyloz.trial.colorrecipesexplorer.core.model.Recipe; import dev.fyloz.trial.colorrecipesexplorer.core.services.model.RecipeService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -36,9 +37,9 @@ public class RecipeRemoverController { ModelResponseBuilder modelResponseBuilder = new ModelResponseBuilder(); try { - recipeService.deleteById(id); - - modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_RECIPE, recipeService.getById(id).getName()); + Recipe recipe = recipeService.getById(id); + recipeService.delete(recipe); + modelResponseBuilder.addResponseCode(ResponseCode.SUCCESS_DELETING_RECIPE, recipe.getName()); } catch (EntityNotFoundException ex) { modelResponseBuilder.addResponseCode(ResponseCode.RECIPE_NOT_FOUND, id); } diff --git a/src/main/resources/templates/company/remover.html b/src/main/resources/templates/company/remover.html index 0d7c48b..a2773e9 100644 --- a/src/main/resources/templates/company/remover.html +++ b/src/main/resources/templates/company/remover.html @@ -24,9 +24,6 @@
-

-

diff --git a/src/main/resources/templates/materialType/remover.html b/src/main/resources/templates/materialType/remover.html index 89aac5a..064b926 100644 --- a/src/main/resources/templates/materialType/remover.html +++ b/src/main/resources/templates/materialType/remover.html @@ -21,8 +21,6 @@
-

diff --git a/src/main/resources/updates.md b/src/main/resources/updates.md index cb8cd52..13c28fd 100644 --- a/src/main/resources/updates.md +++ b/src/main/resources/updates.md @@ -9,6 +9,8 @@ * L'indicateur de statut de l'extension bPac ne s'actualisait parfois pas. * Aucun message d'erreur ne pouvait s'afficher lors de la création d'un mélange. * Les recettes n'étaient pas mises à jour lors de leur édition. +* Les quantités n'étaient pas correctement converties en millilitres. +* Un message d'erreur apparaissait lors de la suppression d'une entité, même si l'opération se terminait avec succès. # v1.3.0 (Optimisations back-end) ### Note: Cette mise à jour n'est pas compatible avec les anciennes versions.