From 985ffb55aaaa50c99cefa1610f68fdfb37732222 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 12 Apr 2021 14:46:10 +0800 Subject: [PATCH] added code to validate parameters of averaging_hourly_data_by_period in API --- myems-api/core/utilities.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/myems-api/core/utilities.py b/myems-api/core/utilities.py index 2d070a66..39ddf085 100644 --- a/myems-api/core/utilities.py +++ b/myems-api/core/utilities.py @@ -387,6 +387,12 @@ def get_energy_category_peak_types(cost_center_id, energy_category_id, start_dat ######################################################################################################################## def averaging_hourly_data_by_period(rows_hourly, start_datetime_utc, end_datetime_utc, period_type): # todo: validate parameters + if start_datetime_utc is None or \ + end_datetime_utc is None or \ + start_datetime_utc >= end_datetime_utc or \ + period_type not in ('hourly', 'daily', 'monthly', 'yearly'): + return list(), None, None + start_datetime_utc = start_datetime_utc.replace(tzinfo=None) end_datetime_utc = end_datetime_utc.replace(tzinfo=None)