Fixes timewindow methods to work even if partly out of the forecast data

FL550 · Mar 11, 2021 · 03952d9 · 03952d9
1 parent 6376997
commit 03952d9
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 16 deletions.
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="simple_dwd_weatherforecast",
-    version="1.0.9",
+    version="1.0.10",
     author="Max Fermor",
     description="A simple tool to retrieve a weather forecast from DWD OpenData",
     long_description=long_description,

diff --git a/simple_dwd_weatherforecast/dwdforecast.py b/simple_dwd_weatherforecast/dwdforecast.py
@@ -156,8 +156,10 @@ def get_timeframe_condition(
     ):
         if shouldUpdate:
             self.update()
-        if self.is_valid_timeframe(timeframe) and self.is_in_timerange(timestamp):
-            return self.get_condition(self.get_timeframe_values(timestamp, timeframe))
+        if self.is_valid_timeframe(timeframe):
+            result = self.get_condition(self.get_timeframe_values(timestamp, timeframe))
+            if result != "":
+                return result
         return None
 
     def get_daily_condition(self, timestamp: datetime, shouldUpdate=True):
@@ -187,7 +189,7 @@ def get_timeframe_max(
     ):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp) and self.is_valid_timeframe(timeframe):
+        if self.is_valid_timeframe(timeframe):
             return self.get_max(
                 self.get_timeframe_values(timestamp, timeframe), weatherDataType
             )
@@ -224,7 +226,7 @@ def get_timeframe_min(
     ):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp) and self.is_valid_timeframe(timeframe):
+        if self.is_valid_timeframe(timeframe):
             return self.get_min(
                 self.get_timeframe_values(timestamp, timeframe), weatherDataType
             )
@@ -262,7 +264,7 @@ def get_timeframe_sum(
     ):
         if shouldUpdate:
             self.update()
-        if self.is_valid_timeframe(timeframe) and self.is_in_timerange(timestamp):
+        if self.is_valid_timeframe(timeframe):
             return self.get_sum(
                 self.get_timeframe_values(timestamp, timeframe), weatherDataType
             )

diff --git a/tests/test_get_timeframe_condition.py b/tests/test_get_timeframe_condition.py
@@ -27,6 +27,14 @@ def test_not_in_timerange(self):
         test_time = datetime(2000, 11, 7, 3, 30)
         self.assertIsNone(self.dwd_weather.get_timeframe_condition(test_time, 3))
 
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_part_in_timerange(self, _):
+        test_time = datetime(2020, 11, 6, 1, 0)
+        self.assertEqual(
+            self.dwd_weather.get_timeframe_condition(test_time, 6),
+            "cloudy",
+        )
+
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_49_max(self, _):
         test_time = datetime(2020, 11, 6, 10, 0)

diff --git a/tests/test_get_timeframe_max.py b/tests/test_get_timeframe_max.py
@@ -31,7 +31,19 @@ def test_shouldupdate_not(self, mock_update):
     def test_not_in_timerange(self):
         test_time = datetime(2000, 11, 7, 3, 30)
         self.assertIsNone(
-            self.dwd_weather.get_timeframe_max(WeatherDataType.PRECIPITATION, test_time, 3)
+            self.dwd_weather.get_timeframe_max(
+                WeatherDataType.PRECIPITATION, test_time, 3
+            )
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_part_in_timerange(self, _):
+        test_time = datetime(2020, 11, 6, 1, 0)
+        self.assertEqual(
+            self.dwd_weather.get_timeframe_max(
+                WeatherDataType.TEMPERATURE, test_time, 6
+            ),
+            273.65,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
@@ -48,6 +60,8 @@ def test_precipitation(self, _):
     def test_temperature(self, _):
         test_time = datetime(2020, 11, 6, 4, 0)
         self.assertEqual(
-            self.dwd_weather.get_timeframe_max(WeatherDataType.TEMPERATURE, test_time, 3),
+            self.dwd_weather.get_timeframe_max(
+                WeatherDataType.TEMPERATURE, test_time, 3
+            ),
             273.65,
         )
diff --git a/tests/test_get_timeframe_min.py b/tests/test_get_timeframe_min.py
@@ -31,7 +31,19 @@ def test_shouldupdate_not(self, mock_update):
     def test_not_in_timerange(self):
         test_time = datetime(2000, 11, 7, 3, 30)
         self.assertIsNone(
-            self.dwd_weather.get_timeframe_min(WeatherDataType.PRECIPITATION, test_time, 3)
+            self.dwd_weather.get_timeframe_min(
+                WeatherDataType.PRECIPITATION, test_time, 3
+            )
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_part_in_timerange(self, _):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_timeframe_min(
+                WeatherDataType.TEMPERATURE, test_time, 6
+            ),
+            272.95,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
@@ -48,6 +60,8 @@ def test_precipitation(self, _):
     def test_temperature(self, _):
         test_time = datetime(2020, 11, 6, 4, 0)
         self.assertEqual(
-            self.dwd_weather.get_timeframe_min(WeatherDataType.TEMPERATURE, test_time, 3),
+            self.dwd_weather.get_timeframe_min(
+                WeatherDataType.TEMPERATURE, test_time, 3
+            ),
             272.95,
         )
diff --git a/tests/test_get_timeframe_sum.py b/tests/test_get_timeframe_sum.py
@@ -15,33 +15,54 @@ def setUp(self):
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):
         test_time = datetime(2020, 11, 7, 3, 30)
-        self.dwd_weather.get_timeframe_sum(WeatherDataType.PRECIPITATION, test_time, 3, True)
+        self.dwd_weather.get_timeframe_sum(
+            WeatherDataType.PRECIPITATION, test_time, 3, True
+        )
         mock_update.assert_called()
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate_not(self, mock_update):
         test_time = datetime(2020, 11, 7, 3, 30)
-        self.dwd_weather.get_timeframe_sum(WeatherDataType.PRECIPITATION, test_time, 3, False)
+        self.dwd_weather.get_timeframe_sum(
+            WeatherDataType.PRECIPITATION, test_time, 3, False
+        )
         mock_update.assert_not_called()
 
     def test_not_in_timerange(self):
         test_time = datetime(2000, 11, 7, 3, 30)
-        self.assertIsNone(
-            self.dwd_weather.get_timeframe_sum(WeatherDataType.PRECIPITATION, test_time,3)
+        self.assertEqual(
+            self.dwd_weather.get_timeframe_sum(
+                WeatherDataType.PRECIPITATION, test_time, 3
+            ),
+            0.0,
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_part_in_timerange(self, _):
+        test_time = datetime(2020, 11, 6, 1, 0)
+        self.assertEqual(
+            self.dwd_weather.get_timeframe_sum(
+                WeatherDataType.TEMPERATURE, test_time, 6
+            ),
+            819.65,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_precipitation(self, _):
         test_time = datetime(2020, 11, 6, 4, 0)
         self.assertEqual(
-            self.dwd_weather.get_timeframe_sum(WeatherDataType.PRECIPITATION, test_time, 3),
+            self.dwd_weather.get_timeframe_sum(
+                WeatherDataType.PRECIPITATION, test_time, 3
+            ),
             1.36,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_temperature(self, _):
         test_time = datetime(2020, 11, 6, 4, 0)
         self.assertEqual(
-            self.dwd_weather.get_timeframe_sum(WeatherDataType.TEMPERATURE, test_time, 3),
+            self.dwd_weather.get_timeframe_sum(
+                WeatherDataType.TEMPERATURE, test_time, 3
+            ),
             819.65,
         )