Merge branch 'a200325340996959_bid_lotValues'

openprocurement · Oct 24, 2016 · b652ba1 · b652ba1
2 parents 66a2948 + faf6358
commit b652ba1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@
 }
 
 setup(name='openprocurement.api',
-      version='2.3.23',
+      version='2.3.29',
       description='openprocurement.api',
       long_description=README,
       classifiers=[

diff --git a/src/openprocurement/api/models.py b/src/openprocurement/api/models.py
@@ -30,6 +30,7 @@
 
 TZ = timezone(os.environ['TZ'] if 'TZ' in os.environ else 'Europe/Kiev')
 CANT_DELETE_PERIOD_START_DATE_FROM = datetime(2016, 8, 30, tzinfo=TZ)
+BID_LOTVALUES_VALIDATION_FROM = datetime(2016, 10, 24, tzinfo=TZ)
 
 
 def get_now():
@@ -669,6 +670,10 @@ def validate_lotValues(self, data, values):
             tender = data['__parent__']
             if tender.lots and not values:
                 raise ValidationError(u'This field is required.')
+            if tender.get('revisions') and tender['revisions'][0].date > BID_LOTVALUES_VALIDATION_FROM and values:
+                lots = [i.relatedLot for i in values]
+                if len(lots) != len(set(lots)):
+                    raise ValidationError(u'bids don\'t allow duplicated proposals')
 
     def validate_value(self, data, value):
         if isinstance(data['__parent__'], Model):

diff --git a/src/openprocurement/api/tests/auction.py b/src/openprocurement/api/tests/auction.py
@@ -737,7 +737,8 @@ def test_post_tender_auction(self):
         response = self.app.patch_json('/tenders/{}/auction'.format(self.tender_id), {'data': patch_data}, status=422)
         self.assertEqual(response.status, '422 Unprocessable Entity')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertEqual(response.json['errors'][0]["description"], [{u'lotValues': [{u'relatedLot': [u'relatedLot should be one of lots of bid']}]}])
+        #self.assertEqual(response.json['errors'][0]["description"], [{u'lotValues': [{u'relatedLot': [u'relatedLot should be one of lots of bid']}]}])
+        self.assertEqual(response.json['errors'][0]["description"], [{u'lotValues': [u"bids don't allow duplicated proposals"]}])
 
         patch_data['bids'][0]['lotValues'][1]['relatedLot'] = self.initial_bids[0]['lotValues'][1]['relatedLot']
 
@@ -878,7 +879,8 @@ def test_patch_tender_auction(self):
         response = self.app.patch_json('/tenders/{}/auction'.format(self.tender_id), {'data': patch_data}, status=422)
         self.assertEqual(response.status, '422 Unprocessable Entity')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertEqual(response.json['errors'][0]["description"], [{u'lotValues': [{u'relatedLot': [u'relatedLot should be one of lots of bid']}]}])
+        #self.assertEqual(response.json['errors'][0]["description"], [{u'lotValues': [{u'relatedLot': [u'relatedLot should be one of lots of bid']}]}])
+        self.assertEqual(response.json['errors'][0]["description"], [{u'lotValues': [u"bids don't allow duplicated proposals"]}])
 
         patch_data['bids'][0]['lotValues'][1]['relatedLot'] = self.initial_bids[0]['lotValues'][1]['relatedLot']
 

diff --git a/src/openprocurement/api/tests/lot.py b/src/openprocurement/api/tests/lot.py
@@ -719,6 +719,14 @@ def test_create_tender_bidder_invalid(self):
             {u'description': u"invalid literal for int() with base 10: 'contactPoint'", u'location': u'body', u'name': u'data'},
         ])
 
+        response = self.app.post_json(request_path, {'data': {'tenderers': [test_organization], 'lotValues': [{"value": {"amount": 500}, 'relatedLot': self.initial_lots[0]['id']}, {"value": {"amount": 500}, 'relatedLot': self.initial_lots[0]['id']}]}}, status=422)
+        self.assertEqual(response.status, '422 Unprocessable Entity')
+        self.assertEqual(response.content_type, 'application/json')
+        self.assertEqual(response.json['status'], 'error')
+        self.assertEqual(response.json['errors'], [
+            {u'description': [u"bids don't allow duplicated proposals"], u'location': u'body', u'name': u'lotValues'}
+        ])
+
     def test_patch_tender_bidder(self):
         lot_id = self.initial_lots[0]['id']
         response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), {'data': {'tenderers': [test_organization], 'lotValues': [{"value": {"amount": 500}, 'relatedLot': lot_id}]}})