jes

src/main/java/io/swagger/api/CurrentweatherApiController.java

@@ -56,9 +56,11 @@ public class CurrentweatherApiController implements CurrentweatherApi {
             String datafree = "{\"location\":{},\"current\": {\"condition\": {},\"air_quality\": {}}}";
             RestTemplate restTemplate = new RestTemplate();
             ApiService apiService = new ApiService(restTemplate);
+
             String data = apiService.getDataFromFirstApi(
                     "https://api.weatherapi.com/v1/current.json?key=1244099aeaee4b179e6111803241304&q=" + q
                             + "&aqi=yes");
+
             ResponseEntity<Model200> response = new ResponseEntity<Model200>(objectMapper.readValue(
                     data, Model200.class), HttpStatus.ACCEPTED);
             ResponseEntity<Model200> response2 = new ResponseEntity<Model200>(objectMapper.readValue(

src/main/java/io/swagger/api/ForecastweatherApi.java

@@ -37,16 +37,21 @@ import java.util.Map;
 @Validated
 public interface ForecastweatherApi {
 
-    @Operation(summary = "Call forecast weather data for one location", description = "Get the forecast weather info", tags = {
-            "Forecast Weather Data" })
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Successful response", content = @Content(mediaType = "application/json", schema = @Schema(implementation = Model200.class))),
-
-            @ApiResponse(responseCode = "404", description = "Not found response", content = @Content(mediaType = "text/plain", schema = @Schema(implementation = String.class))) })
-    @RequestMapping(value = "/forecastweather", produces = { "application/json",
-            "text/plain" }, method = RequestMethod.GET)
-    ResponseEntity<Modelforecast> forecastWeatherData(
-            @NotNull @Parameter(in = ParameterIn.QUERY, description = "For the query value, type the city name and optionally the country code divided by comma; use ISO 3166 country codes.", required = true, schema = @Schema()) @Valid @RequestParam(value = "q", required = true) String q,
-            @Parameter(in = ParameterIn.QUERY, description = "filter parameter", schema = @Schema()) @Valid @RequestParam(value = "filter", required = false) String filter);
+        @Operation(summary = "Call forecast weather data for one location", description = "Get the forecast weather info", tags = {
+                        "Forecast Weather Data" })
+        @ApiResponses(value = {
+                        @ApiResponse(responseCode = "200", description = "Successful response", content = @Content(mediaType = "application/json", schema = @Schema(implementation = Model200.class))),
+
+                        @ApiResponse(responseCode = "404", description = "Not found response", content = @Content(mediaType = "text/plain", schema = @Schema(implementation = String.class))) })
+        @RequestMapping(value = "/forecastweather", produces = { "application/json",
+                        "text/plain" }, method = RequestMethod.GET)
+        ResponseEntity<Modelforecast> forecastWeatherData(
+                        @NotNull @Parameter(in = ParameterIn.QUERY, description = "For the query value, type the city name and optionally the country code divided by comma; use ISO 3166 country codes.", required = true, schema = @Schema()) @Valid @RequestParam(value = "q", required = true) String q,
+
+                        @Parameter(in = ParameterIn.QUERY, description = "forcast days", schema = @Schema()) @Valid @RequestParam(value = "days", required = true) int days,
+
+                        @Parameter(in = ParameterIn.QUERY, description = "show alerts", schema = @Schema()) @Valid @RequestParam(value = "alerts", required = true) String alerts,
+
+                        @Parameter(in = ParameterIn.QUERY, description = "filter parameter", schema = @Schema()) @Valid @RequestParam(value = "filter", required = false) String filter);
 
 }

src/main/java/io/swagger/api/ForecastweatherApiController.java

 package io.swagger.api;
 
+import io.swagger.model.Modelforecast;
 import io.swagger.model.Modelforecast;
 import io.swagger.model.Modelforecast;
 
@@ -53,18 +54,30 @@ public class ForecastweatherApiController implements ForecastweatherApi {
 
     public ResponseEntity<Modelforecast> forecastWeatherData(
             @NotNull @Parameter(in = ParameterIn.QUERY, description = "For the query value, type the city name and optionally the country code divided by comma; use ISO 3166 country codes.", required = true, schema = @Schema()) @Valid @RequestParam(value = "q", required = true) String q,
+
+            @Parameter(in = ParameterIn.QUERY, description = "forcast days", required = true, schema = @Schema()) @Valid @RequestParam(value = "days", required = true) int days,
+
+            @Parameter(in = ParameterIn.QUERY, description = "shows alerts", required = true, schema = @Schema()) @Valid @RequestParam(value = "alerts", required = true) String alerts,
+
             @Parameter(in = ParameterIn.QUERY, description = "filter parameter", schema = @Schema()) @Valid @RequestParam(value = "filter", required = false) String filter) {
+
         try {
+            String datafree = "{\"location\":{},\"current\": {\"condition\": {},\"air_quality\": {}}}";
             RestTemplate restTemplate = new RestTemplate();
             ApiService apiService = new ApiService(restTemplate);
+
             String data = apiService.getDataFromFirstApi(
                     "https://api.weatherapi.com/v1/forecast.json?key=1244099aeaee4b179e6111803241304&q=" + q
-                            + "&days=1&aqi=yes&alerts=yes");
-            System.out.println(data);
+                            + "&days=" + days + "&aqi=yes&alerts=" + alerts);
+
             ResponseEntity<Modelforecast> response = new ResponseEntity<Modelforecast>(objectMapper.readValue(
                     data, Modelforecast.class), HttpStatus.ACCEPTED);
 
-            return response;
+            ResponseEntity<Modelforecast> response2 = new ResponseEntity<Modelforecast>(objectMapper.readValue(
+                    datafree, Modelforecast.class), HttpStatus.ACCEPTED);
+            String[] filterlist = filter.split(",");
+
+            return response2;
         } catch (IOException e) {
             log.error("Couldn't serialize response for content type application/json", e);
             return new ResponseEntity<Modelforecast>(HttpStatus.INTERNAL_SERVER_ERROR);