diff --git a/src/main/java/hdm/mi/growbros/controllers/GardenController.java b/src/main/java/hdm/mi/growbros/controllers/GardenController.java
index 4f42d399be5fc2def5fae2badeec5a61baed9497..db636f8829ca4f979c92cbbc3a02ddee535c1e9e 100644
--- a/src/main/java/hdm/mi/growbros/controllers/GardenController.java
+++ b/src/main/java/hdm/mi/growbros/controllers/GardenController.java
@@ -60,14 +60,11 @@ public class GardenController {
) {
return gardenService.clearGarden(user);
}
-
-
- @GetMapping ("/getPlantsNeedingWatering")
- public ResponseEntity<String> getPlantsNeedingWatring (@AuthenticationPrincipal User user){
- return ResponseEntity.ok(gardenService.notifyAboutPlantsNeedingWatering(user));
- }
@PostMapping("/setNewWateringFrequency")
public void setNewWateringService(@RequestParam("wateringFrequency") int wateringFrequency , @RequestBody GardenEntry gardenEntry){
gardenEntry.setWateringFrequency(wateringFrequency);
}
+
+
+
}
diff --git a/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java b/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
index 9b692b8ae2646fdb2f5358f7140dbab58da1acd8..f1141a36efaccc5e02ab257d4377cd3f815216af 100644
--- a/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
+++ b/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
@@ -1,13 +1,15 @@
package hdm.mi.growbros.controllers;
+import hdm.mi.growbros.models.GardenEntry;
+import hdm.mi.growbros.models.plant.Plant;
import hdm.mi.growbros.models.user.User;
import hdm.mi.growbros.service.GrandmaService;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/api/v1/Grandma")
@@ -24,8 +26,17 @@ public class GrandmaController {
return ResponseEntity.ok(grandmaService.growingTippDesTages(user));
}
@GetMapping ("/getGrowablePlants")
- public ResponseEntity<String> getPlantsReadyToGrow(@AuthenticationPrincipal User user){
- return ResponseEntity.ok(grandmaService.notifyAboutPlantsReadyToGrow(user));
+ public ResponseEntity<List<Plant>> getPlantsReadyToGrow(@AuthenticationPrincipal User user){
+ return ResponseEntity.ok(grandmaService.getPlantsReadyToGrow(user));
}
+ @GetMapping ("/getPlantsNeedingWatering")
+ public ResponseEntity<List<GardenEntry>> getPlantsNeedingWatring (@AuthenticationPrincipal User user){
+ return ResponseEntity.ok(grandmaService.getGardenEntriesNeedingWatering(user));
+ }
+ @GetMapping("/getPlantsReadyToHarvest")
+ public ResponseEntity<List<GardenEntry>> getPlantsReadyToHarvest(@AuthenticationPrincipal User user){
+ List<GardenEntry> plantsReadyToHarvest = grandmaService.getPlantsReadyToHarvest(user);
+ return ResponseEntity.ok(plantsReadyToHarvest);
+ }
}
diff --git a/src/main/java/hdm/mi/growbros/service/GardenService.java b/src/main/java/hdm/mi/growbros/service/GardenService.java
index c9e3a1e5c4bfa76ecbfc9d9b8cf911b8db59ce39..b851da70f3cffbfc111733c0bbe35586567e3278 100644
--- a/src/main/java/hdm/mi/growbros/service/GardenService.java
+++ b/src/main/java/hdm/mi/growbros/service/GardenService.java
@@ -13,8 +13,6 @@ import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -92,78 +90,7 @@ public class GardenService {
- public List<GardenEntry> getGardenEntriesNeedingWatering(User user) {
- List<GardenEntry> plantsNeedingWatering = new ArrayList<>();
- List<GardenEntry> plantsInUsersGarden = gardenRepository.findByUser(user);
- if(plantsInUsersGarden.isEmpty()){
- return plantsNeedingWatering;
- }
-
- for( int index = 1 ; index < plantsInUsersGarden.size();index++){
- if(plantsInUsersGarden.get(index).getWateringFrequency() == 0 ){
- switch (plantsInUsersGarden.get(index).getPlant().getWaterDemand()){
- case DRY -> {
- if(getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > 14) {
- plantsNeedingWatering.add(plantsInUsersGarden.get(index));
- }
- }
- case WET -> {
- if(getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > 7) {
- plantsNeedingWatering.add(plantsInUsersGarden.get(index));
- }
- }
- case VERY_WET -> {
- if(getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > 3) {
- plantsNeedingWatering.add(plantsInUsersGarden.get(index));
- }
- }
- }
- }else if (getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > plantsNeedingWatering.get(index).getWateringFrequency()){
- plantsNeedingWatering.add(plantsInUsersGarden.get(index));
- }
- }
-
- return plantsNeedingWatering;
-
- }
-
-
-
-
-
-
-
- public String notifyAboutPlantsNeedingWatering(User user) {
- List<GardenEntry> plantsNeedingWatering = getGardenEntriesNeedingWatering(user);
- StringBuilder notification = new StringBuilder("Diese Pflanzen in deinem Garten brauchen Wasser");
- if(!plantsNeedingWatering.isEmpty()){
- int size = plantsNeedingWatering.size();
- for (int i = 0; i < size; i++) {
- notification.append(plantsNeedingWatering.get(i).getPlant().getName());
- if (i < size - 2) {
- notification.append(", ");
- } else if (i == size - 2) {
- notification.append(" und ");
- }
- }
-
- }
- return String.valueOf(notification);
- }
-
-
-
-
-
-
- private long getDaysSinceLastWatering(LocalDate lastWateringDate) {
- if (lastWateringDate != null) {
- LocalDate currentDate = LocalDate.now();
- return ChronoUnit.DAYS.between(lastWateringDate, currentDate);
- }
- return 0;
- }
}
diff --git a/src/main/java/hdm/mi/growbros/service/GrandmaService.java b/src/main/java/hdm/mi/growbros/service/GrandmaService.java
index 7c0b8b4d500dced98537b0d4bcabec09ace2aedf..c9e86015695f2de0784bfb8a41f860329960f38d 100644
--- a/src/main/java/hdm/mi/growbros/service/GrandmaService.java
+++ b/src/main/java/hdm/mi/growbros/service/GrandmaService.java
@@ -1,20 +1,21 @@
package hdm.mi.growbros.service;
+import hdm.mi.growbros.models.GardenEntry;
import hdm.mi.growbros.models.WishListEntry;
import hdm.mi.growbros.models.plant.Plant;
import hdm.mi.growbros.models.user.User;
+import hdm.mi.growbros.repositories.GardenRepository;
import hdm.mi.growbros.repositories.WishListRepository;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
import java.time.temporal.WeekFields;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Random;
+import java.util.*;
@Service
-
+ @RequiredArgsConstructor
public class GrandmaService {
@@ -25,11 +26,9 @@ public class GrandmaService {
private final GardenService gardenService;
- public GrandmaService(WishListRepository wishListRepository , GardenService gardenService) {
+ private final GardenRepository gardenRepository;
+
- this.wishListRepository = wishListRepository;
- this.gardenService = gardenService;
- }
public String growingTippDesTages(User user) {
@@ -42,26 +41,7 @@ public class GrandmaService {
}
- public String notifyAboutPlantsReadyToGrow(User user){
- List<Plant> plantsReadyToGrow = getPlantsReadyToGrow(user);
- if (plantsReadyToGrow.isEmpty()) {
- return "";
- }
- StringBuilder notification = new StringBuilder("Diese Pflanzen in deiner Wunschliste wären bereit zum Einpflanzen: ");
- int size = plantsReadyToGrow.size();
- for (int i = 0; i < size; i++) {
- notification.append(plantsReadyToGrow.get(i).getName());
- if (i < size - 2) {
- notification.append(", ");
- } else if (i == size - 2) {
- notification.append(" und ");
- }
- }
- return notification.toString();
- }
-
-
- private List<Plant> getPlantsReadyToGrow( User user) {
+ public List<Plant> getPlantsReadyToGrow( User user) {
LocalDate today = LocalDate.now();
int weekNumber = today.get(WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear());
@@ -78,4 +58,71 @@ public class GrandmaService {
return plantsReadyToGrow;
}
+
+ public List<GardenEntry> getGardenEntriesNeedingWatering(User user) {
+ List<GardenEntry> plantsNeedingWatering = new ArrayList<>();
+ List<GardenEntry> plantsInUsersGarden = gardenRepository.findByUser(user);
+ if(plantsInUsersGarden.isEmpty()){
+ return plantsNeedingWatering;
+ }
+
+ for( int index = 1 ; index < plantsInUsersGarden.size();index++){
+ if(plantsInUsersGarden.get(index).getWateringFrequency() == 0 ){
+ switch (plantsInUsersGarden.get(index).getPlant().getWaterDemand()){
+ case DRY -> {
+ if(getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > 14) {
+ plantsNeedingWatering.add(plantsInUsersGarden.get(index));
+ }
+ }
+ case WET -> {
+ if(getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > 7) {
+ plantsNeedingWatering.add(plantsInUsersGarden.get(index));
+ }
+ }
+ case VERY_WET -> {
+ if(getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > 3) {
+ plantsNeedingWatering.add(plantsInUsersGarden.get(index));
+ }
+ }
+ }
+ }else if (getDaysSinceLastWatering(plantsInUsersGarden.get(index).getTimeSinceLastWatering()) > plantsNeedingWatering.get(index).getWateringFrequency()){
+ plantsNeedingWatering.add(plantsInUsersGarden.get(index));
+ }
+ }
+
+ return plantsNeedingWatering;
+
+
+ }
+
+
+ private long getDaysSinceLastWatering(LocalDate lastWateringDate) {
+ if (lastWateringDate != null) {
+ LocalDate currentDate = LocalDate.now();
+ return ChronoUnit.DAYS.between(lastWateringDate, currentDate);
+ }
+ return 0;
+ }
+
+ public List<GardenEntry> getPlantsReadyToHarvest (User user){
+
+
+ List<GardenEntry> usersPlants = gardenRepository.findByUser(user);
+
+ List<GardenEntry> plantsReadyToHarvest = new ArrayList<>();
+
+ for(GardenEntry entry : usersPlants){
+ int growthDuration = entry.getPlant().getGrowthDuration();
+ LocalDate createdAt = entry.getCreatedAt().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate currentDate = LocalDate.now();
+ if(growthDuration != 0 ) {
+ if (growthDuration >= ChronoUnit.WEEKS.between(createdAt, currentDate)) {
+ plantsReadyToHarvest.add(entry);
+ }
+ }
+
+ }
+ return plantsReadyToHarvest;
+
+ }
}