From 71ccffa69845dc3d3fe7e09ca897a1639d3a1839 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Thu, 23 Nov 2023 01:35:25 +0100
Subject: [PATCH] [weather.buienradar] Implemented forecast support.

---
 .../src/components/panels/Entities/Weather.vue      |  7 ++++---
 .../backend/http/webapp/src/utils/DateTime.vue      |  5 ++++-
 platypush/plugins/weather/buienradar/__init__.py    | 13 ++++---------
 platypush/schemas/weather/buienradar.py             | 11 +++++++++++
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Weather.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Weather.vue
index 6107b02fe..78062ab01 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Weather.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Weather.vue
@@ -6,7 +6,9 @@
       </div>
 
       <div class="col-5 name">
-        <div class="name" v-text="formatDateTime(value.time, year=false, seconds=false)" v-if="isForecast" />
+        <div class="name"
+             v-text="formatDateTime(value.time, year=false, seconds=false, skipTimeIfMidnight=true)"
+             v-if="isForecast" />
         <div class="name" v-text="value.name" v-else />
       </div>
 
@@ -170,12 +172,11 @@
 </template>
 
 <script>
-import EntityIcon from "./EntityIcon"
 import EntityMixin from "./EntityMixin"
 import WeatherIcon from "./WeatherIcon"
 
 export default {
-  components: {EntityIcon, WeatherIcon},
+  components: {WeatherIcon},
   mixins: [EntityMixin],
 
   props: {
diff --git a/platypush/backend/http/webapp/src/utils/DateTime.vue b/platypush/backend/http/webapp/src/utils/DateTime.vue
index ea485e443..c6bb8f271 100644
--- a/platypush/backend/http/webapp/src/utils/DateTime.vue
+++ b/platypush/backend/http/webapp/src/utils/DateTime.vue
@@ -16,10 +16,13 @@ export default {
       return date.toTimeString().substring(0, seconds ? 8 : 5)
     },
 
-    formatDateTime(date, year=false, seconds=true) {
+    formatDateTime(date, year=false, seconds=true, skipTimeIfMidnight=false) {
       if (typeof date === 'string')
         date = new Date(Date.parse(date))
 
+      if (skipTimeIfMidnight && date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0)
+        return this.formatDate(date, year)
+
       return `${this.formatDate(date, year)}, ${this.formatTime(date, seconds)}`
     },
   },
diff --git a/platypush/plugins/weather/buienradar/__init__.py b/platypush/plugins/weather/buienradar/__init__.py
index e9100a805..65892b78f 100644
--- a/platypush/plugins/weather/buienradar/__init__.py
+++ b/platypush/plugins/weather/buienradar/__init__.py
@@ -61,17 +61,12 @@ class WeatherBuienradarPlugin(WeatherPlugin):  # pylint: disable=too-many-ancest
         """
         return WeatherSchema().dump(self.get_data(lat, long, 60))
 
-    @action
-    def get_forecast(self, lat: Optional[float] = None, long: Optional[float] = None):
-        """
-        Get the weather forecast for the next days.
-
-        :param lat: Weather latitude (default: configured latitude)
-        :param long: Weather longitude (default: configured longitude)
-        """
+    def _get_forecast(
+        self, *_, lat: Optional[float] = None, long: Optional[float] = None, **__
+    ):
         return [
             {
-                'datetime': weather.get('datetime'),
+                'datetime': weather['datetime'].isoformat(),
                 **dict(WeatherSchema().dump(weather)),
             }
             for weather in self.get_data(lat, long, 60).get('forecast', [])
diff --git a/platypush/schemas/weather/buienradar.py b/platypush/schemas/weather/buienradar.py
index 20992a2f6..01b08ecfd 100644
--- a/platypush/schemas/weather/buienradar.py
+++ b/platypush/schemas/weather/buienradar.py
@@ -1,6 +1,8 @@
 from marshmallow import EXCLUDE, fields
 from marshmallow.schema import Schema
 
+from platypush.schemas import DateTime
+
 
 class WeatherSchema(Schema):
     """
@@ -14,6 +16,15 @@ class WeatherSchema(Schema):
 
         unknown = EXCLUDE
 
+    time = DateTime(
+        required=True,
+        attribute='datetime',
+        metadata={
+            'description': 'Date and time of the weather data',
+            'example': '2020-01-01T00:00:00+00:00',
+        },
+    )
+
     summary = fields.Function(
         lambda obj: obj.get('condition', {}).get('exact', 'Unknown'),
         metadata={