Merge branch 'PI-2391-fix-ordering-and-recall-withdrawn' of github.co…

…m:ministryofjustice/hmpps-probation-integration-services into PI-2391-fix-ordering-and-recall-withdrawn
ministryofjustice · Aug 2, 2024 · 2f2b517 · 2f2b517
2 parents 508dc65 + 6ff1e80
commit 2f2b517
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 31 deletions.
diff --git a/...nd-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/InterventionServiceTest.kt b/...nd-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/InterventionServiceTest.kt
@@ -14,59 +14,74 @@ class InterventionServiceTest {
     @Test
     fun `toRecallRejectedOrWithdrawn returns true `() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "REC05", "REC05")
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "REC05", "REC05")
         val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus)
         assertEquals(true, nsi.toRecallRejectedOrWithdrawn())
     }
 
     @Test
     fun `toRecallRejectedOrWithdrawn returns false due to no outcome`() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
-        val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = null)
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
+        val nsi =
+            SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = null)
         assertEquals(false, nsi.toRecallRejectedOrWithdrawn())
     }
 
     @Test
     fun `toRecallRejectedOrWithdrawn returns null due to other status enum`() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "OTHER", "OTHER")
-        val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = null)
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "OTHER", "OTHER")
+        val nsi =
+            SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = null)
         assertEquals(null, nsi.toRecallRejectedOrWithdrawn())
     }
 
     @Test
     fun `toRecallRejectedOrWithdrawn returns true due to outcome type enum`() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
         val outcome = ReferenceData("REC02", "REC02", IdGenerator.getAndIncrement())
-        val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = outcome)
+        val nsi = SentenceGenerator.generateBreachNsi(
+            SentenceGenerator.CURRENT_SENTENCE,
+            status = nsiStatus,
+            outcome = outcome
+        )
         assertEquals(true, nsi.toRecallRejectedOrWithdrawn())
     }
 
     @Test
     fun `toOutcome returns null due to null outcome`() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
-        val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = null)
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
+        val nsi =
+            SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = null)
         assertEquals(null, nsi.toOutcomeRecall())
     }
 
     @Test
     fun `toOutcome returns false due to outcome type`() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
         val outcome = ReferenceData("REC02", "REC02", IdGenerator.getAndIncrement())
-        val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = outcome)
+        val nsi = SentenceGenerator.generateBreachNsi(
+            SentenceGenerator.CURRENT_SENTENCE,
+            status = nsiStatus,
+            outcome = outcome
+        )
         assertEquals(false, nsi.toOutcomeRecall())
     }
 
     @Test
     fun `toOutcome returns true due to outcome type`() {
 
-        val nsiStatus =  NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
+        val nsiStatus = NsiStatus(IdGenerator.getAndIncrement(), "REC03", "REC03")
         val outcome = ReferenceData("REC03", "REC03", IdGenerator.getAndIncrement())
-        val nsi = SentenceGenerator.generateBreachNsi(SentenceGenerator.CURRENT_SENTENCE, status = nsiStatus, outcome = outcome)
+        val nsi = SentenceGenerator.generateBreachNsi(
+            SentenceGenerator.CURRENT_SENTENCE,
+            status = nsiStatus,
+            outcome = outcome
+        )
         assertEquals(true, nsi.toOutcomeRecall())
     }
 }

diff --git a/projects/prison-case-notes-to-probation/tech-docs/Gemfile.lock b/projects/prison-case-notes-to-probation/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/prison-custody-status-to-delius/tech-docs/Gemfile.lock b/projects/prison-custody-status-to-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/prison-education-and-delius/tech-docs/Gemfile.lock b/projects/prison-education-and-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/prison-identifier-and-delius/tech-docs/Gemfile.lock b/projects/prison-identifier-and-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/prisoner-profile-and-delius/tech-docs/Gemfile.lock b/projects/prisoner-profile-and-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/probation-search-and-delius/tech-docs/Gemfile.lock b/projects/probation-search-and-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/refer-and-monitor-and-delius/tech-docs/Gemfile.lock b/projects/refer-and-monitor-and-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/resettlement-passport-and-delius/tech-docs/Gemfile.lock b/projects/resettlement-passport-and-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)

diff --git a/projects/risk-assessment-scores-to-delius/tech-docs/Gemfile.lock b/projects/risk-assessment-scores-to-delius/tech-docs/Gemfile.lock
@@ -145,8 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)