Fixed first bug other bug now

src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java

@@ -68,7 +68,7 @@ public class FridgeController {
         }
 
         try {
-            if (fridgeService.addProductToFridge(groupId, productId, request.amount(), request.days()).isPresent()) {
+            if (fridgeService.addProductToFridge(groupId,productId, request.amount(), request.days()).isPresent()) {
                 return ResponseEntity.ok("Success");
             }
             return ResponseEntity.badRequest().body("Product already exists in the fridge");

src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java

@@ -13,26 +13,23 @@ import java.sql.Date;
 @Getter @Setter
 @Entity(name = "fridge_product")
 @Builder
-@IdClass(FridgeProductId.class)
 public class FridgeProductAsso {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "fridge_product_id")
     private long id;
 
     @ManyToOne
-    @MapsId("fridge_id")
     @JoinColumn(name = "fridge_id")
     @JsonIgnoreProperties({"products"})
     private Fridge fridgeId;
 
     @ManyToOne
-    @MapsId("ean")
     @JoinColumn(name = "ean")
     @JsonIgnoreProperties({"fridges"})
     private Product ean;
 
-    @MapsId("purchase_date")
     @Column(name = "purchase_date")
     private Date purchaseDate;
 

src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductId.java

-package ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.sql.Date;
-
-/**
- * This class represents a fridge product association id
- * @author Birk
- * @version 1.0
- * @since 25.04.2023
- */
-@EqualsAndHashCode
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class FridgeProductId implements Serializable {
-    private long fridgeId;
-
-    private long ean;
-
-    private Date purchaseDate;
-}

src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/FridgeProductAssoRepository.java

 package ntnu.idatt2016.v233.SmartMat.repository.group;
 
 import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
-import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductId;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
 import java.util.Optional;
 
 /**
@@ -13,6 +11,6 @@ import java.util.Optional;
  * @version 1.0
  * @since 25.04.2023
  */
-public interface FridgeProductAssoRepository extends JpaRepository<FridgeProductAsso, FridgeProductId> {
+public interface FridgeProductAssoRepository extends JpaRepository<FridgeProductAsso, Long> {
     Optional<FridgeProductAsso> findById(long id);
 }

src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeProductAssoService.java

@@ -47,7 +47,6 @@ public class FridgeProductAssoService {
         fridgeProductAsso.getFridgeId().getProducts().remove(fridgeProductAsso);
         fridgeProductAsso.getEan().getFridges().remove(fridgeProductAsso);
         fridgeProductAssoRepository.delete(fridgeProductAsso);
-
         fridgeRepository.save(fridgeProductAsso.getFridgeId());
         productRepository.save(fridgeProductAsso.getEan());
 

src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java

@@ -69,12 +69,7 @@ public class FridgeService {
         Fridge fridge = fridgeRepository.findByGroupGroupId(groupId).orElseThrow(() -> new IllegalArgumentException("Fridge does not exist"));
 
         if (product.isPresent()) {
-            Product productToAdd = product.get();
-            FridgeProductAsso temp = FridgeProductAsso.builder().fridgeId(fridge).ean(productToAdd).amount(amount).daysToExpiration(days).build();
-            if (fridge.getProducts().contains(temp)) {
-                return Optional.empty();
-            }
-            return Optional.of(fridgeProductAssoService.createFridgeProductAsso(fridge, productToAdd,amount,days));
+            return Optional.of(fridgeProductAssoService.createFridgeProductAsso(fridge, product.get(),amount,days));
         } else {
             return Optional.empty();
         }

src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeProductAssoServiceTest.java

 package ntnu.idatt2016.v233.SmartMat.service.group;
 
 import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
-import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductId;
 import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
 import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
 import ntnu.idatt2016.v233.SmartMat.repository.group.FridgeProductAssoRepository;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,9 +11,6 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
 
 import java.sql.Date;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.util.List;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.*;