Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-15 04:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-91] adding location id to the available information for weather model

Browse Source
This commit is contained in:
Sheldan
2023-03-19 10:54:54 +01:00
parent f95ba6c28f
commit 2875da117a
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/openeweathermap/command/OpenWeatherMap.java
View File

@@ -125,6 +125,7 @@ public class OpenWeatherMap extends AbstractConditionableCommand {
builder.sunset(systemInfo.getSunset() != null ? Instant.ofEpochSecond(systemInfo.getSunset()) : null); builder.sunset(systemInfo.getSunset() != null ? Instant.ofEpochSecond(systemInfo.getSunset()) : null);
builder.sunset(systemInfo.getSunrise() != null ? Instant.ofEpochSecond(systemInfo.getSunrise()) : null); builder.sunset(systemInfo.getSunrise() != null ? Instant.ofEpochSecond(systemInfo.getSunrise()) : null);
} }
builder.locationId(weatherResult.getLocationId());
return templateService.renderEmbedTemplate(OPEN_WEATHER_MAP_RESPONSE_TEMPLATE_KEY, builder.build(), serverId); return templateService.renderEmbedTemplate(OPEN_WEATHER_MAP_RESPONSE_TEMPLATE_KEY, builder.build(), serverId);
} catch (IOException e) { } catch (IOException e) {
log.warn("Failed to load weather in server {}", serverId, e); log.warn("Failed to load weather in server {}", serverId, e);

1
abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResponseModel.java
View File

@@ -33,4 +33,5 @@ public class WeatherResponseModel {
private String locationName; private String locationName;
private String countryKey; private String countryKey;
private Color embedColor; private Color embedColor;
private Long locationId;
} }

3
abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResult.java
View File

@@ -29,5 +29,6 @@ public class WeatherResult {
private WeatherResultSystem systemInfo; private WeatherResultSystem systemInfo;
@SerializedName("timezone") @SerializedName("timezone")
private Long timezoneShift; private Long timezoneShift;
@SerializedName("id")
private Long locationId;
} }