Skip to content
Snippets Groups Projects
Commit 2661e3b6 authored by Anders Austlid's avatar Anders Austlid
Browse files

Working on fridge controller

parent 2abcbae4
No related branches found
No related tags found
No related merge requests found
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();
}
}
package ntnu.idatt2016.v233.SmartMat.entity;
package ntnu.idatt2016.v233.SmartMat.entity.group;
import java.util.List;
......
......@@ -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;
......
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;
......
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;
......
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()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment