From a13d63260404b72e872f55080cac33e83fa0bd2f Mon Sep 17 00:00:00 2001 From: Reena-cell Date: Thu, 26 Jan 2023 14:12:40 +0100 Subject: [PATCH] update Date and time Variables name --- README.md | 4 +- apimanager/apimanager/settings.py | 4 +- apimanager/base/filters.py | 2 +- apimanager/base/utils.py | 6 +-- apimanager/consumers/views.py | 4 +- apimanager/customers/forms.py | 10 ++--- apimanager/customers/views.py | 4 +- apimanager/entitlementrequests/views.py | 2 +- apimanager/metrics/forms.py | 14 +++--- apimanager/metrics/views.py | 59 +++++++++++++------------ 10 files changed, 55 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index f28a663..31aad70 100644 --- a/README.md +++ b/README.md @@ -227,9 +227,9 @@ EXCLUDE_URL_PATTERN = [] API_EXPLORER_APP_NAME = 'xxx' #Map Java: yyyy-MM-dd'T'HH:mm'Z' -API_DATETIMEFORMAT = '%Y-%m-%dT%H:%M:%SZ' +API_DATE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ' #Map Java: yyyy-MM-dd'T'HH:mm:ss.SSS'Z' -API_DATEFORMAT = '%Y-%m-%dT%H:%M:%S.000Z' +API_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.000Z' ``` diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py index 9cc7a5f..2c134a6 100644 --- a/apimanager/apimanager/settings.py +++ b/apimanager/apimanager/settings.py @@ -244,9 +244,9 @@ LOGGING = { LOGIN_URL = reverse_lazy('home') #Map Java: yyyy-MM-dd'T'HH:mm'Z' -API_DATETIMEFORMAT = '%Y-%m-%dT%H:%M:%SZ' +API_DATE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ' #Map Java: yyyy-MM-dd'T'HH:mm:ss.SSS'Z' -API_DATEFORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' +API_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' # the API_Manager the web form date format, eg: 2020-10-11 API_MANAGER_DATE_FORMAT= '%Y-%m-%d' diff --git a/apimanager/base/filters.py b/apimanager/base/filters.py index e6d7743..a0f74c2 100644 --- a/apimanager/base/filters.py +++ b/apimanager/base/filters.py @@ -77,7 +77,7 @@ class FilterTime(BaseFilter): print(filtered) for item in data: item_date = datetime.strptime( - item[self.time_fieldname], settings.API_DATETIMEFORMAT) + item[self.time_fieldname], settings.API_DATE_TIME_FORMAT) if now - item_date <= delta: filtered.append(item) return filtered diff --git a/apimanager/base/utils.py b/apimanager/base/utils.py index 54df439..a1418b5 100644 --- a/apimanager/base/utils.py +++ b/apimanager/base/utils.py @@ -4,7 +4,7 @@ Base utilities """ from django.contrib.humanize.templatetags.humanize import naturaltime from datetime import datetime, timedelta -from apimanager.settings import API_DATEFORMAT, API_MANAGER_DATE_FORMAT +from apimanager.settings import API_DATE_FORMAT, API_MANAGER_DATE_FORMAT from base import context_processors from django.contrib import messages import functools @@ -61,7 +61,7 @@ def convert_form_date_to_obpapi_datetime_format(form_to_date_string): """ convert the String 2020-10-22 to 2020-10-22T00:00:00.000000Z """ - return datetime.strptime(form_to_date_string, API_MANAGER_DATE_FORMAT).strftime(API_DATEFORMAT) + return datetime.strptime(form_to_date_string, API_MANAGER_DATE_FORMAT).strftime(API_DATE_FORMAT) def return_to_days_ago(date, days): """ @@ -70,4 +70,4 @@ def return_to_days_ago(date, days): days =1 return 2020-10-21T00:00:00.000000Z """ - return (datetime.strptime(date, API_DATEFORMAT) - timedelta(days)).strftime(API_DATEFORMAT) \ No newline at end of file + return (datetime.strptime(date, API_DATE_FORMAT) - timedelta(days)).strftime(API_DATE_FORMAT) \ No newline at end of file diff --git a/apimanager/consumers/views.py b/apimanager/consumers/views.py index b1fb37e..ecfdb93 100644 --- a/apimanager/consumers/views.py +++ b/apimanager/consumers/views.py @@ -44,7 +44,7 @@ class IndexView(LoginRequiredMixin, TemplateView): """Scrubs data in the given consumers to adher to certain formats""" for consumer in consumers: consumer['created'] = datetime.strptime( - consumer['created'], settings.API_DATETIMEFORMAT) + consumer['created'], settings.API_DATE_TIME_FORMAT) return consumers def compile_statistics(self, consumers): @@ -146,7 +146,7 @@ class DetailView(LoginRequiredMixin, FormView): urlpath = '/management/consumers/{}'.format(self.kwargs['consumer_id']) consumer = api.get(urlpath) consumer['created'] = datetime.strptime( - consumer['created'], settings.API_DATETIMEFORMAT) + consumer['created'], settings.API_DATE_TIME_FORMAT) call_limits_urlpath = '/management/consumers/{}/consumer/call-limits'.format(self.kwargs['consumer_id']) consumer_call_limtis = api.get(call_limits_urlpath) diff --git a/apimanager/customers/forms.py b/apimanager/customers/forms.py index b94d783..925375e 100644 --- a/apimanager/customers/forms.py +++ b/apimanager/customers/forms.py @@ -81,7 +81,7 @@ class CreateCustomerForm(forms.Form): ) face_image_date = forms.DateTimeField( label=_('Face Image Date'), - input_formats=[settings.API_DATETIMEFORMAT], + input_formats=[settings.API_DATE_TIME_FORMAT], widget=forms.DateTimeInput( attrs={ 'placeholder': PLACEHOLDER, @@ -92,7 +92,7 @@ class CreateCustomerForm(forms.Form): ) date_of_birth = forms.DateTimeField( label=_('Date of Birth'), - input_formats=[settings.API_DATETIMEFORMAT], + input_formats=[settings.API_DATE_TIME_FORMAT], widget=forms.DateTimeInput( attrs={ 'placeholder': PLACEHOLDER, @@ -204,7 +204,7 @@ class CreateCustomerForm(forms.Form): ) last_ok_date = forms.DateTimeField( label=_('Last OK Date'), - input_formats=[settings.API_DATETIMEFORMAT], + input_formats=[settings.API_DATE_TIME_FORMAT], widget=forms.DateTimeInput( attrs={ 'placeholder': PLACEHOLDER, @@ -221,14 +221,14 @@ class CreateCustomerForm(forms.Form): def clean_face_image_date(self): data = self.cleaned_data['face_image_date'] if data: - return data.strftime(settings.API_DATETIMEFORMAT) + return data.strftime(settings.API_DATE_TIME_FORMAT) else: return None def clean_date_of_birth(self): data = self.cleaned_data['date_of_birth'] if data: - return data.strftime(settings.API_DATETIMEFORMAT) + return data.strftime(settings.API_DATE_TIME_FORMAT) else: return None diff --git a/apimanager/customers/views.py b/apimanager/customers/views.py index 0e0b843..ca4ad3f 100644 --- a/apimanager/customers/views.py +++ b/apimanager/customers/views.py @@ -38,7 +38,7 @@ class CreateView(LoginRequiredMixin, FormView): except Exception as err: messages.error(self.request, err) fields['last_ok_date'].initial =\ - datetime.datetime.now().strftime(settings.API_DATETIMEFORMAT) + datetime.datetime.now().strftime(settings.API_DATE_TIME_FORMAT) return form def form_valid(self, form): @@ -71,7 +71,7 @@ class CreateView(LoginRequiredMixin, FormView): 'employment_status': data['employment_status'], 'kyc_status': data['kyc_status'], 'last_ok_date': - data['last_ok_date'].strftime(settings.API_DATETIMEFORMAT), + data['last_ok_date'].strftime(settings.API_DATE_TIME_FORMAT), } try: result = self.api.post(urlpath, payload=payload) diff --git a/apimanager/entitlementrequests/views.py b/apimanager/entitlementrequests/views.py index 89fe120..8662014 100644 --- a/apimanager/entitlementrequests/views.py +++ b/apimanager/entitlementrequests/views.py @@ -24,7 +24,7 @@ class IndexView(LoginRequiredMixin, TemplateView): """Scrubs data in the given entitlement requests to adher to certain formats""" for entitlement_request in entitlement_requests: entitlement_request['created'] = datetime.strptime( - entitlement_request['created'], settings.API_DATETIMEFORMAT) + entitlement_request['created'], settings.API_DATE_TIME_FORMAT) return entitlement_requests def get_context_data(self, **kwargs): diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py index 353c542..1d086bb 100644 --- a/apimanager/metrics/forms.py +++ b/apimanager/metrics/forms.py @@ -13,7 +13,7 @@ from django.utils.translation import ugettext_lazy as _ from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput from apimanager.settings import API_MANAGER_DATE_FORMAT -API_DATEFORMAT_PLACEHOLDER = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" +API_DATE_FORMAT_PLACEHOLDER = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" FORM_CONTROL = 'form-control' FROM_DATE = 'From Date' TO_DATE = 'To Date' @@ -21,10 +21,10 @@ TO_DATE = 'To Date' class MetricsForm(forms.Form): from_date = forms.DateTimeField( label=_(FROM_DATE), - input_formats=[settings.API_DATEFORMAT], + input_formats=[settings.API_DATE_FORMAT], widget=forms.DateTimeInput( attrs={ - 'placeholder': API_DATEFORMAT_PLACEHOLDER, + 'placeholder': API_DATE_FORMAT_PLACEHOLDER, 'class': FORM_CONTROL, } ), @@ -33,10 +33,10 @@ class MetricsForm(forms.Form): ) to_date = forms.DateTimeField( label=_(TO_DATE), - input_formats=[settings.API_DATEFORMAT], + input_formats=[settings.API_DATE_FORMAT], widget=forms.DateTimeInput( attrs={ - 'placeholder': API_DATEFORMAT_PLACEHOLDER, + 'placeholder': API_DATE_FORMAT_PLACEHOLDER, 'class': FORM_CONTROL, } ), @@ -176,10 +176,10 @@ class ConnectorMetricsForm(MetricsForm): # override from_date until API returns values without given date from_date = forms.DateTimeField( label=_(FROM_DATE), - input_formats=[settings.API_DATEFORMAT], + input_formats=[settings.API_DATE_FORMAT], widget=forms.DateTimeInput( attrs={ - 'placeholder': API_DATEFORMAT_PLACEHOLDER, + 'placeholder': API_DATE_FORMAT_PLACEHOLDER, 'class': FORM_CONTROL, } ), diff --git a/apimanager/metrics/views.py b/apimanager/metrics/views.py index d9496a4..1cd506c 100644 --- a/apimanager/metrics/views.py +++ b/apimanager/metrics/views.py @@ -11,7 +11,7 @@ from enum import Enum from django.conf import settings from apimanager import local_settings -from apimanager.settings import API_HOST, EXCLUDE_APPS, EXCLUDE_FUNCTIONS, EXCLUDE_URL_PATTERN, API_EXPLORER_APP_NAME, API_DATEFORMAT, API_DATETIMEFORMAT +from apimanager.settings import API_HOST, EXCLUDE_APPS, EXCLUDE_FUNCTIONS, EXCLUDE_URL_PATTERN, API_EXPLORER_APP_NAME, API_DATE_FORMAT, API_DATE_TIME_FORMAT from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import TemplateView @@ -112,7 +112,7 @@ class MetricsView(LoginRequiredMixin, TemplateView): """ for metric in metrics: metric['date'] = datetime.datetime.strptime( - metric['date'], settings.API_DATETIMEFORMAT) + metric['date'], settings.API_DATE_TIME_FORMAT) return metrics def to_api(self, cleaned_data): @@ -127,7 +127,7 @@ class MetricsView(LoginRequiredMixin, TemplateView): # Maybe we should define the API format as Django format to not # have to convert in places like this? if value.__class__.__name__ == 'datetime': - value = value.strftime(settings.API_DATEFORMAT) + value = value.strftime(settings.API_DATE_FORMAT) if value: # API does not like quoted data params.append('{}={}'.format(name, value)) @@ -224,7 +224,7 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): """ for metric in metrics: metric['date'] = datetime.datetime.strptime( - metric['date'], API_DATEFORMAT) + metric['date'], API_DATE_FORMAT) return metrics def to_api(self, cleaned_data): @@ -239,7 +239,7 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): # Maybe we should define the API format as Django format to not # have to convert in places like this? if value.__class__.__name__ == 'datetime': - value = value.strftime(settings.API_DATEFORMAT) + value = value.strftime(settings.API_DATE_FORMAT) if value: # API does not like quoted data params.append('{}={}'.format(name, value)) @@ -266,17 +266,18 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): else: urlpath = urlpath + '?from_date={}&to_date={}'.format(from_date, to_date) cache_key = get_cache_key_for_current_call(self.request, urlpath) - apicaches = None + #api_cache = None + api_cache = None try: - apicaches = cache.get(cache_key) + api_cache = cache.get(cache_key) except Exception as err: - apicaches = None - if apicaches is not None: - metrics = apicaches + api_cache = None + if api_cache is not None: + metrics = api_cache else: api = API(self.request.session.get('obp')) metrics = api.get(urlpath) - apicaches = cache.set(cache_key, metrics) + api_cache = cache.set(cache_key, metrics) LOGGER.warning('{0}: {1}'.format(CACHE_SETTING_URL_MSG, urlpath)) LOGGER.warning('{0}: {1}'.format(CACHE_SETTING_KEY_MSG, cache_key)) @@ -293,8 +294,8 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): to_date, urlpath): api_calls_total = metrics[0]["count"] average_response_time = metrics[0]["average_response_time"] - to_date = datetime.datetime.strptime(to_date, API_DATEFORMAT) - from_date = datetime.datetime.strptime(from_date, API_DATEFORMAT) + to_date = datetime.datetime.strptime(to_date, API_DATE_FORMAT) + from_date = datetime.datetime.strptime(from_date, API_DATE_FORMAT) number_of_days = abs((to_date - from_date).days) # if number_of_days= 0, then it means calls_per_hour average_calls_per_day = api_calls_total if (number_of_days == 0) else api_calls_total / number_of_days @@ -341,12 +342,12 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): def get_total_number_of_apps(self, cleaned_data, from_date, to_date): apps = [] - from_date = datetime.datetime.strptime(from_date, API_DATEFORMAT) - to_date = datetime.datetime.strptime(to_date, API_DATEFORMAT) + from_date = datetime.datetime.strptime(from_date, API_DATE_FORMAT) + to_date = datetime.datetime.strptime(to_date, API_DATE_FORMAT) apps_list = self.get_all_consumers() for app in apps_list: - app_created_date = datetime.datetime.strptime(app["created"], API_DATETIMEFORMAT) + app_created_date = datetime.datetime.strptime(app["created"], API_DATE_TIME_FORMAT) if app_created_date < from_date and app_created_date > to_date: apps_list.remove(app) @@ -382,13 +383,13 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): urlpath = '/management/consumers' api = API(self.request.session.get('obp')) cache_key = get_cache_key_for_current_call(self.request, urlpath) - apicaches = None + api_cache = None try: - apicaches = cache.get(cache_key) + api_cache = cache.get(cache_key) except Exception as err: - apicaches = None - if apicaches is not None: - apps_list = apicaches + api_cache = None + if api_cache is not None: + apps_list = api_cache else: try: apps = api.get(urlpath) @@ -409,8 +410,8 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): """ # we need to convert string to datetime object, then we can calculate the date - from_datetime_object = datetime.datetime.strptime(from_date_string, API_DATEFORMAT) - to_datetime_object = datetime.datetime.strptime(to_date_string , API_DATEFORMAT) + from_datetime_object = datetime.datetime.strptime(from_date_string, API_DATE_FORMAT) + to_datetime_object = datetime.datetime.strptime(to_date_string , API_DATE_FORMAT) time_delta_in_loop = from_datetime_object + timedelta(**delta) result_list = [] @@ -419,8 +420,8 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): while time_delta_in_loop <= to_datetime_object: try: # here we need to first convert datetime object to String - form_date= from_datetime_object.strftime(API_DATEFORMAT) - to_date= time_delta_in_loop.strftime(API_DATEFORMAT) + form_date= from_datetime_object.strftime(API_DATE_FORMAT) + to_date= time_delta_in_loop.strftime(API_DATE_FORMAT) aggregate_metrics = self.get_aggregate_metrics(form_date, to_date, is_included_obp_apps) result = aggregate_metrics[0] result_list_pure.append(result) @@ -748,7 +749,7 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): if (web_page_type == SummaryType.QUARTERLY): # for one quarter, the from_date is 90 days ago. - from_date = (datetime.datetime.strptime(to_date, API_DATEFORMAT) - timedelta(90)).strftime(API_DATEFORMAT) + from_date = (datetime.datetime.strptime(to_date, API_DATE_FORMAT) - timedelta(90)).strftime(API_DATE_FORMAT) calls_per_month_list, calls_per_month, month_list = self.calls_per_month(is_included_obp_apps, from_date, to_date, exclude_app_names) per_month_chart = self.plot_line_chart(calls_per_month, month_list, 'month') @@ -802,8 +803,8 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): 'user_email_cansearchwarehouse': user_email_cansearchwarehouse, 'number_of_users_with_cansearchwarehouse': number_of_users_with_cansearchwarehouse, 'api_host_name': api_host_name, - 'from_date': (datetime.datetime.strptime(from_date, API_DATEFORMAT)).strftime('%Y-%m-%d'), - 'to_date': (datetime.datetime.strptime(to_date, API_DATEFORMAT)).strftime('%Y-%m-%d'), + 'from_date': (datetime.datetime.strptime(from_date, API_DATE_FORMAT)).strftime('%Y-%m-%d'), + 'to_date': (datetime.datetime.strptime(to_date, API_DATE_FORMAT)).strftime('%Y-%m-%d'), 'top_apis': top_apis, 'top_apis_bar_chart': top_apis_bar_chart, 'top_consumers_bar_chart': top_consumers_bar_chart, @@ -840,7 +841,7 @@ class MonthlyMetricsSummaryView(LoginRequiredMixin, TemplateView): if (web_page_type == SummaryType.QUARTERLY): # for one quarter, the from_date is 90 days ago. - from_date = (datetime.datetime.strptime(to_date, API_DATEFORMAT) - timedelta(90)).strftime(API_DATEFORMAT) + from_date = (datetime.datetime.strptime(to_date, API_DATE_FORMAT) - timedelta(90)).strftime(API_DATE_FORMAT) calls_per_month_list, calls_per_month, month_list = self.calls_per_month(is_included_obp_apps, from_date, to_date, exclude_app_names) per_month_chart = self.plot_line_chart(calls_per_month, month_list, 'month')