From faf45e832b274b46b4c868d190fedaef64082d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boris=20Bab=C4=8D=C3=A1k?= <boris.babcak@kosickaakademia.sk>
Date: Fri, 19 Apr 2024 12:19:43 +0200
Subject: [PATCH] edited christmas and suncycle controller
---
.../worldx/servercontroller/ChristmasController.java | 4 ++--
.../worldx/servercontroller/SunCycleController.java | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/sk/kasv/babcak/worldx/servercontroller/ChristmasController.java b/src/main/java/sk/kasv/babcak/worldx/servercontroller/ChristmasController.java
index 440d842..9dd11de 100644
--- a/src/main/java/sk/kasv/babcak/worldx/servercontroller/ChristmasController.java
+++ b/src/main/java/sk/kasv/babcak/worldx/servercontroller/ChristmasController.java
@@ -16,12 +16,12 @@ public class ChristmasController {
Christmas ch = new Christmas();
boolean result = ch.regexChristmas(dateValue);
if(!result){
- return ResponseEntity.status(400).body("{\"error\":\"incorrect_date_format_(yyyy-mm-dd)\"}");
+ return ResponseEntity.status(400).body("{\"error\":\"incorrect date format (yyyy-mm-dd)\"}");
}
DayMonthYear dmy = ch.parseDate(dateValue);
if(dmy==null){
- return ResponseEntity.status(400).body("{\"error\":\"date_does_not_exist\"}"); // 400 - Bad Request
+ return ResponseEntity.status(400).body("{\"error\":\"date does not exist\"}"); // 400 - Bad Request
}
int days = ch.calculateDaysToChristmas(dateValue);
diff --git a/src/main/java/sk/kasv/babcak/worldx/servercontroller/SunCycleController.java b/src/main/java/sk/kasv/babcak/worldx/servercontroller/SunCycleController.java
index 659a5f8..210ff67 100644
--- a/src/main/java/sk/kasv/babcak/worldx/servercontroller/SunCycleController.java
+++ b/src/main/java/sk/kasv/babcak/worldx/servercontroller/SunCycleController.java
@@ -13,6 +13,7 @@ import java.net.URL;
public class SunCycleController {
private static final String API_KEY = "b1fd73144d85323925c1b2c6237d1dfc";
SunsetRise sr = new SunsetRise();
+ //http://localhost:8080/sunshine?city=Bardejov&country=SVK
@GetMapping(value="/sunshine")
public String shineTime(@RequestParam("city") String city, @RequestParam("country") String country){
try {
@@ -33,11 +34,12 @@ public class SunCycleController {
String jsonResponse = content.toString();
String suncycle = sr.extractSunshine(jsonResponse);
- System.out.println("Suncycle in: " + city + " | " + country + " is " + suncycle);
- return suncycle;
+ String sunsetResponse = "City: " + city + " | Country: " + country + " /> " + suncycle;
+ System.out.println(sunsetResponse);
+ return sunsetResponse;
}
} else {
- System.out.println("Error: Unable to retrieve sunrise and sunset. Status code: " + status);
+ System.out.println("Error: Unable to retrieve sunrise and sunset.");
}
conn.disconnect();
}catch(IOException e){
--
GitLab