From a1cbfbe1d838eb0e1aa708022bed3f78518f2d6a Mon Sep 17 00:00:00 2001 From: Hongwei Date: Mon, 18 Dec 2023 10:34:24 +0100 Subject: [PATCH 1/3] bugfix/sonarcloud Introduce a new variable or use its initial value before reassigning --- apimanager/metrics/views.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apimanager/metrics/views.py b/apimanager/metrics/views.py index d841384..e75d8cf 100644 --- a/apimanager/metrics/views.py +++ b/apimanager/metrics/views.py @@ -320,21 +320,17 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): only_show_api_explorer_metrics has the default value False, because it is just used for app = API_Explorer. """ try: - api_calls_total = 0 - average_response_time = 0 url_path = '/management/aggregate-metrics?from_date={}&to_date={}&include_app_names={}'.format(from_date, to_date, self.get_app_name_parameters(include_app_names)) api = API(self.request.session.get('obp')) metrics = api.get(url_path) - api_calls_total, average_calls_per_day, average_response_time = self.get_internal_api_call_metrics( - api_calls_total, average_response_time, from_date, metrics, to_date, url_path) + api_calls_total, average_calls_per_day, average_response_time = self.get_internal_api_call_metrics(from_date, metrics, to_date) return api_calls_total, average_response_time, int(average_calls_per_day) except APIError as err: error_once_only(self.request, err) except Exception as err: error_once_only(self.request, err) - def get_internal_api_call_metrics(self, api_calls_total, average_response_time, from_date, metrics, - to_date, urlpath): + def get_internal_api_call_metrics(self,from_date, metrics,to_date): api_calls_total = metrics[0]["count"] average_response_time = metrics[0]["average_response_time"] to_date = datetime.datetime.strptime(to_date, API_DATE_FORMAT_WITH_MILLISECONDS) From 9fa9f9e6cd62113dc273ac0acc311ca954c06b0e Mon Sep 17 00:00:00 2001 From: tesobe-daniel Date: Fri, 2 Feb 2024 15:19:06 +0100 Subject: [PATCH 2/3] Add CALLBACK_BASE_URL to local_settings_container.py --- .github/local_settings_container.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/local_settings_container.py b/.github/local_settings_container.py index 6f8e30a..b11584d 100644 --- a/.github/local_settings_container.py +++ b/.github/local_settings_container.py @@ -16,6 +16,8 @@ if os.getenv('API_HOST'): API_HOST = os.getenv('API_HOST') if os.getenv('API_PORTAL'): API_PORTAL = os.getenv('API_PORTAL') +if os.getenv('CALLBACK_BASE_URL'): + CALLBACK_BASE_URL = os.getenv('CALLBACK_BASE_URL') if os.getenv('ALLOWED_HOSTS'): ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS').split(',') BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 825495b9a87482105c233abb879342c668d23533 Mon Sep 17 00:00:00 2001 From: Hongwei Date: Wed, 14 Feb 2024 14:51:13 +0100 Subject: [PATCH 3/3] bugfix/fixed the bug for consumer_id --- apimanager/metrics/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py index 3669278..ff2d5c2 100644 --- a/apimanager/metrics/forms.py +++ b/apimanager/metrics/forms.py @@ -75,7 +75,7 @@ class APIMetricsForm(MetricsForm): ('PUT', 'PUT'), ) - consumer_id = forms.ChoiceField( + consumer_id = forms.CharField( label=_('Consumer ID'), widget=forms.TextInput( attrs={