From fbd241252c5bd99492e0383c34d65ece4684e071 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Wed, 25 Nov 2020 15:12:24 +0100
Subject: [PATCH 1/3] bugfix/fixed metrics endpoints wrong parameters 
 start_date--> from_date and end_date --> to_date

---
 apimanager/metrics/forms.py                    | 18 +++++++++---------
 apimanager/metrics/templates/metrics/api.html  | 12 ++++++------
 .../metrics/templates/metrics/connector.html   | 12 ++++++------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py
index 0cc79a2..7d78181 100644
--- a/apimanager/metrics/forms.py
+++ b/apimanager/metrics/forms.py
@@ -13,8 +13,8 @@ from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
 
 
 class MetricsForm(forms.Form):
-    start_date = forms.DateTimeField(
-        label='Start Date',
+    from_date = forms.DateTimeField(
+        label='From Date',
         input_formats=[settings.API_DATEFORMAT],
         widget=forms.DateTimeInput(
             attrs={
@@ -22,11 +22,11 @@ class MetricsForm(forms.Form):
                 'class': 'form-control',
             }
         ),
-        initial='1900-01-01T00:00:00.000Z',
+        initial='2020-01-01T00:00:00.000Z',
         required=False,
     )
-    end_date = forms.DateTimeField(
-        label='End Date',
+    to_date = forms.DateTimeField(
+        label='To Date',
         input_formats=[settings.API_DATEFORMAT],
         widget=forms.DateTimeInput(
             attrs={
@@ -168,9 +168,9 @@ class APIMetricsForm(MetricsForm):
 
 
 class ConnectorMetricsForm(MetricsForm):
-    # override start_date until API returns values without given date
-    start_date = forms.DateTimeField(
-        label='Start Date',
+    # override from_date until API returns values without given date
+    from_date = forms.DateTimeField(
+        label='From Date',
         input_formats=[settings.API_DATEFORMAT],
         widget=forms.DateTimeInput(
             attrs={
@@ -178,7 +178,7 @@ class ConnectorMetricsForm(MetricsForm):
                 'class': 'form-control',
             }
         ),
-        initial='1900-01-01T00:00:00.000Z',
+        initial='2020-01-01T00:00:00.000Z',
         required=True,
     )
     connector_name = forms.CharField(
diff --git a/apimanager/metrics/templates/metrics/api.html b/apimanager/metrics/templates/metrics/api.html
index 90dd6d3..1fa4c3f 100644
--- a/apimanager/metrics/templates/metrics/api.html
+++ b/apimanager/metrics/templates/metrics/api.html
@@ -18,17 +18,17 @@
 
     		<div class="row">
     			<div class="col-xs-6 col-sm-3">
-    				{% if form.start_date.errors %}<div class="alert alert-danger">{{ form.start_date.errors }}</div>{% endif %}
+    				{% if form.from_date.errors %}<div class="alert alert-danger">{{ form.from_date.errors }}</div>{% endif %}
     				<div class="form-group">
-    					{{ form.start_date.label_tag }}
-    					{{ form.start_date }}
+    					{{ form.from_date.label_tag }}
+    					{{ form.from_date }}
     				</div>
     			</div>
     			<div class="col-xs-6 col-sm-3">
-    				{% if form.end_date.errors %}<div class="alert alert-danger">{{ form.end_date.errors }}</div>{% endif %}
+    				{% if form.to_date.errors %}<div class="alert alert-danger">{{ form.to_date.errors }}</div>{% endif %}
     				<div class="form-group">
-    					{{ form.end_date.label_tag }}
-    					{{ form.end_date }}
+    					{{ form.to_date.label_tag }}
+    					{{ form.to_date }}
     				</div>
     			</div>
     			<div class="col-xs-6 col-sm-3">
diff --git a/apimanager/metrics/templates/metrics/connector.html b/apimanager/metrics/templates/metrics/connector.html
index 48d8ea0..b804dda 100644
--- a/apimanager/metrics/templates/metrics/connector.html
+++ b/apimanager/metrics/templates/metrics/connector.html
@@ -18,17 +18,17 @@
 
 			<div class="row">
 				<div class="col-xs-6 col-sm-3">
-					{% if form.start_date.errors %}<div class="alert alert-danger">{{ form.start_date.errors }}</div>{% endif %}
+					{% if form.from_date.errors %}<div class="alert alert-danger">{{ form.from_date.errors }}</div>{% endif %}
 					<div class="form-group">
-						{{ form.start_date.label_tag }}
-						{{ form.start_date }}
+						{{ form.from_date.label_tag }}
+						{{ form.from_date }}
 					</div>
 				</div>
 				<div class="col-xs-6 col-sm-3">
-					{% if form.end_date.errors %}<div class="alert alert-danger">{{ form.end_date.errors }}</div>{% endif %}
+					{% if form.to_date.errors %}<div class="alert alert-danger">{{ form.to_date.errors }}</div>{% endif %}
 					<div class="form-group">
-						{{ form.end_date.label_tag }}
-						{{ form.end_date }}
+						{{ form.to_date.label_tag }}
+						{{ form.to_date }}
 					</div>
 				</div>
 				<div class="col-xs-6 col-sm-3">

From f0d9e3bfdf3aa1f3143c32228edca498725a47b0 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Wed, 6 Jan 2021 10:42:42 +0100
Subject: [PATCH 2/3] bugfix/fixed summary-partial-function exception

---
 apimanager/metrics/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apimanager/metrics/views.py b/apimanager/metrics/views.py
index 196dea1..7c88465 100644
--- a/apimanager/metrics/views.py
+++ b/apimanager/metrics/views.py
@@ -5,6 +5,7 @@ Views of metrics app
 
 import json
 import hashlib
+import operator
 from datetime import datetime, timedelta
 from enum import Enum
 

From 3f75bbbd4e8f6292fac110c629ad4bd43a8303c5 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Thu, 7 Jan 2021 12:02:18 +0100
Subject: [PATCH 3/3] bugfix/set the order for the json.dumps

---
 apimanager/methodrouting/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apimanager/methodrouting/views.py b/apimanager/methodrouting/views.py
index 6ee3432..57986f9 100644
--- a/apimanager/methodrouting/views.py
+++ b/apimanager/methodrouting/views.py
@@ -43,7 +43,7 @@ class IndexView(LoginRequiredMixin, FormView):
             error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err))))
         else:
             for i in range(len(method_routings)):
-                method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'])
+                method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'], sort_keys=False)
 
             context.update({
                 'method_routings': method_routings,