#3

Started work on unit tests for Garden. Fix custom queries (implementation still not finished). Exclude createdAt date for equals and hashcode in GardenEntry

src/main/java/hdm/mi/growbros/models/GardenEntry.java

@@ -3,16 +3,19 @@ package hdm.mi.growbros.models;
 import hdm.mi.growbros.models.plant.Plant;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.util.Date;
+import java.util.Objects;
 
 @Entity
 @EntityListeners(AuditingEntityListener.class)
-@Data
+@Getter
+@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 public class GardenEntry {
@@ -28,4 +31,17 @@ public class GardenEntry {
 
     @CreatedDate
     private Date createdAt;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GardenEntry that = (GardenEntry) o;
+        return Objects.equals(id, that.id) && Objects.equals(plant, that.plant);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, plant);
+    }
 }

src/main/java/hdm/mi/growbros/models/plant/Plant.java

@@ -8,12 +8,14 @@ import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.URL;
 //careful! weeks are indexed at 0 -> max value is 51.
 
 @Data
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity

src/main/java/hdm/mi/growbros/repositories/GardenRepository.java

@@ -14,25 +14,25 @@ public interface GardenRepository extends JpaRepository<GardenEntry, Long> {
                 SELECT ge FROM GardenEntry ge
                 ORDER BY
                     CASE
-                        WHEN :week >= ge.plant.harvestWeekStart
+                        WHEN :week <= ge.plant.harvestWeekStart
                             THEN ABS(:week - ge.plant.harvestWeekStart)
                         ELSE ABS(52 + :week - ge.plant.harvestWeekStart)
                     END,
                     ge.plant.name
                 ASC
             """)
-    List<GardenEntry> findNearestHarvestWeek(@Param("week") int currentWeek);
+    List<GardenEntry> findAllByNearestHarvestWeek(@Param("week") int currentWeek);
 
     @Query("""
                 SELECT ge FROM GardenEntry ge
                 ORDER BY
                     CASE
-                        WHEN :week >= ge.plant.plantWeekStart
+                        WHEN :week <= ge.plant.plantWeekStart
                             THEN ABS(:week - ge.plant.plantWeekStart)
                         ELSE ABS(52 + :week - ge.plant.plantWeekStart)
                     END,
                     ge.plant.name
                 ASC
             """)
-    List<GardenEntry> findNearestPlantingWeek(@Param("week") int currentWeek);
+    List<GardenEntry> findAllByNearestPlantingWeek(@Param("week") int currentWeek);
 }

src/main/java/hdm/mi/growbros/service/GardenService.java

@@ -63,13 +63,13 @@ public class GardenService {
 
     private List<Plant> getAllPlantsOrderedByNextPossiblePlantDate() {
         return mapGardenEntriesToPlants(
-                gardenRepository.findNearestPlantingWeek(DateTimeUtils.getCurrentWeekForToday())
+                gardenRepository.findAllByNearestPlantingWeek(DateTimeUtils.getCurrentWeekForToday())
         );
     }
 
     private List<Plant> getAllPlantsOrderedByNextPossibleHarvest() {
         return mapGardenEntriesToPlants(
-                gardenRepository.findNearestHarvestWeek(DateTimeUtils.getCurrentWeekForToday())
+                gardenRepository.findAllByNearestHarvestWeek(DateTimeUtils.getCurrentWeekForToday())
         );
     }
 

src/test/java/hdm/mi/growbros/repositories/GardenRepositoryTest.java

+package hdm.mi.growbros.repositories;
+
+import hdm.mi.growbros.models.GardenEntry;
+import hdm.mi.growbros.models.plant.Plant;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+//TODO: Test for when the current week is in between plant/harvest start and end date
+
+@SpringBootTest
+class GardenRepositoryTest {
+    @Autowired
+    private GardenRepository underTest;
+
+    private static GardenEntry ge1, ge2, ge3;
+
+    @BeforeAll
+    public static void setupAll(@Autowired GardenRepository underTest, @Autowired PlantRepository plantRepository) {
+        Plant p1 = Plant.builder()
+                .name("Early plant")
+                .plantWeekStart(1)
+                .plantWeekEnd(3)
+                .harvestWeekStart(10)
+                .harvestWeekEnd(15)
+                .build();
+        Plant p2 = Plant.builder()
+                .name("Medium late plant")
+                .plantWeekStart(4)
+                .plantWeekEnd(6)
+                .harvestWeekStart(18)
+                .harvestWeekEnd(20)
+                .build();
+        Plant p3 = Plant.builder()
+                .name("Late plant")
+                .plantWeekStart(10)
+                .plantWeekEnd(15)
+                .harvestWeekStart(25)
+                .harvestWeekEnd(30)
+                .build();
+        ge1 = new GardenEntry(0L, p1, null);
+        ge2 = new GardenEntry(0L, p2, null);
+        ge3 = new GardenEntry(0L, p3, null);
+        plantRepository.saveAll(List.of(p1, p2, p3));
+        underTest.saveAll(List.of(ge1, ge2, ge3));
+    }
+
+    @Test
+    void testNearestHarvestWeek() {
+        //when
+        var result = underTest.findAllByNearestHarvestWeek(1);
+
+        //then
+        assertEquals(List.of(ge1, ge2, ge3), result);
+    }
+
+    @Test
+    void findNearestPlantingWeek() {
+        //when
+        var result = underTest.findAllByNearestPlantingWeek(1);
+
+        //then
+        assertEquals(List.of(ge1, ge2, ge3), result);
+    }
+}
\ No newline at end of file