From d2c3d89659a7546ba940d45024d9b7a0ba79ce5b Mon Sep 17 00:00:00 2001
From: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
Date: Fri, 22 Oct 2021 14:20:18 -0300
Subject: [PATCH] spiders: ukraine, add more doc and OCDS related fields

Signed-off-by: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
---
 kingfisher_scrapy/spiders/ukraine.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/kingfisher_scrapy/spiders/ukraine.py b/kingfisher_scrapy/spiders/ukraine.py
index 406d509c..605332d6 100644
--- a/kingfisher_scrapy/spiders/ukraine.py
+++ b/kingfisher_scrapy/spiders/ukraine.py
@@ -1,8 +1,8 @@
 import scrapy
 
 from kingfisher_scrapy.base_spider import SimpleSpider
-from kingfisher_scrapy.util import handle_http_error, join, components, parameters, replace_parameters, \
-    append_path_components
+from kingfisher_scrapy.util import (append_path_components, components, handle_http_error, join, parameters,
+                                    replace_parameters)
 
 
 class Ukraine(SimpleSpider):
@@ -46,9 +46,14 @@ def parse(self, response):
             data['data']['ocid'] = data['data']['id']
             # the data looks like:
             # {
-            #   "data": { tender fields }
+            #   "data": {
+            #     "id": "..",
+            #     "date": "...",
+            #     "tenderID": "",
+            #     tender fields
+            #    }
             # }
-            data = {'tender': data['data']}
+            data = {'tender': data['data'], 'date': data['data']['date'], 'id': data['data']['id']}
         else:
             # the Ukraine publication doesn't have an ocid, but the tender_id field in the contract JSON
             # can be used as one, as it is the same as tender.id in the tender JSON and therefore can be used to link
@@ -56,7 +61,11 @@ def parse(self, response):
             data['data']['ocid'] = data['data']['tender_id']
             # the data looks like:
             # {
-            #   "data": { contract fields }
+            #   "data": {
+            #     "id": "",
+            #     "contractID": "",
+            #     contract fields
+            #    }
             # }
-            data = {'contracts': [data['data']]}
+            data = {'contracts': [data['data']], 'id': data['data']['id']}
         yield self.build_file_from_response(response, data=data, data_type=self.data_type)