ccs-digitalmarketplace-frameworks 1.9.1 → 2.0.0

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Records breaking changes from major version bumps
 
+## 2.0.0
+
+Rename evaluations to additional lot questions
+
 ## 1.9.0
 
 Add the Digital Outcomes and Specialists 7 framework

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.9.1",
+  "version": "2.0.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/requirements-dev.txt

@@ -115,7 +115,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.108.2
+hypothesis==6.108.5
     # via -r requirements-dev.in
 idna==3.7
     # via
@@ -189,7 +189,7 @@ pyjwt==2.8.0
     #   notifications-python-client
 pyparsing==2.4.7
     # via packaging
-pytest==8.2.2
+pytest==8.3.2
     # via -r requirements-dev.in
 python-dateutil==2.9.0.post0
     # via

package/schema_generator/validation.py

@@ -21,6 +21,14 @@ MANIFESTS = {
         'question_set': 'briefs',
         'manifest': 'award_brief'
     },
+    'additional-lot-questions': {
+        'question_set': 'additional-lot-questions',
+        'manifest': 'edit_additional_lot_questions'
+    },
+    'evaluations': {
+        'question_set': 'additional-lot-questions',
+        'manifest': 'evaluations'
+    }
 }
 
 LEGACY_GCLOUD_LOTS = [
@@ -111,7 +119,7 @@ BRIEF_EXCLUDED_FRAMEWORKS = [
 ]
 
 
-def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lot=None, exclude_frameworks=[]):
+def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lots=[], exclude_frameworks=[]):
     titles_and_slugs = []
     for family, framework_list in FRAMEWORKS_AND_LOTS.items():
         if framework_family:
@@ -123,10 +131,8 @@ def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lot=
             if framework['framework_slug'] in exclude_frameworks:
                 continue
             for lot_slug, lot_name in framework['lots']:
-                if exclude_lot:
-                    # Some lots don't have briefs/brief response/brief award schemas
-                    if exclude_lot == lot_slug:
-                        continue
+                if lot_slug in exclude_lots:
+                    continue
 
                 titles_and_slugs.append(
                     (
@@ -143,20 +149,40 @@ SCHEMAS = {
     'briefs': _get_schema_title_and_slugs(
         "Brief",
         "digital-outcomes-and-specialists",
-        exclude_lot="user-research-studios",
+        exclude_lots=["user-research-studios"],
         exclude_frameworks=BRIEF_EXCLUDED_FRAMEWORKS
     ),
     'brief-responses': _get_schema_title_and_slugs(
         "Brief Response",
         "digital-outcomes-and-specialists",
-        exclude_lot="user-research-studios",
+        exclude_lots=["user-research-studios"],
         exclude_frameworks=BRIEF_EXCLUDED_FRAMEWORKS
     ),
     'brief-awards': _get_schema_title_and_slugs(
         "Brief Award",
         "digital-outcomes-and-specialists",
-        exclude_lot="user-research-studios",
+        exclude_lots=["user-research-studios"],
         exclude_frameworks=BRIEF_EXCLUDED_FRAMEWORKS
+    ),
+    'evaluations': _get_schema_title_and_slugs(
+        "Evaluate additional lot questions",
+        "digital-outcomes-and-specialists",
+        exclude_lots=[
+            "digital-outcomes",
+            "digital-specialists",
+            "user-research-studios",
+            "user-research-participants",
+        ],
+    ),
+    'additional-lot-questions': _get_schema_title_and_slugs(
+        "Additional lot questions",
+        "digital-outcomes-and-specialists",
+        exclude_lots=[
+            "digital-outcomes",
+            "digital-specialists",
+            "user-research-studios",
+            "user-research-participants",
+        ],
     )
 }
 

package/tests/test_content.py

@@ -33,8 +33,8 @@ MANIFEST_QUESTION_SET = {
     "services_search_filters": "services",
     "download_results": "services",
 
-    "evaluation": "evaluation",
-    "edit_evaluation": "evaluation"
+    "evaluations": "additional-lot-questions",
+    "edit_additional_lot_questions": "additional-lot-questions"
 }
 
 # `item` property wouldn't usually be part of a brief response but is included here as the dynamic list child question
@@ -48,7 +48,7 @@ QUESTION_SET_CONTEXT = {
         'item': 'essential requirement'
     },
     'services': {'lot': 'context-lot'},
-    'evaluation': {'lot': 'context-lot'}
+    'additional-lot-questions': {'lot': 'context-lot'}
 }
 
 EXCLUDED_FRAMEWORKS = [