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 ed34b140e88d6b30c565c031cd0b37d20bef60c8..bb6abb5c68ada27a2b968dc6a1f17b4828ef6acc 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 @@ -1,7 +1,8 @@ package ntnu.idatt2016.v233.SmartMat.controller.group; import lombok.AllArgsConstructor; -import ntnu.idatt2016.v233.SmartMat.entity.Fridge; +import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge; +import ntnu.idatt2016.v233.SmartMat.entity.product.Product; import ntnu.idatt2016.v233.SmartMat.service.group.FridgeService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -41,6 +42,12 @@ public class FridgeController { * @param productId the id of the product * @return success if the product was added, bad request if the product was already in the fridge, or not found if the group or product doesn't exist */ - @PostMapping("") + @PostMapping("/group/{groupId}/product/{productId}") + public ResponseEntity<String> addProductToFridge(@PathVariable("groupId") long groupId, @PathVariable("productId") long productId) { + if(fridgeService.addProductToFridge(groupId, productId)) { + return ResponseEntity.ok("Success"); + } + return ResponseEntity.badRequest().build(); + } } diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java similarity index 94% rename from src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java rename to src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java index a8a0e0145c3cb273ae61b293da8d24b002abfef6..a15c7cf5499635a662af71f070ed4984fcf86017 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java @@ -1,4 +1,4 @@ -package ntnu.idatt2016.v233.SmartMat.entity; +package ntnu.idatt2016.v233.SmartMat.entity.group; import java.util.List; diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java index 67f6757f466112a0f2d7ea5d9e1eb074834bb976..3030ef93b53a973e98def00b4e458fef9896eef8 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java @@ -6,7 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import ntnu.idatt2016.v233.SmartMat.entity.Fridge; +import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge; import ntnu.idatt2016.v233.SmartMat.entity.Recipe; import java.util.List; diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/FridgeRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/FridgeRepository.java index c8013568ebfa29f2ecdfc700477c90a5f1e1fb29..8726eb0ffee24a434dbdfc11738d1311dd5e1e91 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/FridgeRepository.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/FridgeRepository.java @@ -1,6 +1,6 @@ package ntnu.idatt2016.v233.SmartMat.repository; -import ntnu.idatt2016.v233.SmartMat.entity.Fridge; +import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge; import java.util.List; diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/FridgeRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/FridgeRepository.java similarity index 77% rename from src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/FridgeRepository.java rename to src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/FridgeRepository.java index f66d5b73a6b36312872d4fc6b708e08fc84a025e..ae9b147f80c33aced58baeb0c644be96e73bcb96 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/FridgeRepository.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/FridgeRepository.java @@ -1,6 +1,6 @@ -package ntnu.idatt2016.v233.SmartMat.entity.group; +package ntnu.idatt2016.v233.SmartMat.repository.group; -import ntnu.idatt2016.v233.SmartMat.entity.Fridge; +import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java index 495c183617178ad4e804fed39d6702fc8305baa4..f3cac665aa9f2cae38998f41ac3b72ce51b10866 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java @@ -1,8 +1,8 @@ package ntnu.idatt2016.v233.SmartMat.service.group; import lombok.AllArgsConstructor; -import ntnu.idatt2016.v233.SmartMat.entity.Fridge; -import ntnu.idatt2016.v233.SmartMat.entity.group.FridgeRepository; +import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge; +import ntnu.idatt2016.v233.SmartMat.repository.group.FridgeRepository; import ntnu.idatt2016.v233.SmartMat.entity.product.Product; import ntnu.idatt2016.v233.SmartMat.service.product.ProductService; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ public class FridgeService { * @param ean the ean of the product * @return true if the product was added */ - public boolean addProduct(long groupId, long ean) { + public boolean addProductToFridge(long groupId, long ean) { Optional<Product> product = productService.getProductById(ean); Fridge fridge = fridgeRepository.findByGroupId(groupId).orElseThrow(() -> new IllegalArgumentException("Fridge does not exist")); if(product.isPresent()) {