From aafc7d537fdec166af919d7afd426fffcf5b9802 Mon Sep 17 00:00:00 2001
From: achimber-moj <161360519+achimber-moj@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:30:43 +0000
Subject: [PATCH] PI-1998 - display event number for sentence (#30)

---
 server/data/model/sentenceDetails.ts    | 9 +++++++--
 server/views/pages/sentence.njk         | 2 +-
 wiremock/mappings/X000001-sentence.json | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/data/model/sentenceDetails.ts b/server/data/model/sentenceDetails.ts
index f88680c4..2e1ec669 100644
--- a/server/data/model/sentenceDetails.ts
+++ b/server/data/model/sentenceDetails.ts
@@ -11,10 +11,10 @@ export interface Sentence {
   conviction: Conviction
 }
 export interface OffenceDetails {
-  mainOffence: string
+  mainOffence: Offence
   offenceDate: string
   notes: string
-  additionalOffences: []
+  additionalOffences: Offence[]
 }
 
 export interface Conviction {
@@ -23,3 +23,8 @@ export interface Conviction {
   convictionDate: string
   additionalSentences: string
 }
+
+export interface Offence {
+  code: string
+  description: string
+}
diff --git a/server/views/pages/sentence.njk b/server/views/pages/sentence.njk
index 48b40db2..cefe60de 100644
--- a/server/views/pages/sentence.njk
+++ b/server/views/pages/sentence.njk
@@ -21,7 +21,7 @@
 
 {% block pageContent %}
     {% for sentence in sentenceDetails.sentences %}
-        <h1 class="govuk-heading-l govuk-!-margin-bottom-7" data-qa="pageHeading">Sentence: {{ sentence.eventNumber }}</h1>
+        <h1 class="govuk-heading-l govuk-!-margin-bottom-7" data-qa="pageHeading">Sentence: {{ sentence.offenceDetails.eventNumber }}</h1>
 
         {% set hasAdditionalOffences = sentence.offenceDetails.additionalOffences and sentence.offenceDetails.additionalOffences.length > 0 %}
             {% set additionalOffences %}
diff --git a/wiremock/mappings/X000001-sentence.json b/wiremock/mappings/X000001-sentence.json
index d2a959ea..b2774854 100644
--- a/wiremock/mappings/X000001-sentence.json
+++ b/wiremock/mappings/X000001-sentence.json
@@ -15,8 +15,8 @@
           },
           "sentences": [
             {
-              "eventNumber": 3,
               "offenceDetails": {
+                "eventNumber": 3,
                 "offence": {
                   "description": "Murder",
                   "count": 3
@@ -47,8 +47,8 @@
               }
             },
             {
-              "eventNumber": 1,
               "offenceDetails": {
+                "eventNumber": 1,
                 "offence": {
                   "description": "Another Murder",
                   "count": 1