Fixed changing status

openprocurement · Jan 25, 2016 · 643cd17 · 643cd17
1 parent 7cf1198
commit 643cd17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/openprocurement/tender/openua/models.py b/openprocurement/tender/openua/models.py
@@ -294,7 +294,7 @@ def numberOfBids(self):
     def next_check(self):
         now = get_now()
         checks = []
-        if self.status == 'active.tendering' and self.tenderPeriod.endDate and not any([i.status == 'accepted' for i in self.complaints]):
+        if self.status == 'active.tendering' and self.tenderPeriod.endDate and not any([i.status in ['pending', 'accepted'] for i in self.complaints]):
             checks.append(self.tenderPeriod.endDate.astimezone(TZ))
         elif not self.lots and self.status == 'active.awarded':
             standStillEnds = [

diff --git a/openprocurement/tender/openua/utils.py b/openprocurement/tender/openua/utils.py
@@ -31,7 +31,7 @@ def check_bids(request):
     tender = request.validated['tender']
     if tender.lots:
         [setattr(i, 'status', 'unsuccessful') for i in tender.lots if i.numberOfBids < 2]
-        if set([i.status for i in tender.lots]) == set(['unsuccessful']):
+        if not set([i.status for i in tender.lots]).difference(set(['unsuccessful', 'cancelled'])):
             tender.status = 'unsuccessful'
     else:
         if tender.numberOfBids < 2:
@@ -41,15 +41,15 @@ def check_bids(request):
 def check_status(request):
     tender = request.validated['tender']
     now = get_now()
-    if not tender.lots and tender.status == 'active.tendering' and tender.tenderPeriod.endDate <= now and not any([i.status == 'accepted' for i in tender.complaints]):
+    if not tender.lots and tender.status == 'active.tendering' and tender.tenderPeriod.endDate <= now and not any([i.status in ['pending', 'accepted'] for i in tender.complaints]):
         LOGGER.info('Switched tender {} to {}'.format(tender['id'], 'active.auction'),
                     extra=context_unpack(request, {'MESSAGE_ID': 'switched_tender_active.auction'}))
         tender.status = 'active.auction'
         check_bids(request)
         if tender.numberOfBids < 2 and tender.auctionPeriod:
             tender.auctionPeriod.startDate = None
         return
-    elif tender.lots and tender.status == 'active.tendering' and tender.tenderPeriod.endDate <= now and not any([i.status == 'accepted' for i in tender.complaints]):
+    elif tender.lots and tender.status == 'active.tendering' and tender.tenderPeriod.endDate <= now and not any([i.status in ['pending', 'accepted'] for i in tender.complaints]):
         LOGGER.info('Switched tender {} to {}'.format(tender['id'], 'active.auction'),
                     extra=context_unpack(request, {'MESSAGE_ID': 'switched_tender_active.auction'}))
         tender.status = 'active.auction'