Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/onc/modules/_MultiPage.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,12 @@ def _estimatePages(self, response: object, service: str):
return 0

# total timespan to cover in the next parameter excluding the first page
totalBegin = dateutil.parser.parse(response["next"]["parameters"]["dateFrom"])
totalEnd = dateutil.parser.parse(response["next"]["parameters"]["dateTo"])
totalBegin = dateutil.parser.parse(
response["next"]["parameters"]["dateFrom"], ignoretz=True
)
totalEnd = dateutil.parser.parse(
response["next"]["parameters"]["dateTo"], ignoretz=True
)
totalTimespan = totalEnd - totalBegin

# handle cases of very small timeframes
Expand Down
2 changes: 1 addition & 1 deletion src/onc/onc.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(
token,
production: bool = True,
showInfo: bool = False,
showWarning: bool = True,
showWarning: bool = False,
outPath: str | Path = "output",
timeout: int = 60,
):
Expand Down
8 changes: 8 additions & 0 deletions tests/raw_data/test_rawdata_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ def test_no_data(requester, params):
assert _get_row_num(data) == 0


def test_different_date_format_all_pages(requester, params_multiple_pages):
params_different_date_format = params_multiple_pages | {
"dateFrom": "2019-11-23T23:59:00.000Z",
"dateTo": "2019-11-24",
}
requester.getRawdata(params_different_date_format, allPages=True)


def test_valid_params_one_page(requester, params, params_multiple_pages):
data = requester.getRawdata(params)
data_all_pages = requester.getRawdata(params_multiple_pages, allPages=True)
Expand Down
8 changes: 8 additions & 0 deletions tests/scalar_data/test_scalardata_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ def test_no_data(requester, params_device):
assert data["sensorData"] is None


def test_different_date_format_all_pages(requester, params_multiple_pages):
params_different_date_format = params_multiple_pages | {
"dateFrom": "2019-11-23T23:59:00.000Z",
"dateTo": "2019-11-24",
}
requester.getScalardata(params_different_date_format, allPages=True)


def test_valid_params_one_page(requester, params_device, params_multiple_pages):
data = requester.getScalardata(params_device)
data_all_pages = requester.getScalardata(params_multiple_pages, allPages=True)
Expand Down