From 580145563010e1f027d07bfeee90bd16d87e27e0 Mon Sep 17 00:00:00 2001 From: Egor Shamardin <33912805+LightOfHeaven1994@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:04:47 +0200 Subject: [PATCH] Correct check condition on group field (#493) --- backend/ibutsu_server/widgets/filter_heatmap.py | 2 +- backend/ibutsu_server/widgets/jenkins_heatmap.py | 2 +- backend/ibutsu_server/widgets/result_aggregator.py | 2 +- backend/ibutsu_server/widgets/run_aggregator.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/ibutsu_server/widgets/filter_heatmap.py b/backend/ibutsu_server/widgets/filter_heatmap.py index 8fbb5490..cc76fc9a 100644 --- a/backend/ibutsu_server/widgets/filter_heatmap.py +++ b/backend/ibutsu_server/widgets/filter_heatmap.py @@ -43,7 +43,7 @@ def _get_heatmap(filters, builds, group_field, project=None): # generate the group_field group_field = string_to_column(group_field, Run) - if not group_field: + if group_field is None: return {} # get the runs on which to run the aggregation, we select from a subset of runs to improve diff --git a/backend/ibutsu_server/widgets/jenkins_heatmap.py b/backend/ibutsu_server/widgets/jenkins_heatmap.py index 18d126ba..cc3d3036 100644 --- a/backend/ibutsu_server/widgets/jenkins_heatmap.py +++ b/backend/ibutsu_server/widgets/jenkins_heatmap.py @@ -101,7 +101,7 @@ def _get_heatmap(job_name, builds, group_field, count_skips, project=None, addit # generate the group_fields group_field = string_to_column(group_field, Run) - if not group_field: + if group_field is None: return {}, builds job_name = string_to_column("metadata.jenkins.job_name", Run) diff --git a/backend/ibutsu_server/widgets/result_aggregator.py b/backend/ibutsu_server/widgets/result_aggregator.py index 5d287cb9..7bac8b64 100644 --- a/backend/ibutsu_server/widgets/result_aggregator.py +++ b/backend/ibutsu_server/widgets/result_aggregator.py @@ -36,7 +36,7 @@ def _get_recent_result_data(group_field, days, project=None, run_id=None, additi # generate the group field group_field = string_to_column(group_field, Result) - if not group_field: + if group_field is None: return [] # create the query diff --git a/backend/ibutsu_server/widgets/run_aggregator.py b/backend/ibutsu_server/widgets/run_aggregator.py index 423337b1..6bb9de58 100644 --- a/backend/ibutsu_server/widgets/run_aggregator.py +++ b/backend/ibutsu_server/widgets/run_aggregator.py @@ -26,7 +26,8 @@ def _get_recent_run_data(weeks, group_field, project=None, additional_filters=No # generate the group field group_field = string_to_column(group_field, Run) - if not group_field: + + if group_field is None: return data # create the query