Merge branch 'document_service'

setup.py

@@ -44,7 +44,7 @@
 }
 
 setup(name='openprocurement.api',
-      version='2.3.29',
+      version='2.3.30',
       description='openprocurement.api',
       long_description=README,
       classifiers=[

src/openprocurement/api/migration.py

@@ -696,6 +696,10 @@ def __init__(self, registry):
     root = Root(request)
     for i in results:
         doc = i.doc
+        if 'documents' not in doc and 'awards' not in doc and 'bids' not in doc and 'questions' not in doc and 'complaints' not in doc and 'cancellations' not in doc and 'contracts' not in doc:
+            continue
+        if 'documents' in doc and any([i.get('url', '').startswith(registry.docservice_url) for i in doc['documents']]):
+            continue
         model = registry.tender_procurementMethodTypes.get(doc.get('procurementMethodType', 'belowThreshold'))
         if model:
             try:
@@ -705,6 +709,7 @@ def __init__(self, registry):
             except:
                 LOGGER.error("Failed migration of tender {} to schema 23.".format(doc.id), extra={'MESSAGE_ID': 'migrate_data_failed', 'TENDER_ID': doc.id})
             else:
+                doc['dateModified'] = get_now().isoformat()
                 docs.append(doc)
         if len(docs) >= 2 ** 7:
             result = registry.db.update(docs)

src/openprocurement/api/tests/base.py

@@ -439,6 +439,19 @@ def request(method, url, **kwargs):
         self._srequest = SESSION.request
         SESSION.request = request
 
+    def setUpBadDS(self):
+        self.app.app.registry.docservice_url = 'http://localhost'
+        def request(method, url, **kwargs):
+            response = Response()
+            response.status_code = 403
+            response.encoding = 'application/json'
+            response._content = '"Unauthorized: upload_view failed permission check"'
+            response.reason = '403 Forbidden'
+            return response
+
+        self._srequest = SESSION.request
+        SESSION.request = request
+
     def generate_docservice_url(self):
         uuid = uuid4().hex
         key = self.app.app.registry.docservice_key

src/openprocurement/api/tests/document.py

@@ -383,6 +383,22 @@ def test_patch_tender_document(self):
 class TenderDocumentWithDSResourceTest(TenderDocumentResourceTest):
     docservice = True
 
+    def test_create_tender_document_error(self):
+        self.tearDownDS()
+        response = self.app.post('/tenders/{}/documents'.format(self.tender_id),
+                                 upload_files=[('file', u'укр.doc', 'content')],
+                                 status=422)
+        self.assertEqual(response.status, '422 Unprocessable Entity')
+        self.assertEqual(response.content_type, 'application/json')
+        self.assertEqual(response.json['errors'][0]["description"], "Can't upload document to document service.")
+        self.setUpBadDS()
+        response = self.app.post('/tenders/{}/documents'.format(self.tender_id),
+                                 upload_files=[('file', u'укр.doc', 'content')],
+                                 status=422)
+        self.assertEqual(response.status, '422 Unprocessable Entity')
+        self.assertEqual(response.content_type, 'application/json')
+        self.assertEqual(response.json['errors'][0]["description"], "Can't upload document to document service.")
+
     def test_create_tender_document_json_invalid(self):
         response = self.app.post_json('/tenders/{}/documents'.format(self.tender_id),
             {'data': {

src/openprocurement/api/utils.py

@@ -182,15 +182,18 @@ def upload_file(request, blacklisted_fields=DOCUMENT_BLACKLISTED_FIELDS):
                                 auth=(request.registry.docservice_username, request.registry.docservice_password)
                                 )
                 json_data = r.json()
-            except:
-                in_file.seek(0)
+            except Exception, e:
+                LOGGER.warning("Raised exception '{}' on uploading document to document service': {}.".format(type(e), e),
+                               extra=context_unpack(request, {'MESSAGE_ID': 'document_service_exception'}, {'file_size': in_file.tell()}))
             else:
                 if r.status_code == 200 and json_data.get('data', {}).get('url'):
                     doc_url = json_data['data']['url']
                     doc_hash = json_data['data']['hash']
                     break
                 else:
-                    in_file.seek(0)
+                    LOGGER.warning("Error {} on uploading document to document service '{}': {}".format(r.status_code, url, r.text),
+                                   extra=context_unpack(request, {'MESSAGE_ID': 'document_service_error'}, {'ERROR_STATUS': r.status_code, 'file_size': in_file.tell()}))
+            in_file.seek(0)
             index -= 1
         else:
             request.errors.add('body', 'data', "Can't upload document to document service.")