DLE-190517-Update small change for api param model

Author: Anh-Duy Le

domains/config/ConfigApiParamModel.py

@@ -25,3 +25,10 @@ def default_value(self):
     def default_value(self, val):
         self.__default_value = val
 
+    @property
+    def current_value(self):
+        return self.__current_value
+    @current_value.setter
+    def current_value(self, val):
+        self.__current_value = val
+

service/banking/exchangerate_service.py

@@ -40,11 +40,13 @@ def __init_apiUrl(self):
         return None
 
 
-    def __init_apiParamsString(self):
+    def __init_apiParamsString(self, lstParamModel):
         if self.ApiConfig1:
             lstApiParam = self.domain_factory.map_ListJsonToListDomainClass(self.ConfigApiParamModel, self.ApiConfig1.api_params)
             apiStr = ""
             for idx, para in enumerate(lstApiParam):
+                if lstParamModel and len(lstParamModel) > 0:
+                    pr = [pr for pr in lstParamModel if pr.param_name == para.param_name]
                 singleParam = "{0}={1}".format(para.param_name, para.default_value)
                 if(idx == 0):
                     apiStr = singleParam
@@ -54,8 +56,12 @@ def __init_apiParamsString(self):
         return None
 
 
-    def get_exrate_byDate(self, dateReport, baseCurrency):       
-        apiUrl = "{0}{1}{2}?{3}".format(self.__init_apiUrl(), dateReport, self.ApiConfig1.api_extension, self.__init_apiParamsString())
+    def get_exrate_byDate(self, dateReport, baseCurrency):
+        modelBaseCurParam = self.ConfigApiParamModel()    
+        modelBaseCurParam.param_name = "base"
+        modelBaseCurParam.current_value = baseCurrency
+
+        apiUrl = "{0}{1}{2}?{3}".format(self.__init_apiUrl(), dateReport, self.ApiConfig1.api_extension, self.__init_apiParamsString(list(modelBaseCurParam))
         if apiUrl:
             content = self.util_data.readJsonFromUrl(apiUrl)
             return content

unit_tests/test_service.py

@@ -48,7 +48,7 @@ def test_exrate__get_specific_exrate_byDateRange(self):
 
         fromDate = '2016-01-1'        
         toDate = '2016-12-30'
-        checkedDate = [15, 5, 10, 20]
+        checkedDate = [15, 1, 5, 10, 20, 25]
         baseCurrency = 'USD'
         toCurrency = 'VND'