Date filtering adjusted to include up to end_date

Author: atsangarides

pyngeso/__init__.py

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

pyngeso/pyngeso.py

@@ -91,17 +91,14 @@ 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",
+            (True, False): f"where \"{date_col}\" >= '{start_date}'::timestamp",
             (False, True): f"where \"{date_col}\" < '{end_date}'::timestamp",
             (
                 True,
                 True,
-            ): f"where \"{date_col}\" between '{start_date}'::timestamp "
+            ): f"where \"{date_col}\" BETWEEN '{start_date}'::timestamp "
                f"and '{end_date}'::timestamp",
         }
         date_filter_sql = date_range_map.get(dates_provided)

pyproject.toml

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

tests/test_pyngeso.py

@@ -9,7 +9,7 @@
 
 @pytest.mark.vcr
 def test_day_ahead_historic_forecast():
-    start_date = "2018-01-01"
+    start_date = "2018-01-02"
     end_date = "2018-01-02"
     client = NgEso("historic-day-ahead-demand-forecast")
     r = client.query(date_col="TARGETDATE", start_date=start_date, end_date=end_date)
@@ -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) == 2
+    assert len(unique_target_dates) == 1
 
 
 @pytest.mark.vcr
@@ -42,7 +42,7 @@ def test_day_ahead_historic_forecast_missing_data_warning(caplog):
 @pytest.mark.vcr
 def test_2day_ahead_historic_forecast():
     start_date = "2018-03-30"
-    end_date = "2018-03-31"
+    end_date = "2018-03-30"
     client = NgEso("historic-2day-ahead-demand-forecast")
     r = client.query(date_col="TARGETDATE", start_date=start_date, end_date=end_date)
 
@@ -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) == 2
+    assert len(unique_target_dates) == 1