Merge branch 'a138304743419559_filter_doc_type'

src/openprocurement/api/tests/tender.py

@@ -7,6 +7,7 @@
 from openprocurement.api.utils import ROUTE_PREFIX
 from openprocurement.api.models import Tender, get_now
 from openprocurement.api.tests.base import test_tender_data, test_organization, BaseWebTest, BaseTenderWebTest
+from uuid import uuid4
 
 
 class TenderTest(BaseWebTest):
@@ -1053,6 +1054,13 @@ def test_tender_not_found(self):
             {u'description': u'Not Found', u'location': u'url', u'name': u'tender_id'}
         ])
 
+        # put custom document object into database to check tender construction on non-Tender data
+        data = {'contract': 'test', '_id': uuid4().hex}
+        self.db.save(data)
+
+        response = self.app.get('/tenders/{}'.format(data['_id']), status=404)
+        self.assertEqual(response.status, '404 Not Found')
+
 
     def test_guarantee(self):
         response = self.app.post_json('/tenders', {'data': test_tender_data})

src/openprocurement/api/utils.py

@@ -691,7 +691,7 @@ def context_unpack(request, msg, params=None):
 def extract_tender_adapter(request, tender_id):
     db = request.registry.db
     doc = db.get(tender_id)
-    if doc is None:
+    if doc is None or doc.get('doc_type') != 'Tender':
         request.errors.add('url', 'tender_id', 'Not Found')
         request.errors.status = 404
         raise error_handler(request.errors)