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

Endpoint for deleting prodcut from fridge without adding wastes was added

parent 7c49945b
No related branches found
No related tags found
No related merge requests found
...@@ -3,5 +3,8 @@ package ntnu.idatt2016.v233.SmartMat.repository.product; ...@@ -3,5 +3,8 @@ package ntnu.idatt2016.v233.SmartMat.repository.product;
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 java.util.Optional;
public interface FridgeProductAssoRepo extends JpaRepository<FridgeProductAsso, Long> { public interface FridgeProductAssoRepo extends JpaRepository<FridgeProductAsso, Long> {
Optional<FridgeProductAsso> findAllById(long id);
} }
...@@ -153,12 +153,16 @@ public class FridgeService { ...@@ -153,12 +153,16 @@ public class FridgeService {
* @return an optional containing the fridge product if it exists * @return an optional containing the fridge product if it exists
*/ */
public Optional<Object> deleteAmountFromFridge(long fridgeProductId, int amount) { public Optional<Object> deleteAmountFromFridge(long fridgeProductId, int amount) {
if(amount < 0 ){ Optional<FridgeProductAsso> fridgeProductAsso = fridgeProductAssoRepo.findAllById(fridgeProductId);
System.out.println("Given amount " + amount + " < " + " Stored in db"); if(fridgeProductAsso.isEmpty()) return Optional.empty();
FridgeProductAsso fridgeProductAsso1 = fridgeProductAsso.get();
if(amount < fridgeProductAsso1.getAmount() ){
fridgeProductAsso1.setAmount(fridgeProductAsso1.getAmount() -amount);
return Optional.of(fridgeProductAssoRepo.save(fridgeProductAsso1));
} else { } else {
System.out.println("Given amount " + amount + " > " + " Stored in db"); fridgeProductAssoRepo.delete(fridgeProductAsso.get());
return Optional.of(true);
} }
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