From 21cbdfb09ea31bf21172fc8ef3f21c2f32ac5770 Mon Sep 17 00:00:00 2001
From: Lukas Karsch <lk224@hdm-stuttgart.de>
Date: Tue, 16 Jan 2024 20:38:32 +0100
Subject: [PATCH] #45 - final changes to swagger annotations
---
.../mi/growbros/controllers/GardenController.java | 13 -------------
.../mi/growbros/controllers/GrandmaController.java | 13 +++++++++++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/hdm/mi/growbros/controllers/GardenController.java b/src/main/java/hdm/mi/growbros/controllers/GardenController.java
index 2e13327..77e3c83 100644
--- a/src/main/java/hdm/mi/growbros/controllers/GardenController.java
+++ b/src/main/java/hdm/mi/growbros/controllers/GardenController.java
@@ -89,19 +89,6 @@ public class GardenController {
return new ResponseEntity<>(response, HttpStatus.OK);
}
-
- @GetMapping("/getPlantsNeedingWatering")
- @Operation(description = "Get plants needing watering")
- @ApiResponses(value = {
- @ApiResponse(responseCode = "200", description = "Successfully retrieved plants needing watering"),
- })
- public ResponseEntity<String> getPlantsNeedingWatering(
- @AuthenticationPrincipal User user
- ) {
- String response = gardenService.notifyAboutPlantsNeedingWatering(user);
- return new ResponseEntity<>(response, HttpStatus.OK);
- }
-
@PostMapping("/setNewWateringFrequency")
@Operation(description = "Set new watering frequency for a plant")
@ApiResponses(value = {
diff --git a/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java b/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
index 15892ff..6041272 100644
--- a/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
+++ b/src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
@@ -1,6 +1,5 @@
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;
@@ -11,7 +10,9 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -48,11 +49,19 @@ public class GrandmaController {
}
@GetMapping ("/getPlantsNeedingWatering")
+ @Operation(description = "Get plants that need to be watered")
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200", description = "Successfully retrieved plants that need to be watered"),
+ })
public ResponseEntity<List<GardenEntry>> getPlantsNeedingWatring (@AuthenticationPrincipal User user){
return ResponseEntity.ok(grandmaService.getGardenEntriesNeedingWatering(user));
}
@GetMapping("/getPlantsReadyToHarvest")
+ @Operation(description = "Get plants ready to harvest")
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200", description = "Successfully retrieved plants ready to harvest"),
+ })
public ResponseEntity<List<GardenEntry>> getPlantsReadyToHarvest(@AuthenticationPrincipal User user){
List<GardenEntry> plantsReadyToHarvest = grandmaService.getPlantsReadyToHarvest(user);
return ResponseEntity.ok(plantsReadyToHarvest);
--
GitLab