Merge pull request #1 from atsangarides/date_filter

date filter adjusted to include end_date

Author: atsangarides

pyngeso/__init__.py

@@ -1,3 +1,3 @@
 from .pyngeso import NgEso
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'

pyngeso/pyngeso.py

@@ -1,6 +1,6 @@
 import logging
 from typing import Optional, List
-from datetime import datetime
+from datetime import datetime, timedelta
 import json
 import re
 
@@ -91,6 +91,9 @@ def construct_date_range(
             raise ValueError("At least one of {start_date,end_date} should be provided")
         if all(dates_provided):
             self.validate_date_range(start_date, end_date)
+        # add 1 day to end_date as casting as timestamp rounds it down to midnight
+        if end_date:
+            end_date = datetime.strptime(end_date, "%Y-%m-%d") + timedelta(days=1)
 
         date_range_map = {
             (True, False): f"where \"{date_col}\" > '{start_date}'::timestamp",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyngeso"
-version = "0.1.0"
+version = "0.1.1"
 description = "Simple python wrapper for the National Grid ESO Portal"
 authors = ["atsangarides <andreas_tsangarides@hotmail.com>"]
 license = "MIT"

tests/test_pyngeso.py

@@ -20,7 +20,7 @@ def test_day_ahead_historic_forecast():
     assert isinstance(records, list)
     assert len(records) > 0
     unique_target_dates = set([record.get("TARGETDATE") for record in records])
-    assert len(unique_target_dates) == 1
+    assert len(unique_target_dates) == 2
 
 
 @pytest.mark.vcr
@@ -52,4 +52,4 @@ def test_2day_ahead_historic_forecast():
     assert isinstance(records, list)
     assert len(records) > 0
     unique_target_dates = set([record.get("TARGETDATE") for record in records])
-    assert len(unique_target_dates) == 1
+    assert len(unique_target_dates) == 2