Merge branch 'feature/requirements-validation' into 'quinta'

Drop zope && add validation of criterion.requirementGroup and bid.requirementsResponses

See merge request pricequotation/openprocurement.api!16

Author: yshalenyk

src/openprocurement/tender/pricequotation/configure.zcml

@@ -11,7 +11,7 @@
     PriceQuotationTender
 from openprocurement.tender.pricequotation.adapters import\
     PQTenderConfigurator
-from zope.configuration.xmlconfig import file as ZcmlFile
+
 
 LOGGER = getLogger("openprocurement.tender.pricequotation")
 
@@ -26,8 +26,3 @@ def includeme(config):
         (IPriceQuotationTender, IRequest),
         IContentConfigurator
     )
-
-    ZcmlFile(
-        os.path.join(os.path.dirname(os.path.abspath(__file__)), 'configure.zcml'),
-        package=openprocurement.tender.pricequotation
-    )

src/openprocurement/tender/pricequotation/includeme.py

@@ -1,9 +1,8 @@
 from uuid import uuid4
 
-from openprocurement.tender.pricequotation.utils import get_requirement_response_class
 from pyramid.security import Allow
-from schematics.types import MD5Type, StringType, BooleanType, IntType, DecimalType
-from schematics.types.compound import ModelType, PolyModelType
+from schematics.types import MD5Type, StringType
+from schematics.types.compound import ModelType
 from schematics.transforms import whitelist
 
 from openprocurement.api.utils import get_now
@@ -19,39 +18,18 @@
 from openprocurement.tender.pricequotation.models.document import\
     Document
 from openprocurement.tender.pricequotation.validation import\
-    validate_bid_value
-
-
-class BidOffer(Model):
-    id = MD5Type(required=True, default=lambda: uuid4().hex)
-    relatedItem = MD5Type(required=True)
-    requirementsResponse = StringType(required=True)
+    validate_bid_value, validate_requirement_responses
 
 
 class RequirementReference(Model):
     id = StringType(required=True)
     title = StringType()
 
 
-class BaseRequirementResponse(Model):
+class RequirementResponse(Model):
     id = MD5Type(required=True, default=lambda: uuid4().hex)
     requirement = ModelType(RequirementReference, required=True)
-
-
-class RequirementResponseString(BaseRequirementResponse):
-    value = StringType()
-
-
-class RequirementResponseInt(BaseRequirementResponse):
-    value = IntType()
-
-
-class RequirementResponseNumber(BaseRequirementResponse):
-    value = DecimalType()
-
-
-class RequirementResponseBoolean(BaseRequirementResponse):
-    value = BooleanType()
+    value = StringType(required=True)
 
 
 class Bid(Model):
@@ -96,29 +74,10 @@ def __local_roles__(self):
     transfer_token = StringType()
     owner = StringType()
     requirementResponses = ListType(
-        PolyModelType(
-            (
-                BaseRequirementResponse,
-                RequirementResponseInt,
-                RequirementResponseNumber,
-                RequirementResponseString,
-                RequirementResponseBoolean,
-            ),
-            claim_function=get_requirement_response_class,
-            required=True
-        ),
+        ModelType(RequirementResponse),
         required=True,
-        min_size=1
+        min_size=1,
     )
-    # TODO: 
-    # offers = ListType(
-    #     ModelType(BidOffer, required=True),
-    #     required=True,
-    #     min_size=1,
-    #     validators=[validate_items_uniq],
-    # )
-
-    __name__ = ""
 
     def import_data(self, raw_data, **kw):
         """
@@ -145,3 +104,9 @@ def validate_value(self, data, value):
         parent = data["__parent__"]
         if isinstance(parent, Model):
             validate_bid_value(parent, value)
+
+    def validate_requirementResponses(self, data, value):
+        criterion = data["__parent__"]['criteria']
+        validate_requirement_responses(
+            criterion, value
+        )

src/openprocurement/tender/pricequotation/models/bid.py

@@ -1,24 +1,21 @@
-from openprocurement.api.models import ListType, Model
-from openprocurement.tender.pricequotation.models.requirement import (RequirementBoolean, RequirementDateTime,
-                                                                      RequirementInteger, RequirementNumber,
-                                                                      RequirementString)
-from openprocurement.tender.pricequotation.utils import get_requirement_class
 from schematics.types import StringType
-from schematics.types.compound import ModelType, PolyModelType
+from schematics.types.compound import ModelType
+
+from openprocurement.api.models import ListType, Model
+from openprocurement.tender.pricequotation.models.requirement import Requirement
+from openprocurement.tender.pricequotation.validation import validate_requirement_groups
 
 
 class RequirementGroup(Model):
     id = StringType(required=True)
     description = StringType(required=True)
-    requirements = ListType(PolyModelType((RequirementInteger,
-                                           RequirementDateTime,
-                                           RequirementString,
-                                           RequirementNumber,
-                                           RequirementBoolean), claim_function=get_requirement_class), default=list())
+    requirements = ListType(ModelType(Requirement, required=True), default=list())
 
 
 class Criterion(Model):
     id = StringType(required=True)
     title = StringType(required=True)
     description = StringType(required=True)
-    requirementGroups = ListType(ModelType(RequirementGroup), required=True)
+    requirementGroups = ListType(ModelType(RequirementGroup),
+                                 required=True,
+                                 validators=[validate_requirement_groups])

src/openprocurement/tender/pricequotation/models/criterion.py

@@ -1,52 +1,32 @@
-from openprocurement.api.models import DecimalType, IsoDateTimeType, ListType, Model
-from openprocurement.api.models import Unit as BaseUnit
-from schematics.types import BaseType, BooleanType, FloatType, IntType, StringType
+from schematics.types import BaseType, BooleanType, FloatType, IntType, StringType, BaseType
 from schematics.types.compound import ModelType
+from schematics.exceptions import ValidationError
 
-
-class Period(Model):
-    startDate = IsoDateTimeType()
-    endDate = IsoDateTimeType()
-    durationInDays = IntType()
+from openprocurement.api.models import DecimalType, IsoDateTimeType, ListType, Model
+from openprocurement.api.models import Unit as BaseUnit
+from openprocurement.tender.pricequotation.validation import validate_value_type
 
 
 class Unit(BaseUnit):
     name = StringType(required=True)
 
 
-class BaseRequirement(Model):
+class Requirement(Model):
     id = StringType(required=True)
     title = StringType(required=True)
     description = StringType()
-    dataType = StringType(required=True, choices=["string", "date-time", "number", "integer", "boolean"])
-    pattern = StringType()
-    period = ModelType(Period)
+    dataType = StringType(required=True,
+                          choices=["string", "number", "integer", "boolean"])
     unit = ModelType(Unit)
-
-
-class RequirementString(BaseRequirement):
     minValue = StringType()
     maxValue = StringType()
     expectedValue = StringType()
 
+    def validate_minValue(self, data, value):
+        validate_value_type(value, data['dataType'])
 
-class RequirementDateTime(BaseRequirement):
-    minValue = IsoDateTimeType()
-    maxValue = IsoDateTimeType()
-    expectedValue = IsoDateTimeType()
-
-
-class RequirementNumber(BaseRequirement):
-    minValue = DecimalType()
-    maxValue = DecimalType()
-    expectedValue = DecimalType()
-
-
-class RequirementInteger(BaseRequirement):
-    minValue = IntType()
-    maxValue = IntType()
-    expectedValue = IntType()
-
+    def validate_maxValue(self, data, value):
+        validate_value_type(value, data['dataType'])
 
-class RequirementBoolean(BaseRequirement):
-    expectedValue = BooleanType()
+    def validate_expectedValue(self, data, value):
+        validate_value_type(value, data['dataType'])

src/openprocurement/tender/pricequotation/models/requirement.py

@@ -76,16 +76,9 @@ class TenderAwardDocumentResourceTest(TenderContentWebTest, TenderAwardDocumentR
 
     def setUp(self):
         super(TenderAwardDocumentResourceTest, self).setUp()
-        # Create award
-        auth = self.app.authorization
-        self.app.authorization = ("Basic", ("token", ""))
-        response = self.app.post_json(
-            "/tenders/{}/awards".format(self.tender_id),
-            {"data": {"suppliers": [test_organization], "status": "pending", "bid_id": self.initial_bids[0]["id"]}},
-        )
-        award = response.json["data"]
-        self.award_id = award["id"]
-        self.app.authorization = auth
+        response = self.app.get("/tenders/{}/awards".format(self.tender_id))
+        self.awards_ids = [award["id"] for award in response.json["data"]]
+        self.award_id = self.awards_ids[0]
 
 
 class TenderAwardDocumentWithDSResourceTest(TenderAwardDocumentResourceTest):