From 0c65187af2fd71afd00033f2a81f613be4f7ec6c Mon Sep 17 00:00:00 2001
From: birkon <birkon@stud.ntnu.no>
Date: Wed, 3 May 2023 10:15:30 +0200
Subject: [PATCH] fixed return value of delete product endpoint
---
.../SmartMat/controller/product/ProductController.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
index b7755e34..5d81db83 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
@@ -8,6 +8,7 @@ import ntnu.idatt2016.v233.SmartMat.service.AllergyService;
import ntnu.idatt2016.v233.SmartMat.service.product.CategoryService;
import ntnu.idatt2016.v233.SmartMat.service.product.ProductService;
import ntnu.idatt2016.v233.SmartMat.util.CategoryUtil;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -110,13 +111,13 @@ public class ProductController {
* @return The product that was deleted.
*/
@DeleteMapping("ean/{ean}")
- public ResponseEntity<Product> deleteProduct(@PathVariable long ean) {
+ public ResponseEntity<String> deleteProduct(@PathVariable long ean) {
Optional<Product> product = productService.getProductById(ean);
if(product.isPresent()) {
productService.deleteProductById(product.get().getEan());
- return ResponseEntity.ok(product.get());
+ return ResponseEntity.ok("Product deleted");
}
- return ResponseEntity.notFound().build();
+ return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Product not found");
}
--
GitLab