From 14f25e331802920b70e2ba0d6393bba3f8ae09ae Mon Sep 17 00:00:00 2001
From: Reena  Aheer <ranireena68@gmail.com>
Date: Wed, 3 May 2023 15:29:26 +0200
Subject: [PATCH] Improvement in Bank Attribute Endpoint

---
 apimanager/banks/forms.py                    | 35 ++++++--------------
 apimanager/banks/templates/banks/update.html | 13 ++++----
 apimanager/banks/views.py                    |  2 --
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/apimanager/banks/forms.py b/apimanager/banks/forms.py
index 6fb1898..327c853 100644
--- a/apimanager/banks/forms.py
+++ b/apimanager/banks/forms.py
@@ -10,6 +10,13 @@ import random
 
 class CreateBankForm(forms.Form):
 
+    ATTRIBUTE_TYPE = (
+        ('', _('Any')),
+        ('STRING', 'STRING'),
+        ('INTEGER', 'INTEGER'),
+        ('DOUBLE', 'DOUBLE'),
+        ('DATE_WITH_DAY', 'DATE_WITH_DAY'),
+    )
     bank_id = forms.CharField(
         label=_('Bank Id'),
         widget=forms.TextInput(
@@ -87,36 +94,16 @@ class CreateBankForm(forms.Form):
         required=False,
     )
 
-    type_attribute = forms.CharField(
+    type_attribute = forms.ChoiceField(
         label=_('Type'),
-        widget=forms.TextInput(
+        choices=ATTRIBUTE_TYPE,
+        widget=forms.Select(
             attrs={
-               'placeholder': _('Type'),
-               'class': 'form-control',
+               'class': 'form-control bank_attribute_type',
             }
         ),
         required=False,
     )
-    name_attribute = forms.CharField(
-        label=_('Attribute Name'),
-        widget=forms.TextInput(
-            attrs={
-               'placeholder': _('Name'),
-               'class': 'form-control',
-            }
-        ),
-        required=False,
-    )
-    value_attribute = forms.CharField(
-            label=_('Value'),
-            widget=forms.TextInput(
-                attrs={
-                   'placeholder': _('2012-04-23'),
-                   'class': 'form-control',
-                }
-            ),
-            required=False,
-        )
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('label_suffix', '')
diff --git a/apimanager/banks/templates/banks/update.html b/apimanager/banks/templates/banks/update.html
index b1d4192..177e4e0 100644
--- a/apimanager/banks/templates/banks/update.html
+++ b/apimanager/banks/templates/banks/update.html
@@ -80,30 +80,30 @@
         <div class="row">
             <h1>Bank Attributes</h1>
             <div class="col-xs-12 col-sm-3">
-                <label class="form-group">{% trans "Attribute Name" %}:</label> <br>
+                <label class="form-group">{% trans "Attribute Name" %}</label>
             </div>
             <div class="col-xs-12 col-sm-3">
-                <label class="form-group">{% trans "Attribute Type" %}:</label> <br>
+                <label class="form-group">{% trans "Attribute Type" %}</label>
             </div>
             <div class="col-xs-12 col-sm-3">
-                <label class="form-group">{% trans "Attribute Value" %}:</label> <br>
+                <label class="form-group">{% trans "Attribute Value" %}</label>
             </div>
         </div>
         <div class="runner">
             <div class="row">
                 <div class="col-xs-12 col-sm-3">
                     <div class="form-group" cols="1" rows="1">
-                        <input class="bank_attribute_name" value="Attribute Name">
+                        <input class="bank_attribute_name form-control" placeholder="ATTRIBUTE_1">
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-3">
                     <div class="form-group" cols="1" rows="1">
-                        <input class="bank_attribute_type" value="Attribute Type">
+                        {{ form.type_attribute }}
                     </div>
                 </div>
                 <div class="col-xs-6 col-sm-3">
                     <div class="form-group" cols="1" rows="1">
-                        <input class="bank_attribute_value" value="Attribute Value">
+                        <input class="bank_attribute_value form-control" placeholder="abc">
                     </div>
                 </div>
                 <div class="col-sm-6 col-sm-3">
@@ -169,7 +169,6 @@ $(document).ready(function($) {
         $('.runner button.forUpdate').attr("disabled", "disabled");
         $('.runner button.forSave').attr("disabled", "disabled");
         $('.runner button.forDelete').attr("disabled", "disabled");
-
         $.post('save/attribute', {
 			'name': name,
 			'type': type,
diff --git a/apimanager/banks/views.py b/apimanager/banks/views.py
index aca23df..c0a9514 100644
--- a/apimanager/banks/views.py
+++ b/apimanager/banks/views.py
@@ -174,7 +174,6 @@ class UpdateBanksView(LoginRequiredMixin, FormView):
 @csrf_exempt
 def bank_attribute_save(request):
     api = API(request.session.get('obp'))
-    #urlpath = '/my/api-collections'
     bank_id = request.POST.get('bank_id').strip()
     urlpath_save = '/banks/{}/attribute'.format(bank_id)
 
@@ -185,7 +184,6 @@ def bank_attribute_save(request):
         'is_active': True
     }
     result = api.post(urlpath_save, payload = payload, version=settings.API_ROOT['v510'])
-    print("result", result)
     return result