#3

fix typo, add additional ordering to custom queries in garden repository

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

@@ -17,7 +17,8 @@ public interface GardenRepository extends JpaRepository<GardenEntry, Long> {
                         WHEN :week >= ge.plant.harvestWeekStart
                             THEN ABS(:week - ge.plant.harvestWeekStart)
                         ELSE ABS(52 + :week - ge.plant.harvestWeekStart)
-                    END
+                    END,
+                    ge.plant.name
                 ASC
             """)
     List<GardenEntry> findNearestHarvestWeek(@Param("week") int currentWeek);
@@ -29,7 +30,8 @@ public interface GardenRepository extends JpaRepository<GardenEntry, Long> {
                         WHEN :week >= ge.plant.plantWeekStart
                             THEN ABS(:week - ge.plant.plantWeekStart)
                         ELSE ABS(52 + :week - ge.plant.plantWeekStart)
-                    END
+                    END,
+                    ge.plant.name
                 ASC
             """)
     List<GardenEntry> findNearestPlantingWeek(@Param("week") int currentWeek);

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

@@ -23,8 +23,8 @@ public class GardenService {
         if (sort == null) return getAllPlantsOrderedByName();
         return switch (sort) {
             case "createdAt" -> getAllPlantsOrderedByCreatedDate();
-            case "plantDate" -> getALlPlantsOrderedByNextPossiblePlantDate();
-            case "harvestDate" -> getALlPlantsOrderedByNextPossibleHarvest();
+            case "plantDate" -> getAllPlantsOrderedByNextPossiblePlantDate();
+            case "harvestDate" -> getAllPlantsOrderedByNextPossibleHarvest();
             default -> getAllPlantsOrderedByName();
         };
     }
@@ -61,13 +61,13 @@ public class GardenService {
         );
     }
 
-    private List<Plant> getALlPlantsOrderedByNextPossiblePlantDate() {
+    private List<Plant> getAllPlantsOrderedByNextPossiblePlantDate() {
         return mapGardenEntriesToPlants(
                 gardenRepository.findNearestPlantingWeek(DateTimeUtils.getCurrentWeekForToday())
         );
     }
 
-    private List<Plant> getALlPlantsOrderedByNextPossibleHarvest() {
+    private List<Plant> getAllPlantsOrderedByNextPossibleHarvest() {
         return mapGardenEntriesToPlants(
                 gardenRepository.findNearestHarvestWeek(DateTimeUtils.getCurrentWeekForToday())
         );