Unsucessfull if bids < 2

openprocurement · Jan 22, 2016 · 45b4069 · 45b4069
1 parent 108f38f
commit 45b4069
Show file tree

Hide file tree

Showing 10 changed files with 211 additions and 266 deletions.
diff --git a/openprocurement/tender/openua/models.py b/openprocurement/tender/openua/models.py
@@ -191,7 +191,7 @@ class Options:
 
     __name__ = ''
 
-    enquiryPeriod = ModelType(PeriodStartEndRequired, required=True)
+    enquiryPeriod = ModelType(Period, required=False)
     tenderPeriod = ModelType(PeriodStartEndRequired, required=True)
     bids = SifterListType(ModelType(Bid), default=list(), filter_by='status', filter_in_values=['invalidBid', 'deleted'])  # A list of all the companies who entered submissions for the tender.
     awards = ListType(ModelType(Award), default=list())
@@ -208,10 +208,12 @@ def validate_tenderPeriod(self, data, period):
             raise ValidationError(u"tenderPeriod should be greater than 15 days")
 
     def initialize(self):
-        if not self.enquiryPeriod.startDate:
-            self.enquiryPeriod.startDate = get_now()
         if not self.tenderPeriod.startDate:
-            self.tenderPeriod.startDate = self.enquiryPeriod.startDate
+            self.tenderPeriod.startDate = get_now()
+        self.enquiryPeriod = Period(self.tenderPeriod.to_native())
+        self.enquiryPeriod.endDate = calculate_buisness_date(self.tenderPeriod.endDate, -timedelta(days=3))
+        if hasattr(self, "auctionPeriod") and hasattr(self.auctionPeriod, "startDate"):
+            self.auctionPeriod.startDate = ""
 
     @serializable
     def next_check(self):

diff --git a/openprocurement/tender/openua/tests/base.py b/openprocurement/tender/openua/tests/base.py
@@ -2,6 +2,7 @@
 import os
 import webtest
 from datetime import datetime, timedelta
+from openprocurement.api.models import get_now
 from openprocurement.api.tests.base import (test_tender_data,
                                             now,
                                             test_features_tender_data,
@@ -11,18 +12,22 @@
 
 test_tender_ua_data = test_tender_data.copy()
 test_tender_ua_data['procurementMethodType'] = "aboveThresholdUA"
-test_tender_ua_data["enquiryPeriod"] = {
+# test_tender_ua_data["enquiryPeriod"] = {}
+del test_tender_ua_data["enquiryPeriod"]
+test_tender_ua_data["tenderPeriod"] = {
         "endDate": (now + timedelta(days=16)).isoformat()
 }
 
-test_tender_ua_data["tenderPeriod"] = test_tender_ua_data["enquiryPeriod"].copy()
+# test_tender_ua_data["tenderPeriod"] = test_tender_ua_data["enquiryPeriod"].copy()
 
 test_features_tender_ua_data = test_features_tender_data.copy()
 test_features_tender_ua_data['procurementMethodType'] = "aboveThresholdUA"
-test_features_tender_ua_data["enquiryPeriod"] = {
+# test_features_tender_ua_data["enquiryPeriod"] = {}
+del test_features_tender_ua_data["enquiryPeriod"]
+test_features_tender_ua_data["tenderPeriod"] = {
         "endDate": (now + timedelta(days=16)).isoformat()
 }
-test_features_tender_ua_data["tenderPeriod"] = test_features_tender_ua_data["enquiryPeriod"].copy()
+# test_features_tender_ua_data["tenderPeriod"] = test_features_tender_ua_data["enquiryPeriod"].copy()
 
 
 from openprocurement.api.utils import VERSION, apply_data_patch
@@ -33,6 +38,22 @@ class BaseTenderUAWebTest(BaseTenderWebTest):
     initial_bids = None
     initial_lots = None
 
+    def go_to_enquiryPeriod_end(self):
+        now = get_now()
+        self.set_status('active.tendering', {
+            "enquiryPeriod": {
+                "startDate": (now - timedelta(days=13)).isoformat(),
+                "endDate": (now - timedelta(days=1)).isoformat()
+            },
+            "tenderPeriod": {
+                "startDate": (now - timedelta(days=13)).isoformat(),
+                "endDate": (now + timedelta(days=2)).isoformat()
+            },
+            "auctionPeriod": {
+                "startDate": (now + timedelta(days=2)).isoformat()
+            }
+        })
+
     def setUp(self):
         self.app = webtest.TestApp(
             "config:tests.ini", relative_to=os.path.dirname(__file__))

diff --git a/openprocurement/tender/openua/tests/chronograph.py b/openprocurement/tender/openua/tests/chronograph.py
@@ -14,8 +14,7 @@ def test_switch_to_qualification(self):
         response = self.app.patch_json('/tenders/{}'.format(self.tender_id), {'data': {'id': self.tender_id}})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertEqual(response.json['data']["status"], "active.qualification")
-        self.assertEqual(len(response.json['data']["awards"]), 1)
+        self.assertEqual(response.json['data']["status"], "unsuccessful")
 
 
 class TenderSwitchAuctionResourceTest(BaseTenderUAContentWebTest):
@@ -54,8 +53,7 @@ def test_switch_to_qualification(self):
         response = self.app.patch_json('/tenders/{}'.format(self.tender_id), {'data': {'id': self.tender_id}})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.content_type, 'application/json')
-        self.assertEqual(response.json['data']["status"], "active.qualification")
-        self.assertEqual(len(response.json['data']["awards"]), 1)
+        self.assertEqual(response.json['data']["status"], "unsuccessful")
 
 
 class TenderLotSwitchAuctionResourceTest(BaseTenderUAContentWebTest):