From 435cb5413ac9b5e123ae54b551c5ebb60c068abc Mon Sep 17 00:00:00 2001
From: Amardeep Chimber <amardeep.chimber@digital.justice.gov.uk>
Date: Wed, 9 Oct 2024 17:53:20 +0100
Subject: [PATCH 1/4] MAN-23 - add missing acceptance criteria

---
 integration_tests/e2e/recentCases.cy.ts      |  1 +
 server/views/pages/caseload/recent-cases.njk | 18 +++++++++++--
 server/views/pages/overview.njk              |  7 ++++-
 wiremock/mappings/X778160-full.json          | 27 --------------------
 wiremock/mappings/caseload.json              |  4 +--
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/integration_tests/e2e/recentCases.cy.ts b/integration_tests/e2e/recentCases.cy.ts
index c502f900..adf2b685 100644
--- a/integration_tests/e2e/recentCases.cy.ts
+++ b/integration_tests/e2e/recentCases.cy.ts
@@ -12,6 +12,7 @@ context('Recent Cases', () => {
           dob: '9 January 2002',
           age: 22,
           tierScore: 'B2',
+          numberOfSentences: '2',
           sentence: '12 month Community order',
         }
 
diff --git a/server/views/pages/caseload/recent-cases.njk b/server/views/pages/caseload/recent-cases.njk
index 2b34aee8..56b9f39b 100644
--- a/server/views/pages/caseload/recent-cases.njk
+++ b/server/views/pages/caseload/recent-cases.njk
@@ -51,9 +51,23 @@
                         rd3.className = "govuk-table__cell"
                         rd3.innerText = recentCase.tierScore
 
-                        const rd4 = document.createElement("td")
+                        let rd4 = document.createElement("td")
                         rd4.className = "govuk-table__cell"
-                        rd4.innerText = recentCase.sentence
+
+                        if (recentCase.numberOfSentences > 1) {
+                            const anchorSentence = document.createElement("a")
+                            anchorSentence.className ="govuk-link"
+                            anchorSentence.href = "./case/" + recentCase.crn + "/sentence"
+                            anchorSentence.text = "+ " + recentCase.numberOfSentences + " more"
+
+                            rd4.innerText = recentCase.sentence
+                            rd4.appendChild(document.createElement("br"))
+                            rd4.appendChild(anchorSentence)
+
+                        } else {
+                            rd4.innerText = recentCase.sentence
+                        }
+
 
                         row.appendChild(rd1)
                         row.appendChild(rd2)
diff --git a/server/views/pages/overview.njk b/server/views/pages/overview.njk
index 7ca25ce9..370badf8 100644
--- a/server/views/pages/overview.njk
+++ b/server/views/pages/overview.njk
@@ -447,6 +447,8 @@
     <input type="hidden" id="dob" name="dob" value="{{ headerDob | dateWithYear }}">
     <input type="hidden" id="age" name="age" value="{{ headerDob | yearsSince }}">
     <input type="hidden" id="tier" name="age" value="{{ tierCalculation.tierScore }}">
+    <input type="hidden" id="numberOfSentences" name="numberOfSentences" value="{{ numberOfSentences }}">
+
 
     <script nonce="{{ cspNonce }}">
         const crn = document.getElementById("caseCrn").value
@@ -455,6 +457,7 @@
         const age = document.getElementById("age").value
         const tier = document.getElementById("tier").value
         const sentence = document.getElementById("sentence").value
+        const numberOfSentences = document.getElementById("numberOfSentences").value
 
         let recentCases = []
         let recentCase
@@ -475,10 +478,12 @@
             dob: dob,
             age: age,
             tierScore: tier,
-            sentence: sentence
+            sentence: sentence,
+            numberOfSentences: numberOfSentences
         };
 
         recentCases.unshift(recentCase)
+        recentCases.splice(25)
         localStorage.setItem('recentCases', JSON.stringify(recentCases))
     </script>
 {% endblock %}
diff --git a/wiremock/mappings/X778160-full.json b/wiremock/mappings/X778160-full.json
index c46babc5..8194e4e1 100644
--- a/wiremock/mappings/X778160-full.json
+++ b/wiremock/mappings/X778160-full.json
@@ -52,33 +52,6 @@
                 "scheduled": 2,
                 "totalDays": 16
               }
-            },
-            {
-              "additionalOffences": [
-                {
-                  "code": "9087",
-                  "description": "Burglary - 9087"
-                },
-                {
-                  "code": "9876",
-                  "description": "Arson - 9876"
-                }
-              ],
-              "eventNumber": "2",
-              "mainOffence": {
-                "code": "18502",
-                "description": "(Having possession a picklock or other implement with intent to break into any premises - 18502)"
-              },
-              "order": {
-                "description": "ORA Community Order",
-                "endDate": "2024-09-01",
-                "startDate": "2020-03-02"
-              },
-              "rar": {
-                "completed": 9,
-                "scheduled": 1,
-                "totalDays": 10
-              }
             }
           ],
           "activity": {
diff --git a/wiremock/mappings/caseload.json b/wiremock/mappings/caseload.json
index 9bab3de7..242f844d 100644
--- a/wiremock/mappings/caseload.json
+++ b/wiremock/mappings/caseload.json
@@ -44,7 +44,7 @@
                 "description": "AP PA - Accommodation"
               },
               "latestSentence": "CJA - Std Determinate Custody",
-              "numberOfAdditionalSentences": 2
+              "numberOfAdditionalSentences": 0
             },
             {
               "caseName": {
@@ -71,7 +71,7 @@
               "crn": "X000001",
               "dob": "2002-01-09",
               "latestSentence": "12 month Community order",
-              "numberOfAdditionalSentences": 0
+              "numberOfAdditionalSentences": 2
             },
             {
               "caseName": {

From 3193af39244ce868bb3d2d441a4ca07f6f207074 Mon Sep 17 00:00:00 2001
From: Amardeep Chimber <amardeep.chimber@digital.justice.gov.uk>
Date: Wed, 9 Oct 2024 18:13:13 +0100
Subject: [PATCH 2/4] MAN-23 - add missing acceptance criteria

---
 integration_tests/e2e/recentCases.cy.ts      | 2 +-
 server/views/pages/caseload/recent-cases.njk | 4 ++--
 server/views/pages/overview.njk              | 6 +++---
 wiremock/mappings/caseload.json              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/integration_tests/e2e/recentCases.cy.ts b/integration_tests/e2e/recentCases.cy.ts
index adf2b685..cfe5a740 100644
--- a/integration_tests/e2e/recentCases.cy.ts
+++ b/integration_tests/e2e/recentCases.cy.ts
@@ -12,7 +12,7 @@ context('Recent Cases', () => {
           dob: '9 January 2002',
           age: 22,
           tierScore: 'B2',
-          numberOfSentences: '2',
+          numberOfAdditionalSentences: '1',
           sentence: '12 month Community order',
         }
 
diff --git a/server/views/pages/caseload/recent-cases.njk b/server/views/pages/caseload/recent-cases.njk
index 56b9f39b..a05f272e 100644
--- a/server/views/pages/caseload/recent-cases.njk
+++ b/server/views/pages/caseload/recent-cases.njk
@@ -54,11 +54,11 @@
                         let rd4 = document.createElement("td")
                         rd4.className = "govuk-table__cell"
 
-                        if (recentCase.numberOfSentences > 1) {
+                        if (recentCase.numberOfAdditionalSentences > 0) {
                             const anchorSentence = document.createElement("a")
                             anchorSentence.className ="govuk-link"
                             anchorSentence.href = "./case/" + recentCase.crn + "/sentence"
-                            anchorSentence.text = "+ " + recentCase.numberOfSentences + " more"
+                            anchorSentence.text = "+ " + recentCase.numberOfAdditionalSentences + " more"
 
                             rd4.innerText = recentCase.sentence
                             rd4.appendChild(document.createElement("br"))
diff --git a/server/views/pages/overview.njk b/server/views/pages/overview.njk
index 370badf8..83f75991 100644
--- a/server/views/pages/overview.njk
+++ b/server/views/pages/overview.njk
@@ -447,7 +447,7 @@
     <input type="hidden" id="dob" name="dob" value="{{ headerDob | dateWithYear }}">
     <input type="hidden" id="age" name="age" value="{{ headerDob | yearsSince }}">
     <input type="hidden" id="tier" name="age" value="{{ tierCalculation.tierScore }}">
-    <input type="hidden" id="numberOfSentences" name="numberOfSentences" value="{{ numberOfSentences }}">
+    <input type="hidden" id="numberOfAdditionalSentences" name="numberOfSentences" value="{{ numberOfSentences - 1 }}">
 
 
     <script nonce="{{ cspNonce }}">
@@ -457,7 +457,7 @@
         const age = document.getElementById("age").value
         const tier = document.getElementById("tier").value
         const sentence = document.getElementById("sentence").value
-        const numberOfSentences = document.getElementById("numberOfSentences").value
+        const numberOfAdditionalSentences = document.getElementById("numberOfAdditionalSentences").value
 
         let recentCases = []
         let recentCase
@@ -479,7 +479,7 @@
             age: age,
             tierScore: tier,
             sentence: sentence,
-            numberOfSentences: numberOfSentences
+            numberOfAdditionalSentences: numberOfAdditionalSentences
         };
 
         recentCases.unshift(recentCase)
diff --git a/wiremock/mappings/caseload.json b/wiremock/mappings/caseload.json
index 242f844d..f605c944 100644
--- a/wiremock/mappings/caseload.json
+++ b/wiremock/mappings/caseload.json
@@ -71,7 +71,7 @@
               "crn": "X000001",
               "dob": "2002-01-09",
               "latestSentence": "12 month Community order",
-              "numberOfAdditionalSentences": 2
+              "numberOfAdditionalSentences": 1
             },
             {
               "caseName": {

From 9fd1a6c083bd49a9088b2f37faa674b873e5e192 Mon Sep 17 00:00:00 2001
From: Amardeep Chimber <amardeep.chimber@digital.justice.gov.uk>
Date: Wed, 9 Oct 2024 18:32:14 +0100
Subject: [PATCH 3/4] MAN-23 - update unit test

---
 integration_tests/e2e/recentCases.cy.ts | 48 +++++++++++++++----------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/integration_tests/e2e/recentCases.cy.ts b/integration_tests/e2e/recentCases.cy.ts
index cfe5a740..33e4075c 100644
--- a/integration_tests/e2e/recentCases.cy.ts
+++ b/integration_tests/e2e/recentCases.cy.ts
@@ -5,18 +5,27 @@ context('Recent Cases', () => {
   it('Recent Cases page is rendered', () => {
     cy.visit('/recent-cases', {
       onBeforeLoad(win) {
-        const recentCases = []
-        const recentCase = {
-          name: 'Wolff,Caroline',
-          crn: 'X000001',
-          dob: '9 January 2002',
-          age: 22,
-          tierScore: 'B2',
-          numberOfAdditionalSentences: '1',
-          sentence: '12 month Community order',
-        }
-
-        recentCases.push(recentCase)
+        const recentCases = [
+          {
+            name: 'Wolff,Caroline',
+            crn: 'X000001',
+            dob: '9 January 2002',
+            age: 22,
+            tierScore: 'B2',
+            numberOfAdditionalSentences: '1',
+            sentence: '12 month Community order',
+          },
+          {
+            name: 'Berge,Alton',
+            crn: 'X778160',
+            dob: '12 March 2012',
+            age: 12,
+            tierScore: 'A3',
+            numberOfAdditionalSentences: '0',
+            sentence: 'CJA - Std Determinate Custody',
+          },
+        ]
+
         win.localStorage.setItem('recentCases', JSON.stringify(recentCases))
       },
     })
@@ -47,11 +56,14 @@ context('Recent Cases', () => {
     cy.get('@row1col2').within(() => cy.contains('9 January 2002'))
     cy.get('@row1col2').within(() => cy.contains('span', 22))
 
-    cy.get('tbody')
-      .eq(0)
-      .within(() => cy.get('td').eq(2).should('contain.text', 'B2'))
-    cy.get('tbody')
-      .eq(0)
-      .within(() => cy.get('td').eq(3).should('contain.text', '12 month Community order'))
+    cy.get('tbody').within(() => cy.get('td').eq(2).should('contain.text', 'B2'))
+    cy.get('tbody').within(() => cy.get('td').eq(3).should('contain.text', '12 month Community order'))
+
+    cy.get('tbody').within(() =>
+      cy
+        .get('tr')
+        .eq(1)
+        .within(() => cy.get('td').eq(3).should('contain.text', 'CJA - Std Determinate Custody')),
+    )
   })
 })

From dd605679dbf5f3579d313642e9f13fc8f17a3e65 Mon Sep 17 00:00:00 2001
From: Amardeep Chimber <amardeep.chimber@digital.justice.gov.uk>
Date: Wed, 9 Oct 2024 18:38:18 +0100
Subject: [PATCH 4/4] MAN-23 - update unit test

---
 integration_tests/e2e/recentCases.cy.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/integration_tests/e2e/recentCases.cy.ts b/integration_tests/e2e/recentCases.cy.ts
index 33e4075c..be1cadf4 100644
--- a/integration_tests/e2e/recentCases.cy.ts
+++ b/integration_tests/e2e/recentCases.cy.ts
@@ -59,6 +59,13 @@ context('Recent Cases', () => {
     cy.get('tbody').within(() => cy.get('td').eq(2).should('contain.text', 'B2'))
     cy.get('tbody').within(() => cy.get('td').eq(3).should('contain.text', '12 month Community order'))
 
+    cy.get('tbody').within(() =>
+      cy
+        .get('tr')
+        .eq(0)
+        .within(() => cy.get('a').eq(1).invoke('attr', 'href').should('equal', './case/X000001/sentence')),
+    )
+
     cy.get('tbody').within(() =>
       cy
         .get('tr')