From 4d1180a33bc93ff0ab13299198917642cd739b28 Mon Sep 17 00:00:00 2001
From: Luke Harper <luke.harper@digital.justice.gov.uk>
Date: Wed, 24 May 2023 13:38:29 +0100
Subject: [PATCH 1/2] MDWFP-129 fixing bug with success message.

---
 .DS_Store                               | Bin 0 -> 8196 bytes
 server/model/adjustmentsListModel.ts    |   6 +++++-
 server/routes/adjustmentRoutes.ts       |   6 ++++++
 server/routes/index.ts                  |   1 +
 server/views/pages/adjustments/list.njk |   2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..40455bd5f26d50c154c600508d1c4a3797689c68
GIT binary patch
literal 8196
zcmeHM&5ja55UxhDfWT%kCUP;E7l35nfL-CRiF%O4E3$wrIxvKvO}H5DzJn+4zJeDY
z!IMwoNx!OY*6yAe^<+%w-b~jpQ(srrS5-6VSt3%G+wnP3lZeVVSe{ieWemR0M`{$z
zmB)|@c%luhui|8M9Vgc*?QkJ55Euvy1O@^Ffr0;l0lc$$lylzu`fiv51A&2~WPqO!
z5e}9eBllX$qXUy{0U(RGECc7*2M8uIvSZ|4OMzldy?amws>~KcX*ljjtPa^Ra<8R^
zlhSZf#<DUy6eZSyi$tANN6Rn=1_A?V26*p&LPJ{PZ{qFWxs@((w13DDa2>i^8q*BA
zEgC_#=?$<6Ev%hCBR_e_60~=;q!sMInyan8qh;S&b{eiWtc=(Oy@tgpez{*7U{7%*
zwx>n$a!ni8QsJwo_Xv6kR(}h>RuWS}bNHDEBQ02Be>bqX!}Zu*O}+P4d+^)Uve!WD
zj_3EOYk9;G$24*67N#EN49rZBn+>wV3`fG(5<a)_YeBazp8a<Cu6p=PlvKk9D@#?n
z!Rj%186fTnSc~EL&b1|#V51s{Xd%2#;Vb(*18RXa4qW@y!MU|pDA7~8q9@d&=hUa3
zYfo}wYgfdpDe8tZoK-uV0UJ?+H;F_vKx}-r<sA4`D_O8{4KOg2S{jPAmRRQ6%IgyJ
zmpZi=t$8ct;m}<Uu0k)s#sw<p8Dtw?k3Ckvp@XPPop7ADl7mT}k5VhPj}HaO9kP;)
z9lGXMcV<2jq{r=bO6aQ*)|esYR6k3fezchJwBzY{f0WFZ$lPIg8uO&vHD4mj&2OJu
zFHgVl(=4Sm{tK<;P0HGdJReqI4^`!I&2`~$U9okuDv&$N>Brh#FARk3wNzk=C4TBT
zxH>Z_z5j=7a929W1B*c(3j_CbpiSQY_wv909}68J&cMJ?GN6jxe)kfgtDNw8uN~od
zg@Xs{?X?sLCfSZd%61&`?jMFYkD$t!j*)vUaRuX_e+UTgfBlIjy#J;Cj&=G8Mce7Y

literal 0
HcmV?d00001

diff --git a/server/model/adjustmentsListModel.ts b/server/model/adjustmentsListModel.ts
index 62c9fe14..0cffb27b 100644
--- a/server/model/adjustmentsListModel.ts
+++ b/server/model/adjustmentsListModel.ts
@@ -11,12 +11,16 @@ export type Message = {
 export default class AdjustmentsListViewModel {
   public adjustmentTypes = adjustmentTypes
 
+  public messageType: AdjustmentType
+
   constructor(
     public prisonerDetail: PrisonApiPrisoner,
     public adjustments: Adjustment[],
     public relevantRemand: Remand[],
     public message: Message,
-  ) {}
+  ) {
+    this.messageType = message && this.adjustmentTypes.find(it => message.type)
+  }
 
   public deductions(): AdjustmentType[] {
     return this.adjustmentTypes.filter(it =>
diff --git a/server/routes/adjustmentRoutes.ts b/server/routes/adjustmentRoutes.ts
index 7cc90029..ab327ade 100644
--- a/server/routes/adjustmentRoutes.ts
+++ b/server/routes/adjustmentRoutes.ts
@@ -29,6 +29,12 @@ export default class AdjustmentRoutes {
     })
   }
 
+  public success: RequestHandler = async (req, res): Promise<void> => {
+    const { nomsId } = req.params
+    req.flash('message', req.query.message as string)
+    return res.redirect(`/${nomsId}`)
+  }
+
   public list: RequestHandler = async (req, res): Promise<void> => {
     const { caseloads, token } = res.locals.user
     const { nomsId } = req.params
diff --git a/server/routes/index.ts b/server/routes/index.ts
index 036152c7..15e516b8 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -26,6 +26,7 @@ export default function routes(service: Services): Router {
   get('/:nomsId/start', adjustmentRoutes.start)
   get('/:nomsId', adjustmentRoutes.list)
   get('/:nomsId/remand', adjustmentRoutes.remand)
+  get('/:nomsId/success', adjustmentRoutes.success)
 
   get('/test/:nomsId', adjustmentTestRoutes.list)
   get('/test/:nomsId/create', adjustmentTestRoutes.create)
diff --git a/server/views/pages/adjustments/list.njk b/server/views/pages/adjustments/list.njk
index c2c1902c..c9059d0d 100644
--- a/server/views/pages/adjustments/list.njk
+++ b/server/views/pages/adjustments/list.njk
@@ -15,7 +15,7 @@
                     </div>
                     <div class="govuk-notification-banner__content">
                         <h3 class="govuk-notification-banner__heading">
-                            {{model.message.days}} days of {{model.message.type.shortText}} have been applied
+                            {{model.message.days}} days of {{model.messageType.shortText}} have been applied
                             </h3>
                         <p class="govuk-body">The adjustments have been saved in NOMIS. You can continue to add adjustments for {{model.prisonerDetail.firstName | title}}
                             {{model.prisonerDetail.lastName | title}}.</p>

From 8fbbaca32d7df1e4dbf914ba89f766ffdf7497d5 Mon Sep 17 00:00:00 2001
From: Luke Harper <luke.harper@digital.justice.gov.uk>
Date: Wed, 24 May 2023 13:41:01 +0100
Subject: [PATCH 2/2] MDWFP-129 fix code.

---
 server/model/adjustmentsListModel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/model/adjustmentsListModel.ts b/server/model/adjustmentsListModel.ts
index 0cffb27b..dd3d97bb 100644
--- a/server/model/adjustmentsListModel.ts
+++ b/server/model/adjustmentsListModel.ts
@@ -19,7 +19,7 @@ export default class AdjustmentsListViewModel {
     public relevantRemand: Remand[],
     public message: Message,
   ) {
-    this.messageType = message && this.adjustmentTypes.find(it => message.type)
+    this.messageType = message && this.adjustmentTypes.find(it => it.value === message.type)
   }
 
   public deductions(): AdjustmentType[] {