From d9b15699770df09fbea009d5a315d6941b690dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CJacobHarrisonONS=E2=80=9D?= Date: Wed, 20 Sep 2023 11:04:11 +0100 Subject: [PATCH 1/3] rename NOT_ENGLAND variable to NI_REGION_CODE to make a little more sense with what code is doing --- .../response/casesvc/representation/action/NotifyModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java b/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java index 3b518a93d..f14b52215 100644 --- a/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java +++ b/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java @@ -98,7 +98,7 @@ public static class ClassifiersBuilder { private static final String REMINDER = "REMINDER"; private static final String NOTIFICATION = "NOTIFICATION"; // a region of YY appears to be any region that isnt england - private static final String NOT_ENGLAND = "YY"; + private static final String NI_REGION_CODE = "YY"; private String actionType; private String legalBasis; @@ -115,8 +115,8 @@ public Classifiers build() { return new Classifiers(actionType, "", "", "", ""); } - // if not not england is england. welcome to ras-rm. - if (!NOT_ENGLAND.equals(region)) { + // if NOT NI then England + if (!NI_REGION_CODE.equals(region)) { region = ""; } From c53687339d68817d2984f45d0a7e918ffa25949c Mon Sep 17 00:00:00 2001 From: ras-rm-pr-bot Date: Wed, 20 Sep 2023 10:13:58 +0000 Subject: [PATCH 2/3] auto patch increment --- _infra/helm/case/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index ab7ff97a8..d17f958a9 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.13 +version: 12.0.14 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.13 +appVersion: 12.0.14 From a81a84e581a546f545b1b2da109ccdf18edaba7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CJacobHarrisonONS=E2=80=9D?= Date: Thu, 21 Sep 2023 13:48:40 +0100 Subject: [PATCH 3/3] update comment --- .../ctp/response/casesvc/representation/action/NotifyModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java b/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java index f14b52215..c5d4154e0 100644 --- a/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java +++ b/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java @@ -115,7 +115,7 @@ public Classifiers build() { return new Classifiers(actionType, "", "", "", ""); } - // if NOT NI then England + // if NOT NI then England/Wales if (!NI_REGION_CODE.equals(region)) { region = ""; }