Merge pull request #115 from nationalarchives/fix/ewfc-b

Fix EWFC (B) appearing in public-ui
nationalarchives · Jan 22, 2024 · 9191f15 · 9191f15
2 parents 4b45003 + a8b9054
commit 9191f15
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog 1.0.0].
 
+## [Release 1.3.5]
+
+- Fix an issue with EWFC B's name taking priority for the 'ewfc' param
+
 ## [Release 1.3.4]
 
 - Add data for EWFC B

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds_caselaw_utils"
-version = "1.3.4"
+version = "1.3.5"
 description = "Utilities for the National Archives Caselaw project"
 authors = ["Nick Jackson <nick@dxw.com>", "David McKee <dragon@dxw.com>", "Tim Cowlishaw <tim@timcowlishaw.co.uk>", "Laura Porter <laura@dxw.com>"]
 license = "MIT"

diff --git a/src/ds_caselaw_utils/data/court_names.yaml b/src/ds_caselaw_utils/data/court_names.yaml
@@ -352,7 +352,7 @@
       # This is an artifact of how the Family Court creates tiers of importance.
       link: https://www.judiciary.uk/you-and-the-judiciary/going-to-court/family-law-courts/
       ncn: \[(\d{4})\] (EWFC) (B) (\d+)
-      param: "ewfc"
+      param: "ewfc/b"
       start_year: 2009
       end_year: 2022
       selectable: false

diff --git a/src/ds_caselaw_utils/data/schema/courts.schema.json b/src/ds_caselaw_utils/data/schema/courts.schema.json
@@ -23,7 +23,7 @@
           "properties": {
             "code": {
               "type": "string",
-              "pattern": "^[A-Za-z]{2,}(-[A-Za-z]{1,})*$"
+              "pattern": "^[A-Za-z]{2,}(-[A-Za-z]+)*$"
             },
             "name": {
               "type": "string"
@@ -33,13 +33,13 @@
             },
             "param": {
               "type": "string",
-              "pattern": "^[a-z]{2,}(/[a-z]{2,})?$"
+              "pattern": "^[a-z]{2,}(/[a-z]+)?$"
             },
             "extra_params": {
               "type": "array",
               "items": {
                 "type": "string",
-                "pattern": "^[a-z]{2,}(/[a-z]{2,})?$"
+                "pattern": "^[a-z]{2,}(/[a-z]+)?$"
               }
             },
             "ncn": {