Merge pull request #45 from Scandie/a565404995871133_refactoring_api

A565404995871133 refactoring api

.travis.yml

@@ -18,7 +18,7 @@ cache:
   directories:
     - eggs
 before_install:
-  - pip install setuptools==7.0
+  - pip install setuptools==38.5.0
   - python2 bootstrap.py
 install:
   - bin/buildout -N

buildout.cfg

@@ -20,5 +20,5 @@ eggs =
 
 
 [sources]
-openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git branch=a499878011598746_separating_awarding
+openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git branch=ea_core_master
 openprocurement.auctions.core = git https://github.com/openprocurement/openprocurement.auctions.core.git branch=a499878011598746_separating_awarding

openprocurement/auctions/flash/models.py

@@ -4,11 +4,11 @@
     timedelta,
     time
 )
-from pyramid.security import Allow
+
 from couchdb_schematics.document import SchematicsDocument
+from pyramid.security import Allow
 from schematics.exceptions import ValidationError
 from schematics.transforms import (
-    whitelist,
     blacklist
 )
 from schematics.types import (
@@ -24,25 +24,26 @@
     DictType,
 )
 from schematics.types.serializable import serializable
-from barbecue import vnmax
 from zope.interface import implementer
+
+from barbecue import vnmax
+
+from openprocurement.api.constants import (
+    SANDBOX_MODE,
+    AUCTIONS_COMPLAINT_STAND_STILL_TIME
+)
+from openprocurement.api.interfaces import (
+    IAwardingNextCheck
+)
 from openprocurement.api.models import (
     IsoDateTimeType,
     ListType,
     Model,
     Value,
     PeriodEndRequired,
-    SANDBOX_MODE,
-    Organization,
-    Parameter,
-    validate_parameters_uniq,
-    LotValue,
-    Bid,
     Revision,
-    Question,
     Cancellation,
     Feature,
-    Lot,
     schematics_embedded_role,
     schematics_default_role,
     validate_features_uniq,
@@ -53,12 +54,10 @@
     get_now,
     ComplaintModelType
 )
-from openprocurement.api.interfaces import (
-    IAwardingNextCheck
-)
 from openprocurement.api.utils import (
     get_request_from_root
 )
+
 from openprocurement.auctions.core.models import (
     IAuction,
     get_auction,
@@ -68,8 +67,15 @@
     flash_auction_roles,
     flash_bid_roles,
     calc_auction_end_time,
-    COMPLAINT_STAND_STILL_TIME
+    Parameter,
+    Organization,
+    validate_parameters_uniq,
+    LotValue,
+    Bid,
+    Question,
+    Lot,
 )
+
 from openprocurement.auctions.core.plugins.awarding.v1.models import (
     Award
 )
@@ -475,15 +481,15 @@ def next_check(self):
             from openprocurement.api.utils import calculate_business_date
             for complaint in self.complaints:
                 if complaint.status == 'claim' and complaint.dateSubmitted:
-                    checks.append(calculate_business_date(complaint.dateSubmitted, COMPLAINT_STAND_STILL_TIME, self))
+                    checks.append(calculate_business_date(complaint.dateSubmitted, AUCTIONS_COMPLAINT_STAND_STILL_TIME, self))
                 elif complaint.status == 'answered' and complaint.dateAnswered:
-                    checks.append(calculate_business_date(complaint.dateAnswered, COMPLAINT_STAND_STILL_TIME, self))
+                    checks.append(calculate_business_date(complaint.dateAnswered, AUCTIONS_COMPLAINT_STAND_STILL_TIME, self))
             for award in self.awards:
                 for complaint in award.complaints:
                     if complaint.status == 'claim' and complaint.dateSubmitted:
-                        checks.append(calculate_business_date(complaint.dateSubmitted, COMPLAINT_STAND_STILL_TIME, self))
+                        checks.append(calculate_business_date(complaint.dateSubmitted, AUCTIONS_COMPLAINT_STAND_STILL_TIME, self))
                     elif complaint.status == 'answered' and complaint.dateAnswered:
-                        checks.append(calculate_business_date(complaint.dateAnswered, COMPLAINT_STAND_STILL_TIME, self))
+                        checks.append(calculate_business_date(complaint.dateAnswered, AUCTIONS_COMPLAINT_STAND_STILL_TIME, self))
         return min(checks).isoformat() if checks else None
 
     def validate_procurementMethodDetails(self, *args, **kw):

openprocurement/auctions/flash/tests/base.py

@@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-
-import unittest
-import webtest
 import os
+import webtest
+from base64 import b64encode
 from copy import deepcopy
 from datetime import datetime, timedelta
-from uuid import uuid4
 from requests.models import Response
-from base64 import b64encode
 from urllib import urlencode
+from uuid import uuid4
+
+from openprocurement.api.constants import VERSION, SESSION, SANDBOX_MODE
+from openprocurement.api.utils import apply_data_patch
 
-from openprocurement.api.models import SANDBOX_MODE
-from openprocurement.api.utils import VERSION, SESSION, apply_data_patch
-from openprocurement.api.design import sync_design
 from openprocurement.auctions.core.tests.base import BaseWebTest as CoreBaseWebTest
 
 

openprocurement/auctions/flash/tests/blanks/bidder_blanks.py

@@ -31,7 +31,7 @@ def create_auction_bidder_invalid(self):
     self.assertEqual(response.content_type, 'application/json')
     self.assertEqual(response.json['status'], 'error')
     self.assertEqual(response.json['errors'], [
-        {u'description': u'Expecting value: line 1 column 1 (char 0)',
+        {u'description': u'No JSON object could be decoded',
             u'location': u'body', u'name': u'data'}
     ])
 

openprocurement/auctions/flash/tests/blanks/tender_blanks.py

@@ -2,7 +2,8 @@
 from copy import deepcopy
 from datetime import timedelta
 
-from openprocurement.api.models import get_now, SANDBOX_MODE
+from openprocurement.api.models import get_now
+from openprocurement.api.constants import SANDBOX_MODE
 
 from openprocurement.auctions.flash.models import Auction
 from openprocurement.auctions.flash.tests.base import test_auction_data, test_organization
@@ -61,7 +62,7 @@ def create_auction_invalid(self):
     self.assertEqual(response.content_type, 'application/json')
     self.assertEqual(response.json['status'], 'error')
     self.assertEqual(response.json['errors'], [
-        {u'description': u'Expecting value: line 1 column 1 (char 0)',
+        {u'description': u'No JSON object could be decoded',
             u'location': u'body', u'name': u'data'}
     ])
 

openprocurement/auctions/flash/views/auction.py

@@ -2,13 +2,14 @@
 from openprocurement.api.utils import (
     json_view,
     context_unpack,
-    cleanup_bids_for_cancelled_lots,
-    APIResource,
+    APIResource
 )
+
 from openprocurement.auctions.core.utils import (
     save_auction,
     apply_patch,
-    opresource
+    opresource,
+    cleanup_bids_for_cancelled_lots
 )
 from openprocurement.auctions.core.validation import (
     validate_auction_auction_data,

openprocurement/auctions/flash/views/bid_document.py

@@ -9,15 +9,18 @@
     APIResource,
 )
 from openprocurement.api.validation import (
-    validate_file_update,
-    validate_file_upload,
     validate_patch_document_data,
 )
+
 from openprocurement.auctions.core.utils import (
     save_auction,
     apply_patch,
     opresource,
 )
+from openprocurement.auctions.core.validation import (
+    validate_file_update,
+    validate_file_upload,
+)
 
 
 @opresource(name='belowThreshold:Auction Bid Documents',

openprocurement/auctions/flash/views/cancellation_document.py

@@ -8,15 +8,18 @@
     APIResource,
 )
 from openprocurement.api.validation import (
-    validate_file_update,
-    validate_file_upload,
-    validate_patch_document_data,
+    validate_patch_document_data
 )
+
 from openprocurement.auctions.core.utils import (
     save_auction,
     apply_patch,
     opresource,
 )
+from openprocurement.auctions.core.validation import (
+    validate_file_update,
+    validate_file_upload,
+)
 
 
 @opresource(name='belowThreshold:Auction Cancellation Documents',

openprocurement/auctions/flash/views/complaint_document.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from openprocurement.api.constants import STATUS4ROLE
 from openprocurement.api.utils import (
     get_file,
     upload_file,
@@ -9,15 +8,19 @@
     APIResource,
 )
 from openprocurement.api.validation import (
-    validate_file_update,
-    validate_file_upload,
     validate_patch_document_data,
 )
+
+from openprocurement.auctions.core.constants import STATUS4ROLE
 from openprocurement.auctions.core.utils import (
     save_auction,
     apply_patch,
     opresource,
 )
+from openprocurement.auctions.core.validation import (
+    validate_file_update,
+    validate_file_upload,
+)
 
 
 @opresource(name='belowThreshold:Auction Complaint Documents',

openprocurement/auctions/flash/views/tender_document.py

@@ -8,15 +8,18 @@
     APIResource,
 )
 from openprocurement.api.validation import (
-    validate_file_update,
-    validate_file_upload,
     validate_patch_document_data,
 )
+
 from openprocurement.auctions.core.utils import (
     save_auction,
     apply_patch,
     opresource,
 )
+from openprocurement.auctions.core.validation import (
+    validate_file_update,
+    validate_file_upload,
+)
 
 
 @opresource(name='belowThreshold:Auction Documents',

versions.cfg

@@ -6,13 +6,13 @@ MarkupSafe = 0.23
 PasteDeploy = 1.5.2
 Pygments = 2.0.2
 Sphinx = 1.3.1
-WebOb = 1.6.1
+WebOb = 1.7
 WebTest = 2.0.20
 docutils = 0.12
 jsonpointer = 1.9
 nose = 1.3.7
 py = 1.4.26
-pyramid = 1.7
+pyramid = 1.9
 python-coveralls = 2.5.0
 repoze.lru = 0.6
 translationstring = 1.3
@@ -48,7 +48,7 @@ chaussette = 1.2
 
 # Required by:
 # openprocurement.api==0.8.1
-cornice = 1.2.0.dev0
+cornice = 3.1.0
 
 # Required by:
 # openprocurement.api==0.8.1