Merge d024f55 into 9df7ba6

openprocurement/auctions/geb/managers/changers/actions/chronograph.py

@@ -114,6 +114,13 @@ def act(self):
         bids = self.context.bids
         active_bids = [bid for bid in bids if bid.status == 'active']
 
+        # in the end of enquiry period
+        # all bids that are in status 'draft/pending'
+        # switch to 'unsuccessful' status
+        for bid in self.context['bids']:
+            if bid.status in ['draft', 'pending']:
+                bid.status = 'unsuccessful'
+
         if min_number == 1:
             if len(active_bids) == 0:
                 status = 'unsuccessful'
@@ -134,13 +141,6 @@ def act(self):
             elif len(active_bids) >= 2:
                 status = 'active.auction'
 
-        # in the end of enquiry period
-        # all bids that are in status 'draft/pending'
-        # switch to 'unsuccessful' status
-        for bid in self.context['bids']:
-            if bid.status in ['draft', 'pending']:
-                bid.status = 'unsuccessful'
-
         self.context.status = status
         log_auction_status_change(self.request, self.context, self.context.status)
 

openprocurement/auctions/geb/tests/fixtures/active_enquiry.py

@@ -28,7 +28,6 @@
     BID_PENDING_FIRST,
     BID_PENDING_FIRST_WITH_DOCUMENT,
     BID_PENDING_SECOND,
-    BID_UNSUCCESSFUL_FIRST
 )
 from openprocurement.auctions.geb.tests.fixtures.calculator import (
     Calculator
@@ -174,7 +173,7 @@
 # and minNumberOfQualifiedBids = 1
 # which will lead to the status 'active.qualification' auction
 auction = deepcopy(END_ACTIVE_ENQUIRY_AUCTION)
-auction['bids'] = [BID_UNSUCCESSFUL_FIRST, BID_ACTIVE_SECOND]
+auction['bids'] = [BID_PENDING_FIRST, BID_ACTIVE_SECOND]
 auction['minNumberOfQualifiedBids'] = 1
 END_ACTIVE_ENQUIRY_AUCTION_QUALIFICATION_WITH_1_ACTIVE_AND_UNSUCCESSFUL = auction