Skip to content
Snippets Groups Projects
Commit 5ebd986f authored by Stian Lyng's avatar Stian Lyng
Browse files

bugfix: add product to fridge

parent 4eec33b0
No related branches found
No related tags found
No related merge requests found
......@@ -3,13 +3,10 @@ package ntnu.idatt2016.v233.SmartMat.controller.group;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.dto.request.FridgeProductRequest;
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.*;
import java.sql.Date;
import java.util.Optional;
/**
* Controller for fridges API, providing endpoints for fridge management
......
......@@ -5,5 +5,5 @@ package ntnu.idatt2016.v233.SmartMat.dto.request;
* @param groupId the id of the group
* @param productId the id of the product
*/
public record FridgeProductRequest(long groupId, long productId, int amount, int days) {
public record FridgeProductRequest(long groupId, long ean, int amount, int days) {
}
package ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import lombok.*;
......@@ -23,11 +24,13 @@ public class FridgeProductAsso {
@ManyToOne
@JoinColumn(name = "fridge_id")
@JsonIgnoreProperties({"products"})
@JsonIgnore
private Fridge fridgeId;
@ManyToOne
@JoinColumn(name = "ean")
@JsonIgnoreProperties({"fridges"})
@JsonIgnore
private Product ean;
@Column(name = "purchase_date")
......
......@@ -60,7 +60,7 @@ public class FridgeService {
public Optional<Object> addProductToFridge(FridgeProductRequest fridgeProductRequest) {
Optional<Product> product = productService.getProductById(fridgeProductRequest.productId());
Optional<Product> product = productService.getProductById(fridgeProductRequest.ean());
Optional<Fridge> fridge = fridgeRepository.findByGroupGroupId(fridgeProductRequest.groupId());
if(product.isEmpty() || fridge.isEmpty()) 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