From ebd57c162af0f569d59587b6e23710b64e9ca528 Mon Sep 17 00:00:00 2001
From: Anders Austlid <andemau@ntnu.no>
Date: Wed, 26 Apr 2023 17:03:10 +0200
Subject: [PATCH] Trying to fix bug in fridge product endpoints
---
.../SmartMat/controller/group/FridgeController.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
index 5739186b..9e6b1e31 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
@@ -9,6 +9,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.Optional;
/**
* Controller for fridges API, providing endpoints for fridge management
@@ -61,22 +62,20 @@ public class FridgeController {
long groupId = request.groupId();
long productId = request.productId();
- try {
- fridgeService.getFridgeByGroupId(groupId).orElseThrow();
- } catch (Exception e) {
+ Optional<Fridge> fridgeOpt = fridgeService.getFridgeByGroupId(groupId);
+ if (fridgeOpt.isEmpty()) {
return ResponseEntity.notFound().build();
}
try {
- if (fridgeService.addProductToFridge(groupId,productId, request.amount(), request.days()).isPresent()) {
- return ResponseEntity.ok("Success");
- }
- return ResponseEntity.badRequest().body("Product already exists in the fridge");
+ fridgeService.addProductToFridge(groupId, productId, request.amount(), request.days());
+ return ResponseEntity.ok("Success");
} catch (Exception e) {
return ResponseEntity.status(500).body("Internal server error");
}
}
+
/**
* Removes a product from the fridge of a group
* todo: remove the date parameter when the frontend is done
--
GitLab