ccs-digitalmarketplace-frameworks 3.4.0 → 3.5.0

package/frameworks/digital-outcomes-and-specialists-7/manifests/edit_service.yml

@@ -245,3 +245,10 @@
   editable: False
   questions:
   - multiqTradeOrIndustryBodies
+
+- name: Virtual user research studio - Booking
+  editable: False
+  questions:
+    - virtualMinimumStudioTime
+    - virtualStudioBookingCost
+    - virtualMinimumLeadTime

package/frameworks/digital-outcomes-and-specialists-7/manifests/edit_service_as_admin.yml

@@ -273,3 +273,10 @@
   editable: True
   questions:
   - multiqTradeOrIndustryBodies
+
+- name: Virtual user research studio - Booking
+  editable: True
+  questions:
+    - virtualMinimumStudioTime
+    - virtualStudioBookingCost
+    - virtualMinimumLeadTime

package/frameworks/digital-outcomes-and-specialists-7/manifests/edit_submission.yml

@@ -317,3 +317,10 @@
   editable: True
   questions:
   - multiqTradeOrIndustryBodies
+
+- name: Virtual user research studio - Booking
+  editable: True
+  questions:
+    - virtualMinimumStudioTime
+    - virtualStudioBookingCost
+    - virtualMinimumLeadTime

package/frameworks/digital-outcomes-and-specialists-7/questions/services/virtualMinimumLeadTime.yml

@@ -0,0 +1,29 @@
+name: Minimum lead time you need to make a studio booking
+question: What is the minimum lead time you need to make a studio booking?
+
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+
+type: radios
+
+options:
+  - label: "1 day"
+  - label: "2 days"
+  - label: "3 to 5 days"
+  - label: "1 week"
+  - label: "2 weeks"
+  - label: "3 weeks"
+  - label: "1 month"
+  - label: "6 weeks"
+  - label: "More than 6 weeks"
+
+depends_on_follow_up:
+  whatTypesOfUserResearchStudio:
+    - virtual-studio
+
+validations:
+  -
+    name: answer_required
+    message: Select the minimum lead time you need to make a studio booking

package/frameworks/digital-outcomes-and-specialists-7/questions/services/virtualMinimumStudioTime.yml

@@ -0,0 +1,28 @@
+name: Minimum amount of time a studio can be booked for
+question: What is the minimum amount of time a studio can be booked for?
+
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+
+type: radios
+
+options:
+  - label: "1 hour"
+  - label: "2 hours"
+  - label: "3 hours"
+  - label: "4 hours"
+  - label: "5 hours"
+  - label: "6 hours"
+  - label: "7 hours"
+  - label: "8 hours"
+
+depends_on_follow_up:
+  whatTypesOfUserResearchStudio:
+    - virtual-studio
+
+validations:
+  -
+    name: answer_required
+    message: Select the minimum amount of time a studio can be booked for

package/frameworks/digital-outcomes-and-specialists-7/questions/services/virtualStudioBookingCost.yml

@@ -0,0 +1,37 @@
+name: Cost of booking a studio
+question: How much does it cost (excluding VAT) to book a studio?
+
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+
+type: pricing
+fields:
+  price: virtualStudioBookingCostPrice
+  price_unit: virtualStudioBookingCostUnit
+
+units:
+  - label: an hour
+    value: Hour
+  - label: a half day
+    value: Half day
+  - label: a day
+    value: Day
+  - label: a week
+    value: Week
+
+depends_on_follow_up:
+  whatTypesOfUserResearchStudio:
+    - virtual-studio
+
+validations:
+  - name: answer_required
+    field: virtualStudioBookingCostPrice
+    message: Enter how much it costs to book a studio
+  - name: not_money_format
+    field: virtualStudioBookingCostPrice
+    message: Price must be a number, without units, eg 99.95
+  - name: answer_required
+    field: virtualStudioBookingCostUnit
+    message: You must select the unit

package/frameworks/digital-outcomes-and-specialists-7/questions/services/whatTypesOfUserResearchStudio.yml

@@ -21,6 +21,14 @@ depends_on_follow_up:
 dependent_follow_up:
   tradeOrIndustryBodies:
     - virtual-studio
+  virtualMinimumStudioTime:
+    - virtual-studio
+  virtualStudioBookingCostPrice:
+    - virtual-studio
+  virtualStudioBookingCostUnit:
+    - virtual-studio
+  virtualMinimumLeadTime:
+    - virtual-studio
 
 dependent_follow_up_followup:
   tradeOrIndustryBodiesOther:

package/frameworks/digital-outcomes-and-specialists-7/questions/services/whatUserResearchServices.yml

@@ -35,6 +35,14 @@ dependent_follow_up:
     - user-research-studios
   tradeOrIndustryBodies:
     - user-research-studios
+  virtualMinimumStudioTime:
+    - user-research-studios
+  virtualStudioBookingCostPrice:
+    - user-research-studios
+  virtualStudioBookingCostUnit:
+    - user-research-studios
+  virtualMinimumLeadTime:
+    - user-research-studios
 
 dependent_follow_up_followup:
   otherTradeOrIndustryBodiesOther:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/schema_generator/validation.py

@@ -501,8 +501,10 @@ def pricing_property(question):
             )
 
     if 'price_unit' in question.fields:
-        pricing[question.fields['price_unit']] = {
-            "enum": [
+        if question.get('units'):
+            units = [unit.get('value', unit.get('label')) for unit in question.get('units')]
+        else:
+            units = [
                 "Unit",
                 "Person",
                 "Licence",
@@ -516,13 +518,18 @@ def pricing_property(question):
                 "Gigabyte",
                 "Terabyte"
             ]
+
+        pricing[question.fields['price_unit']] = {
+            "enum": units
         }
         if 'price_unit' in question.get('optional_fields', []):
             pricing[question.fields['price_unit']]['enum'].insert(0, "")
 
     if 'price_interval' in question.fields:
-        pricing[question.fields['price_interval']] = {
-            "enum": [
+        if question.get('intervals'):
+            intervals = [interval.get('value', interval.get('label')) for interval in question.get('intervals')]
+        else:
+            intervals = [
                 "Second",
                 "Minute",
                 "Hour",
@@ -533,6 +540,9 @@ def pricing_property(question):
                 "6 months",
                 "Year"
             ]
+
+        pricing[question.fields['price_interval']] = {
+            "enum": intervals
         }
         if 'price_interval' in question.get('optional_fields', []):
             pricing[question.fields['price_interval']]['enum'].insert(0, "")

package/schemas/questions.json

@@ -367,6 +367,42 @@
       "required": [
         "passIfIn"
       ]
+    },
+    "units": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false,
+        "required": [
+          "label"
+        ]
+      }
+    },
+    "intervals": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false,
+        "required": [
+          "label"
+        ]
+      }
     }
   },
   "additionalProperties": false,

package/tests/test_generate_validation_schema.py

@@ -558,8 +558,31 @@ def test_pricing_property_price_unit_and_interval():
     }
     cq = ContentQuestion(manifest)
     result = pricing_property(cq)
-    assert isinstance(result['priceInterval']['enum'], list)
-    assert isinstance(result['priceUnit']['enum'], list)
+    assert result['priceUnit']['enum'] == [
+        "Unit",
+        "Person",
+        "Licence",
+        "User",
+        "Device",
+        "Instance",
+        "Server",
+        "Virtual machine",
+        "Transaction",
+        "Megabyte",
+        "Gigabyte",
+        "Terabyte"
+    ]
+    assert result['priceInterval']['enum'] == [
+        "Second",
+        "Minute",
+        "Hour",
+        "Day",
+        "Week",
+        "Month",
+        "Quarter",
+        "6 months",
+        "Year"
+    ]
 
 
 def test_pricing_property_price_unit_and_interval_optional():
@@ -633,6 +656,80 @@ def test_pricing_property_digit_limits_decimal_place_restriction():
     assert '{1,14}' in result['priceMax']['pattern']
 
 
+def test_pricing_property_price():
+    manifest = {
+        "id": "Test",
+        "type": "pricing",
+        "fields": {
+            "price": "price"
+        }
+    }
+    cq = ContentQuestion(manifest)
+    result = pricing_property(cq)
+    assert not result['price']['pattern'].startswith("^$|")
+
+
+def test_pricing_property_custom_units():
+    manifest = {
+        "id": "Test",
+        "type": "pricing",
+        "fields": {
+            "price": "price",
+            "price_unit": "priceUnit"
+        },
+        "units": [
+            {
+                "label": "Option 1"
+            },
+            {
+                "label": "Option 2",
+                "value": "option-2"
+            },
+            {
+                "label": "Option 3",
+                "value": "option-3"
+            }
+        ]
+    }
+    cq = ContentQuestion(manifest)
+    result = pricing_property(cq)
+    assert result['priceUnit']['enum'] == [
+        "Option 1",
+        "option-2",
+        "option-3"
+    ]
+
+
+def test_pricing_property_custom_intervals():
+    manifest = {
+        "id": "Test",
+        "type": "pricing",
+        "fields": {
+            "price": "price",
+            "price_interval": "priceInterval"
+        },
+        "intervals": [
+            {
+                "label": "Option 1",
+                "value": "option-1"
+            },
+            {
+                "label": "Option 2"
+            },
+            {
+                "label": "Option 3"
+            }
+        ]
+    }
+    cq = ContentQuestion(manifest)
+    result = pricing_property(cq)
+    assert result['priceInterval']['enum'] == [
+        "option-1",
+        "Option 2",
+        "Option 3"
+    ]
+
+
 @given(st.text())
 def test_number_property(id):
     actual = number_property({'id': id, 'type': 'number'})