Merge remote-tracking branch 'origin/a206699207014288_multilots_contr…

…acts_sign' into dev

openprocurement/tender/limited/tests/base.py

@@ -51,14 +51,15 @@ class BaseTenderWebTest(BaseBaseTenderWebTest):
     def setUp(self):
         super(BaseBaseTenderWebTest, self).setUp()
         self.app.authorization = ('Basic', ('broker', ''))
+        self.couchdb_server = self.app.app.registry.couchdb_server
         self.db = self.app.app.registry.db
         if self.docservice:
             self.setUpDS()
 
     def tearDown(self):
         if self.docservice:
             self.tearDownDS()
-        super(BaseBaseTenderWebTest, self).tearDown()
+        del self.couchdb_server[self.db.name]
 
     def set_status(self, status, extra=None):
         data = {'status': status}

openprocurement/tender/limited/tests/contract.py

@@ -740,6 +740,35 @@ def create_award(self):
         self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
             self.tender_id, self.award2_id, self.tender_token), {"data": {"status": "active"}})
 
+    def test_sign_second_contract(self):
+        response = self.app.get('/tenders/{}/contracts'.format(self.tender_id))
+        self.contract1_id = response.json['data'][0]['id']
+        self.contract2_id = response.json['data'][1]['id']
+
+        # at next steps we test to create contract in 'complete' tender status
+        # time travel
+        tender = self.db.get(self.tender_id)
+        for i in tender.get('awards', []):
+            if i.get('complaintPeriod', {}):  # reporting procedure does not have complaintPeriod
+                i['complaintPeriod']['endDate'] = i['complaintPeriod']['startDate']
+        self.db.save(tender)
+
+        response = self.app.patch_json('/tenders/{}/contracts/{}?acc_token={}'.format(
+            self.tender_id, self.contract2_id, self.tender_token), {"data": {"status": "active"}})
+        self.assertEqual(response.status, '200 OK')
+
+        response = self.app.get('/tenders/{}'.format(self.tender_id))
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json['data']['status'], 'active')
+
+        response = self.app.patch_json('/tenders/{}/contracts/{}?acc_token={}'.format(
+            self.tender_id, self.contract1_id, self.tender_token), {"data": {"status": "active"}})
+        self.assertEqual(response.status, '200 OK')
+
+        response = self.app.get('/tenders/{}'.format(self.tender_id))
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json['data']['status'], 'complete')
+
     def test_create_two_contract(self):
         response = self.app.get('/tenders/{}/contracts'.format(self.tender_id))
         self.contract1_id = response.json['data'][0]['id']

openprocurement/tender/limited/views/contract.py

@@ -22,8 +22,6 @@ def check_tender_status(request):
 
 def check_tender_negotiation_status(request):
     tender = request.validated['tender']
-    if tender.contracts and tender.contracts[-1].status == 'active':
-        tender.status = 'complete'
     now = get_now()
     if tender.lots:
         for lot in tender.lots:

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '2.3.15'
+version = '2.3.17'
 
 requires = [
     'setuptools',