From 6ba299fbcf5b30d89fb4f29afc69d7bf3c25e860 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:57:15 +0000 Subject: [PATCH 01/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/risk-assessment-scores-to-delius/tech-docs (#4105) Bump rexml in /projects/risk-assessment-scores-to-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../risk-assessment-scores-to-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/risk-assessment-scores-to-delius/tech-docs/Gemfile.lock b/projects/risk-assessment-scores-to-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From be02339510c0f4192375c4af85726f4c0397e8fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:06:44 +0000 Subject: [PATCH 02/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/resettlement-passport-and-delius/tech-docs (#4106) Bump rexml in /projects/resettlement-passport-and-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../resettlement-passport-and-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/resettlement-passport-and-delius/tech-docs/Gemfile.lock b/projects/resettlement-passport-and-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 2c286a89c160b1cad0e62cbeaf8bf58ceebad308 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:16:58 +0000 Subject: [PATCH 03/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/refer-and-monitor-and-delius/tech-docs (#4107) Bump rexml in /projects/refer-and-monitor-and-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- projects/refer-and-monitor-and-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/refer-and-monitor-and-delius/tech-docs/Gemfile.lock b/projects/refer-and-monitor-and-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 1157142a0093e4b8b91a7486fd79e22d57af1efd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:26:59 +0000 Subject: [PATCH 04/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/probation-search-and-delius/tech-docs (#4108) Bump rexml in /projects/probation-search-and-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- projects/probation-search-and-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/probation-search-and-delius/tech-docs/Gemfile.lock b/projects/probation-search-and-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 0570c7341961f44c633442ee88de0145125c0123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:36:39 +0000 Subject: [PATCH 05/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/prisoner-profile-and-delius/tech-docs (#4109) Bump rexml in /projects/prisoner-profile-and-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- projects/prisoner-profile-and-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/prisoner-profile-and-delius/tech-docs/Gemfile.lock b/projects/prisoner-profile-and-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 1d5f0a55877813d8624d73ab42c1672d7cb929ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:46:37 +0000 Subject: [PATCH 06/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/prison-identifier-and-delius/tech-docs (#4110) Bump rexml in /projects/prison-identifier-and-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- projects/prison-identifier-and-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/prison-identifier-and-delius/tech-docs/Gemfile.lock b/projects/prison-identifier-and-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From dcf12e17f9edee66854803e206f27d3e84d2b9a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:56:12 +0000 Subject: [PATCH 07/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/prison-education-and-delius/tech-docs (#4111) Bump rexml in /projects/prison-education-and-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- projects/prison-education-and-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/prison-education-and-delius/tech-docs/Gemfile.lock b/projects/prison-education-and-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 5a8bb152e7505e07808b6bb4f0834ac4017b8d8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:05:57 +0000 Subject: [PATCH 08/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/prison-custody-status-to-delius/tech-docs (#4112) Bump rexml in /projects/prison-custody-status-to-delius/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../prison-custody-status-to-delius/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/prison-custody-status-to-delius/tech-docs/Gemfile.lock b/projects/prison-custody-status-to-delius/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 8182f3cfd3103d72075d3f17c75f4c0ce75443f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:16:06 +0000 Subject: [PATCH 09/10] Bump rexml from 3.2.8 to 3.3.3 in /projects/prison-case-notes-to-probation/tech-docs (#4113) Bump rexml in /projects/prison-case-notes-to-probation/tech-docs Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../prison-case-notes-to-probation/tech-docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/prison-case-notes-to-probation/tech-docs/Gemfile.lock b/projects/prison-case-notes-to-probation/tech-docs/Gemfile.lock index 0982b087bc..b9e555a0ef 100644 --- 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) From 6ff1e80a0e3308fefbc9ff583de541f0c4870db6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:18:43 +0000 Subject: [PATCH 10/10] Formatting changes --- .../hmpps/service/InterventionServiceTest.kt | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/projects/court-case-and-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/InterventionServiceTest.kt b/projects/court-case-and-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/InterventionServiceTest.kt index 00a3052fa9..ee5bcdf082 100644 --- a/projects/court-case-and-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/InterventionServiceTest.kt +++ b/projects/court-case-and-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/InterventionServiceTest.kt @@ -14,7 +14,7 @@ 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()) } @@ -22,51 +22,66 @@ class InterventionServiceTest { @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()) } }