Skip to content
Snippets Groups Projects
Commit 01ad868c authored by Pedro Pablo Cardona Arroyave's avatar Pedro Pablo Cardona Arroyave
Browse files

Not finish yet

parent e0653dfa
Branches 201-add-endpoit-to-delete-a-product-from-fridge
No related tags found
No related merge requests found
...@@ -59,21 +59,16 @@ public class FridgeController { ...@@ -59,21 +59,16 @@ public class FridgeController {
*/ */
@PostMapping("/group/product") @PostMapping("/group/product")
public ResponseEntity<Object> addProductToFridge(@RequestBody FridgeProductRequest request) { public ResponseEntity<Object> addProductToFridge(@RequestBody FridgeProductRequest request) {
System.out.println(request);
return fridgeService.addProductToFridge(request).map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); return fridgeService.addProductToFridge(request).map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build());
} }
/** @DeleteMapping("/group/product/delete/{fridgeProductId}/{amount}")
* Removes a product from the fridge of a group public ResponseEntity<?> deleteAmountFridgeProduct(@PathVariable("fridgeProductId") long fridgeProductId,
* todo: remove the date parameter when the frontend is done @PathVariable("amount") int amount){
* return fridgeService.deleteAmountFromFridge(fridgeProductId,amount).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
* @param groupId the id of the group }
* group must exist
* group must have a fridge
* @param productId the id of the product
* @return success if the product was removed, bad request if the product wasn't in the fridge, or not found if the group or product doesn't exist
*/
/* /*
@DeleteMapping("/delete/{fridgeProductId}") @DeleteMapping("/delete/{fridgeProductId}")
......
...@@ -2,6 +2,9 @@ package ntnu.idatt2016.v233.SmartMat.repository.group; ...@@ -2,6 +2,9 @@ package ntnu.idatt2016.v233.SmartMat.repository.group;
import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso; import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.Optional; import java.util.Optional;
...@@ -11,6 +14,10 @@ import java.util.Optional; ...@@ -11,6 +14,10 @@ import java.util.Optional;
* @version 1.0 * @version 1.0
* @since 25.04.2023 * @since 25.04.2023
*/ */
@Repository
public interface FridgeProductAssoRepository extends JpaRepository<FridgeProductAsso, Long> { public interface FridgeProductAssoRepository extends JpaRepository<FridgeProductAsso, Long> {
Optional<FridgeProductAsso> findById(long id); Optional<FridgeProductAsso> findById(long id);
int findAmountById(long id);
} }
...@@ -120,4 +120,13 @@ public class FridgeService { ...@@ -120,4 +120,13 @@ public class FridgeService {
fridgeRepository.save(fridge.get()); fridgeRepository.save(fridge.get());
} }
} }
public Optional<Object> deleteAmountFromFridge(long fridgeProductId, int amount) {
if(amount < fridgeProductAssoRepository.findAmountById(fridgeProductId)){
System.out.println("Given amount " + amount + " < " + " Stored in db");
} else {
System.out.println("Given amount " + amount + " > " + " Stored in db");
}
return Optional.empty();
}
} }
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