Fix/forbidden second award activation

.gitlab-ci.yml

@@ -5,6 +5,7 @@ stages:
   - docs
   - test
   - test_before_2020_04_19
+  - test_before_ecriteria
   - repos
   - cleanup
 
@@ -182,7 +183,7 @@ docs:
     - python setup.py test --addopts="docs/tests --color=yes"
     - (set -e; [[ $(git diff) ]] && { git diff; exit 1; } || exit 0)
   when: manual
-  allow_failure: false
+  allow_failure: true
   needs:
     - build
   variables:
@@ -232,6 +233,16 @@ docs:
       --tx=popen//id=sand//env:DB_NAME=test_sandbox//env:SANDBOX_MODE=1//env:SINGLE_APP=1//env:DEFAULT_RELEASE_2020_04_19=2030-01-01
       --tx=popen//id=prod//env:DB_NAME=test_prod//env:SANDBOX_MODE=//env:SINGLE_APP=1//env:DEFAULT_RELEASE_2020_04_19=2030-01-01
 
+.test_before_ecriteria:
+  extends: .test_base
+  stage: test_before_ecriteria
+  script:
+    - cd /app
+    - py.test $TESTS_PATH --cov=$COV_PATH --cov-config=$COV_FILE -v --color=yes --dist=each
+      --tx=popen//id=sand//env:DB_NAME=test_sandbox//env:SANDBOX_MODE=1//env:SINGLE_APP=1//env:DEFAULT_ECRITERIA_ARTICLE_17=2030-01-01
+      --tx=popen//id=prod//env:DB_NAME=test_prod//env:SANDBOX_MODE=//env:SINGLE_APP=1//env:DEFAULT_ECRITERIA_ARTICLE_17=2030-01-01
+
+
 .test_relocation_api:
   variables:
     TESTS_PATH: src/openprocurement/relocation/api/tests
@@ -250,14 +261,18 @@ test_relocation_api_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_relocation_api
 
+test_relocation_api_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_relocation_api
+
 .test_tender_esco:
   variables:
     TESTS_PATH: src/openprocurement/tender/esco/tests
     COV_PATH: src/openprocurement/tender/esco
     COV_FILE: .coveragerc
     KUBERNETES_MEMORY_REQUEST: 1500Mi
 
-
 test_tender_esco:
   extends:
     - .test
@@ -268,6 +283,11 @@ test_tender_esco_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_esco
 
+test_tender_esco_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_openeu
+
 .test_tender_openeu:
   variables:
     TESTS_PATH: src/openprocurement/tender/openeu/tests
@@ -280,11 +300,16 @@ test_tender_openeu:
     - .test
     - .test_tender_openeu
 
-test_tender_openeu_before_2020_04_19:
+test_tender_openeu_2020_04_19:
   extends:
     - .test_before_2020_04_19
     - .test_tender_openeu
 
+test_tender_openeu_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_openeu
+
 .test_tender_cfaua:
   variables:
     TESTS_PATH: src/openprocurement/tender/cfaua/tests
@@ -302,6 +327,11 @@ test_tender_cfaua_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_cfaua
 
+test_tender_cfaua_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_cfaua
+
 .test_tender_comp_stage2:
   variables:
     TESTS_PATH: src/openprocurement/tender/competitivedialogue/tests/stage2
@@ -319,6 +349,11 @@ test_tender_comp_stage2_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_comp_stage2
 
+test_tender_comp_stage2_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_comp_stage2
+
 .test_tender_core:
   variables:
     TESTS_PATH: src/openprocurement/tender/core/tests
@@ -335,6 +370,11 @@ test_tender_core_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_core
 
+test_tender_core_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_core
+
 .test_api:
   variables:
     TESTS_PATH: src/openprocurement/api/tests
@@ -353,6 +393,11 @@ test_api_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_api
 
+test_api_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_api
+
 .test_agreement_core:
   variables:
     TESTS_PATH: src/openprocurement/agreement/core/tests
@@ -369,6 +414,11 @@ test_agreement_core_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_agreement_core
 
+test_agreement_core_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_agreement_core
+
 .test_agreement_cfaua:
   variables:
     TESTS_PATH: src/openprocurement/agreement/cfaua/tests
@@ -386,6 +436,11 @@ test_agreement_cfaua_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_agreement_cfaua
 
+test_agreement_cfaua_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_agreement_cfaua
+
 .test_contracting_api:
   variables:
     TESTS_PATH: src/openprocurement/contracting/api/tests
@@ -405,6 +460,11 @@ test_contracting_api_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_contracting_api
 
+test_contracting_api_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_contracting_api
+
 .test_planning_api:
   variables:
     TESTS_PATH: src/openprocurement/planning/api/tests
@@ -423,6 +483,11 @@ test_planning_api_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_planning_api
 
+test_planning_api_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_planning_api
+
 .test_historical_core:
   variables:
     TESTS_PATH: src/openprocurement/historical/core/tests
@@ -441,6 +506,11 @@ test_historical_core_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_historical_core
 
+test_historical_core_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_historical_core
+
 .test_historical_tender:
   variables:
     TESTS_PATH: src/openprocurement/historical/tender/tests
@@ -459,6 +529,11 @@ test_historical_tender_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_historical_tender
 
+test_historical_tender_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_historical_tender
+
 .test_tender_comp_stage1:
   variables:
     TESTS_PATH: src/openprocurement/tender/competitivedialogue/tests/stage1
@@ -478,6 +553,11 @@ test_tender_comp_stage1_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_comp_stage1
 
+test_tender_comp_stage1_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_comp_stage1
+
 .test_tender_limited:
   variables:
     TESTS_PATH: src/openprocurement/tender/limited/tests
@@ -495,6 +575,11 @@ test_tender_limited_before_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_limited
 
+test_tender_limited_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_limited
+
 .test_tender_openua:
   variables:
     TESTS_PATH: src/openprocurement/tender/openua/tests
@@ -512,6 +597,11 @@ test_tender_openua_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_openua
 
+test_tender_openua_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_openua
+
 .test_tender_belowthreshold:
   variables:
     TESTS_PATH: src/openprocurement/tender/belowthreshold/tests
@@ -529,6 +619,11 @@ test_tender_belowthreshold_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_belowthreshold
 
+test_tender_belowthreshold_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_belowthreshold
+
 .test_tender_openuadefense:
   variables:
     TESTS_PATH: src/openprocurement/tender/openuadefense/tests
@@ -546,6 +641,11 @@ test_tender_openuadefense_2020_04_19:
     - .test_before_2020_04_19
     - .test_tender_openuadefense
 
+test_tender_openuadefense_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_openuadefense
+
 .test_tender_cfaselectionua:
   variables:
     TESTS_PATH: src/openprocurement/tender/cfaselectionua/tests
@@ -563,3 +663,15 @@ test_tender_cfaselectionua_2020_04_19:
   extends:
     - .test_before_2020_04_19
     - .test_tender_cfaselectionua
+
+test_tender_cfaselectionua_ecriteria:
+  extends:
+    - .test_before_ecriteria
+    - .test_tender_cfaselectionua
+
+test_tender_pricequotation:
+  extends: .test
+  variables:
+    TESTS_PATH: src/openprocurement/tender/pricequotation/tests
+    COV_PATH: src/openprocurement/tender/pricequotation
+    COV_FILE: .coveragerc

docker-compose.yml

@@ -25,8 +25,8 @@ services:
       - "./docs:/app/docs:delegated"
   couchdb:
     image: "couchdb:1.6"
+    ports:
+      - "5984:5984"
     environment:
       COUCHDB_USER: op
       COUCHDB_PASSWORD: op
-    ports:
-      - "5984:5984"

docs/source/agreementcfaua/tutorial/add-agreement-change-modification.http

@@ -1,4 +1,4 @@
-PATCH /api/2.5/agreements/eb35d61e7cde4a008003f5cd17ddb0c7/changes/563cc544379744ed9b023a88ff6e415b?acc_token=76b0c07026994e7089d5f9716acfc3e7 HTTP/1.0
+PATCH /api/2.5/agreements/eb35d61e7cde4a008003f5cd17ddb0c7/changes/5937223446a044e689f16dc9912fed8b?acc_token=76b0c07026994e7089d5f9716acfc3e7 HTTP/1.0
 Authorization: Bearer broker
 Content-Length: 95
 Content-Type: application/json
@@ -8,7 +8,7 @@ DATA:
   "data": {
     "modifications": [
       {
-        "itemId": "caa9e0207afd49d48ca553e562787699", 
+        "itemId": "54eee06ff6d24b12b8e84dfe65d1b6b7", 
         "factor": 0.1605
       }
     ]
@@ -22,15 +22,15 @@ Content-Type: application/json; charset=UTF-8
     "status": "pending", 
     "modifications": [
       {
-        "itemId": "caa9e0207afd49d48ca553e562787699", 
+        "itemId": "54eee06ff6d24b12b8e84dfe65d1b6b7", 
         "factor": 0.1605
       }
     ], 
     "rationaleType": "taxRate", 
     "rationale_en": "Agreement change cause", 
     "rationale": "Друга і третя поставка має бути розфасована", 
     "date": "2020-05-15T01:00:00+03:00", 
-    "id": "563cc544379744ed9b023a88ff6e415b"
+    "id": "5937223446a044e689f16dc9912fed8b"
   }
 }
 

docs/source/agreementcfaua/tutorial/add-agreement-change.http

@@ -21,7 +21,7 @@ Content-Type: application/json; charset=UTF-8
     "rationale_en": "Agreement change cause", 
     "rationale": "Опис причини змін егріменту", 
     "date": "2020-05-15T01:00:00+03:00", 
-    "id": "563cc544379744ed9b023a88ff6e415b"
+    "id": "5937223446a044e689f16dc9912fed8b"
   }
 }
 

docs/source/agreementcfaua/tutorial/agreement-credentials.http

@@ -24,7 +24,7 @@ Content-Type: application/json; charset=UTF-8
               "amount": 93, 
               "valueAddedTaxIncluded": true
             }, 
-            "relatedItem": "caa9e0207afd49d48ca553e562787699"
+            "relatedItem": "54eee06ff6d24b12b8e84dfe65d1b6b7"
           }
         ], 
         "suppliers": [
@@ -66,7 +66,7 @@ Content-Type: application/json; charset=UTF-8
               "amount": 93, 
               "valueAddedTaxIncluded": true
             }, 
-            "relatedItem": "caa9e0207afd49d48ca553e562787699"
+            "relatedItem": "54eee06ff6d24b12b8e84dfe65d1b6b7"
           }
         ], 
         "suppliers": [
@@ -108,7 +108,7 @@ Content-Type: application/json; charset=UTF-8
               "amount": 93, 
               "valueAddedTaxIncluded": true
             }, 
-            "relatedItem": "caa9e0207afd49d48ca553e562787699"
+            "relatedItem": "54eee06ff6d24b12b8e84dfe65d1b6b7"
           }
         ], 
         "suppliers": [
@@ -170,7 +170,7 @@ Content-Type: application/json; charset=UTF-8
           "startDate": "2018-06-27T13:39:09.362837+03:00", 
           "endDate": "2018-06-30T13:39:09.362837+03:00"
         }, 
-        "id": "caa9e0207afd49d48ca553e562787699", 
+        "id": "54eee06ff6d24b12b8e84dfe65d1b6b7", 
         "unit": {
           "code": "44617100-9", 
           "name": "item"

docs/source/agreementcfaua/tutorial/agreement-documents.http

@@ -24,7 +24,7 @@ Content-Type: application/json; charset=UTF-8
       "documentOf": "change", 
       "datePublished": "2020-05-15T01:00:00+03:00", 
       "id": "b8f02cdfc2cc43c2a6a5f014d524afc6", 
-      "relatedItem": "563cc544379744ed9b023a88ff6e415b", 
+      "relatedItem": "5937223446a044e689f16dc9912fed8b", 
       "dateModified": "2020-05-15T01:00:00+03:00"
     }
   ]