ccs-digitalmarketplace-frameworks 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "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

@@ -21,6 +21,10 @@ MANIFESTS = {
         'question_set': 'briefs',
         'manifest': 'award_brief'
     },
+    'evaluations': {
+        'question_set': 'evaluations',
+        'manifest': 'edit_evaluations'
+    }
 }
 
 LEGACY_GCLOUD_LOTS = [
@@ -111,7 +115,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 +127,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 +145,30 @@ 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(
+        "Evaluation",
+        "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": "evaluations",
+    "edit_evaluations": "evaluations"
 }
 
 # `item` property wouldn't usually be part of a brief response but is included here as the dynamic list child question