Fixed validation auctionPeriod

openprocurement · Feb 16, 2016 · a9ebf79 · a9ebf79
1 parent db1b562
commit a9ebf79
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 37 deletions.
diff --git a/openprocurement/tender/openua/tests/lot.py b/openprocurement/tender/openua/tests/lot.py
@@ -115,20 +115,6 @@ def test_create_tender_lot_invalid(self):
         self.assertEqual(lots[0]['minimalStep']['currency'], "UAH")
         self.assertEqual(lots[0]['minimalStep']['amount'], 100)
 
-        response = self.app.post_json(request_path, {'data': {
-            'title': 'lot title',
-            'description': 'lot description',
-            'value': {'amount': '500.0'},
-            'minimalStep': {'amount': '100.0'},
-            'auctionPeriod': {'startDate': '2014-10-31T00:00:00', 'endDate': '2015-10-01T00:00:00'}
-        }}, 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'period should begin after tenderPeriod'], u'location': u'body', u'name': u'auctionPeriod'}
-        ])
-
         response = self.app.patch_json('/tenders/{}'.format(self.tender_id), {"data": {"items": [{'relatedLot': '0' * 32}]}}, status=422)
         self.assertEqual(response.status, '422 Unprocessable Entity')
         self.assertEqual(response.content_type, 'application/json')

diff --git a/openprocurement/tender/openua/tests/tender.py b/openprocurement/tender/openua/tests/tender.py
@@ -395,16 +395,6 @@ def test_create_tender_invalid(self):
         # ])
 
         now = get_now()
-        test_tender_ua_data['auctionPeriod'] = {'startDate': now.isoformat(), 'endDate': now.isoformat()}
-        response = self.app.post_json(request_path, {'data': test_tender_ua_data}, status=422)
-        del test_tender_ua_data['auctionPeriod']
-        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'period should begin after tenderPeriod'], u'location': u'body', u'name': u'auctionPeriod'}
-        ])
-
         test_tender_ua_data['awardPeriod'] = {'startDate': now.isoformat(), 'endDate': now.isoformat()}
         response = self.app.post_json(request_path, {'data': test_tender_ua_data}, status=422)
         del test_tender_ua_data['awardPeriod']
@@ -867,11 +857,11 @@ def test_patch_tender_ua(self):
         dateModified = tender.pop('dateModified')
         self.tender_id = tender['id']
         self.go_to_enquiryPeriod_end()
+
         response = self.app.patch_json('/tenders/{}?acc_token={}'.format(tender['id'], owner_token), {'data': {"value": {
             "amount": 501,
             "currency": u"UAH"
         }}}, status=403)
-
         self.assertEqual(response.status, '403 Forbidden')
         self.assertEqual(response.content_type, 'application/json')
         self.assertEqual(response.json['errors'][0]["description"], "tenderPeriod should be extended by 7 days")
@@ -893,7 +883,6 @@ def test_patch_tender_ua(self):
         self.assertEqual(response.json['data']['tenderPeriod']['endDate'], tenderPeriod_endDate.isoformat())
         self.assertEqual(response.json['data']['enquiryPeriod']['endDate'], enquiryPeriod_endDate.isoformat())
 
-
     def test_dateModified_tender(self):
         response = self.app.get('/tenders')
         self.assertEqual(response.status, '200 OK')

diff --git a/openprocurement/tender/openua/validation.py b/openprocurement/tender/openua/validation.py
@@ -16,15 +16,5 @@ def validate_patch_tender_ua_data(request):
             request.errors.add('body', 'item', 'Can\'t change enquiryPeriod')
             request.errors.status = 403
             return None
-        if 'tenderPeriod' in data:
-            data["auctionPeriod"] = {'startDate': None}
-            if len(request.context.lots) > 0:
-                lots = list(data['lots']) if 'lots' in data else []
-                data['lots'] = []
-                for index, lot in enumerate(request.context.lots):
-                    lot_data = lots[index] if lots else {}
-
-                    lot_data['auctionPeriod'] = {'startDate': None}
-                    data['lots'].append(lot_data)
 
     return validate_data(request, request.tender.__class__, True, data)
diff --git a/openprocurement/tender/openua/views/tender.py b/openprocurement/tender/openua/views/tender.py
@@ -91,7 +91,6 @@ def patch(self):
                     return
                 self.request.validated['tender'].initialize()
                 self.request.validated['data']["enquiryPeriod"] = self.request.validated['tender'].enquiryPeriod.serialize()
-                self.request.validated['data']["auctionPeriod"] = {'startDate': None}
 
         apply_patch(self.request, save=False, src=self.request.validated['tender_src'])
         if self.request.authenticated_role == 'chronograph':