- added: get tenderData from tenderUaId

@@ -4,6 +4,7 @@ import copy
 import urllib
 import urllib3
 import string
+import requests
 
 import dateutil.parser
 from iso8601 import parse_date
@@ -13,6 +14,7 @@ import pytz
 
 TZ = pytz.timezone('Europe/Kiev')
 
+
 def get_library():
     return BuiltIn().get_library_instance('Selenium2Library')
 
@@ -184,22 +186,23 @@ def procuring_entity_name(tender_data):
     tender_data.data.procuringEntity.identifier['legalName'] = u"ТОВ \"ПлейТендер\""
     tender_data.data.procuringEntity.identifier['legalName_en'] = u"TOV \"playtender\""
     if 'address' in tender_data.data.procuringEntity:
-         tender_data.data.procuringEntity.address['region'] = u"м. Київ"
-         tender_data.data.procuringEntity.address['postalCode'] = u"123123"
-         tender_data.data.procuringEntity.address['locality'] = u"Київ"
-         tender_data.data.procuringEntity.address['streetAddress'] = u"address"
+        tender_data.data.procuringEntity.address['region'] = u"м. Київ"
+        tender_data.data.procuringEntity.address['postalCode'] = u"123123"
+        tender_data.data.procuringEntity.address['locality'] = u"Київ"
+        tender_data.data.procuringEntity.address['streetAddress'] = u"address"
     if 'contactPoint' in tender_data.data.procuringEntity:
-         tender_data.data.procuringEntity.contactPoint['name'] = u"Test ЗамовникОборони"
-         tender_data.data.procuringEntity.contactPoint['name_en'] = u"Test"
-         tender_data.data.procuringEntity.contactPoint['email'] = u"chuzhin@mail.ua"
-         tender_data.data.procuringEntity.contactPoint['telephone'] = u"+3801111111111"
-         tender_data.data.procuringEntity.contactPoint['url'] = u"http://playtender.com.ua"
+        tender_data.data.procuringEntity.contactPoint['name'] = u"Test ЗамовникОборони"
+        tender_data.data.procuringEntity.contactPoint['name_en'] = u"Test"
+        tender_data.data.procuringEntity.contactPoint['email'] = u"chuzhin@mail.ua"
+        tender_data.data.procuringEntity.contactPoint['telephone'] = u"+3801111111111"
+        tender_data.data.procuringEntity.contactPoint['url'] = u"http://playtender.com.ua"
     if 'buyers' in tender_data.data:
         tender_data.data.buyers[0]['name'] = u"ТОВ \"ПлейТендер\""
         tender_data.data.buyers[0].identifier['id'] = u"1234567890-playtender"
         tender_data.data.buyers[0].identifier['legalName'] = u"ТОВ \"ПлейТендер\""
     return tender_data
 
+
 # prepare data
 def prepare_procuring_entity_data(data):
     try:
@@ -254,7 +257,8 @@ def generate_dictionary_from_field_path_and_value(path, value):
         value = generate_dictionary_from_field_path_and_value('.'.join(path_keys_list), value)
         indexRegex = re.compile(r'(\[(\d+)\]$)')
         matchObj = indexRegex.search(key)
-        print matchObj
+        print
+        matchObj
         if matchObj:
             key = indexRegex.sub('', key)
             value['list_index'] = matchObj.group(2)
@@ -364,23 +368,29 @@ def convert_date_to_string_contr(date):
     date = date.strftime("%d.%m.%Y %H:%M:%S")
     return date
 
+
 def get_value_minimalStepPercentage(value):
     value = value / 100
     return value
 
+
 def set_value_minimalStepPercentage(value):
     value = value * 100
     return value
 
+
 def convert_esco__float_to_string(number):
     return '{0:.5f}'.format(float(number))
 
+
 def convert_string_to_float(number):
     return float(number)
 
+
 def download_file(url, file_name, output_dir):
     urllib.urlretrieve(url, ('{}/{}'.format(output_dir, file_name)))
 
+
 def parse_complaintPeriod_date(date_string):
     date_str = datetime.strptime(date_string, "%d.%m.%Y %H:%M")
     date = datetime(date_str.year, date_str.month, date_str.day, date_str.hour, date_str.minute, date_str.second,
@@ -388,13 +398,15 @@ def parse_complaintPeriod_date(date_string):
     date = TZ.localize(date).isoformat()
     return date
 
+
 def parse_deliveryPeriod_date1(date):
     date = dateutil.parser.parse(date)
     date = date.strftime("%d.%m.%Y")
     return date
 
+
 def parse_deliveryPeriod_date(date_string):
-#    date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
+    #    date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
     if '+03' in date_string:
         date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
     else:
@@ -403,9 +415,39 @@ def parse_deliveryPeriod_date(date_string):
     date = date.strftime("%d.%m.%Y")
     return date
 
+
 def split_joinvalue(str_value):
     str_value = str_value.split()
     str_value = ''.join(str_value)
     print(str_value)
     str_value.replace(" ", "")
     return str_value
+
+
+def doGetRequest(url, data):
+    r = requests.get(url, params=data)
+    response = {}
+    response['status_code'] = r.status_code
+    response['reason'] = r.reason
+    response['content'] = r.content
+    response['json'] = r.json()
+    return response
+
+
+def getTenderDataByTenderUaId(apiBaseUrl, tenderUaId):
+    requestData = {"opt_fields": "tenderID", "descending": "1", "mode": "_all_"}
+    updatesResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders", data=requestData)
+    if "json" not in updatesResponse:
+        print('json key not found')
+        return {}
+    tenderId = None
+    print("lastTenders:")
+    print(updatesResponse['json']['data'])
+    for item in updatesResponse['json']['data']:
+        if tenderUaId == item['tenderID']:
+            tenderId = item['id']
+            break
+    if tenderId is None:
+        return {}
+    tenderDataResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders/" + tenderId, data={})
+    return tenderDataResponse['json']