From 90be6df52fde414e298f6fcf296998ae30eb600f Mon Sep 17 00:00:00 2001
From: Marcus Aspin <maspin@unilink.com>
Date: Thu, 28 Nov 2024 15:56:10 +0000
Subject: [PATCH] PI-2611 Update additional registrations from OASys risks
 (#4471)

---
 .idea/codeStyles/Project.xml                  |  18 ++
 .../justice/digital/hmpps/data/DataLoader.kt  |  55 +++-
 .../hmpps/data/generator/PersonGenerator.kt   |  20 +-
 .../data/generator/ReferenceDataGenerator.kt  |   6 +-
 .../data/generator/RegistrationGenerator.kt   |  36 +--
 .../assessment-summary-produced-F123456.json  |  12 -
 .../assessment-summary-produced-G123456.json  |  12 -
 .../assessment-summary-produced-H123456.json  |  12 -
 .../assessment-summary-produced-L123456.json  |  12 -
 .../assessment-summary-produced-M123456.json  |  12 -
 .../assessment-summary-produced-N123456.json  |  12 -
 .../assessment-summary-produced-O123456.json  |  12 -
 ....json => assessment-summary-produced.json} |   2 +-
 ...mary-N123456.json => A000001-no-rosh.json} |   4 +-
 ...ary-L123456.json => A000002-low-rosh.json} |   4 +-
 ...-M123456.json => A000003-medium-rosh.json} |   4 +-
 ...ry-F123456.json => A000004-high-rosh.json} |   4 +-
 ...ary-E123456.json => A000006-no-event.json} |   4 +-
 ...G123456.json => A000007-soft-deleted.json} |   4 +-
 ...mmary-O123456.json => A000008-prison.json} |   4 +-
 .../A000009-high-risk-to-children.json        | 127 +++++++++
 .../__files/A000010-multiple-risks.json       | 127 +++++++++
 .../__files/A000011-multiple-risks.json       | 127 +++++++++
 ...456.json => Z999999-no-delius-record.json} |   4 +-
 .../simulations/mappings/oasys-mappings.json  |  71 +++--
 .../justice/digital/hmpps/IntegrationTest.kt  | 247 ++++++++++++++----
 .../justice/digital/hmpps/enum/RiskLevel.kt   |  12 +
 .../hmpps/enum/RiskOfSeriousHarmType.kt       |   9 +
 .../justice/digital/hmpps/enum/RiskType.kt    |  15 ++
 .../delius/person/entity/Registration.kt      |  12 +
 .../referencedata/entity/ReferenceData.kt     |   7 +-
 .../hmpps/service/DomainEventService.kt       |  34 +++
 .../digital/hmpps/service/RiskService.kt      | 165 ++++++------
 33 files changed, 924 insertions(+), 282 deletions(-)
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-F123456.json
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-G123456.json
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-H123456.json
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-L123456.json
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-M123456.json
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-N123456.json
 delete mode 100644 projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-O123456.json
 rename projects/assessment-summary-and-delius/src/dev/resources/messages/{assessment-summary-produced-E123456.json => assessment-summary-produced.json} (69%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-N123456.json => A000001-no-rosh.json} (98%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-L123456.json => A000002-low-rosh.json} (97%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-M123456.json => A000003-medium-rosh.json} (98%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-F123456.json => A000004-high-rosh.json} (98%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-E123456.json => A000006-no-event.json} (98%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-G123456.json => A000007-soft-deleted.json} (98%)
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-O123456.json => A000008-prison.json} (98%)
 create mode 100644 projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000009-high-risk-to-children.json
 create mode 100644 projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000010-multiple-risks.json
 create mode 100644 projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000011-multiple-risks.json
 rename projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/{assessment-summary-H123456.json => Z999999-no-delius-record.json} (98%)
 create mode 100644 projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskLevel.kt
 create mode 100644 projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskOfSeriousHarmType.kt
 create mode 100644 projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskType.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6247f5c3b5..983f9352f2 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,6 +3,24 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <SqlCodeStyleSettings version="7">
+      <option name="KEYWORD_CASE" value="1" />
+      <option name="IDENTIFIER_CASE" value="1" />
+      <option name="SUBQUERY_OPENING" value="1" />
+      <option name="SUBQUERY_CONTENT" value="1" />
+      <option name="SUBQUERY_CLOSING" value="1" />
+      <option name="SUBQUERY_PAR_SPACE_INSIDE" value="true" />
+      <option name="FROM_INDENT_JOIN" value="false" />
+      <option name="FROM_ONLY_JOIN_INDENT" value="2" />
+      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
+      <option name="EXPR_CASE_END" value="9" />
+    </SqlCodeStyleSettings>
+    <codeStyleSettings language="SQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <indentOptions>
+        <option name="TAB_SIZE" value="8" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
diff --git a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt
index 5303cd963f..fcbfc7e776 100644
--- a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt
+++ b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt
@@ -8,10 +8,13 @@ import org.springframework.context.ApplicationListener
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
 import uk.gov.justice.digital.hmpps.data.generator.*
+import uk.gov.justice.digital.hmpps.enum.RiskLevel
+import uk.gov.justice.digital.hmpps.enum.RiskOfSeriousHarmType
+import uk.gov.justice.digital.hmpps.enum.RiskOfSeriousHarmType.*
+import uk.gov.justice.digital.hmpps.enum.RiskType
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.Event
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.Person
-import uk.gov.justice.digital.hmpps.service.Risk
 import uk.gov.justice.digital.hmpps.set
 import uk.gov.justice.digital.hmpps.user.AuditUserRepository
 import java.time.LocalDate
@@ -33,7 +36,12 @@ class DataLoader(
         saveAll(*ReferenceDataGenerator.BUSINESS_INTERACTIONS.toTypedArray())
         saveAll(*ReferenceDataGenerator.COURTS.toTypedArray())
         saveAll(*ReferenceDataGenerator.OFFENCES.toTypedArray())
-        saveAll(ReferenceDataGenerator.FLAG_DATASET, ReferenceDataGenerator.DEFAULT_FLAG)
+        saveAll(
+            ReferenceDataGenerator.FLAG_DATASET,
+            ReferenceDataGenerator.ROSH_FLAG,
+            ReferenceDataGenerator.SAFEGUARDING_FLAG
+        )
+        saveAll(ReferenceDataGenerator.LEVELS_DATASET, *ReferenceDataGenerator.LEVELS.toTypedArray())
         saveAll(*ContactGenerator.TYPES.values.toTypedArray())
         saveAll(*RegistrationGenerator.TYPES.values.toTypedArray())
         saveAll(*ReferenceDataGenerator.REQ_MAIN_CATS.toTypedArray())
@@ -43,18 +51,26 @@ class DataLoader(
         )
         saveAll(ReferenceDataGenerator.DISPOSAL_TYPE)
 
-        PersonGenerator.NO_RISK.withEvent().withRisk(Risk.M, Risk.L)
-        PersonGenerator.LOW_RISK
+        PersonGenerator.NO_ROSH.withEvent().withRiskOfSeriousHarm(M, L)
+        PersonGenerator.LOW_ROSH
             .withEvent()
-            .withRisk(Risk.M, Risk.H)
-            .withAssessment("10096930")
+            .withRiskOfSeriousHarm(M, H)
+            .withAssessment("2")
             .withAccreditedProgramRequirement()
-        PersonGenerator.MEDIUM_RISK.withEvent().withRisk(Risk.M)
-        PersonGenerator.HIGH_RISK.withEvent().withRisk(Risk.L, Risk.H)
-        PersonGenerator.VERY_HIGH_RISK.withEvent().withRisk(Risk.L, Risk.M, Risk.H)
+        PersonGenerator.MEDIUM_ROSH.withEvent().withRiskOfSeriousHarm(M)
+        PersonGenerator.HIGH_ROSH.withEvent().withRiskOfSeriousHarm(L, H)
+        PersonGenerator.VERY_HIGH_ROSH.withEvent().withRiskOfSeriousHarm(L, M, H)
         saveAll(PersonGenerator.PERSON_NO_EVENT)
-        PersonGenerator.PERSON_SOFT_DELETED_EVENT.withEvent(softDeleted = true).withRisk(Risk.L, Risk.M, Risk.H)
+        PersonGenerator.PERSON_SOFT_DELETED_EVENT.withEvent(softDeleted = true).withRiskOfSeriousHarm(L, M, H)
         PersonGenerator.PRISON_ASSESSMENT.withEvent(custodial = true)
+        PersonGenerator.NO_EXISTING_RISKS.withEvent()
+        PersonGenerator.EXISTING_RISKS.withEvent().withRisks(
+            RiskType.CHILDREN to RiskLevel.H,
+            RiskType.STAFF to RiskLevel.V,
+            RiskType.KNOWN_ADULT to RiskLevel.M,
+            RiskType.PUBLIC to RiskLevel.M,
+        )
+        PersonGenerator.FEATURE_FLAG.withEvent().withRiskOfSeriousHarm(V)
     }
 
     private fun Person.withEvent(softDeleted: Boolean = false, custodial: Boolean = false): Person {
@@ -79,11 +95,11 @@ class DataLoader(
         return this
     }
 
-    private fun Person.withRisk(vararg risks: Risk): Person {
-        risks.forEach {
+    private fun Person.withRiskOfSeriousHarm(vararg riskOfSeriousHarmTypes: RiskOfSeriousHarmType): Person {
+        riskOfSeriousHarmTypes.forEach {
             val type = RegistrationGenerator.TYPES[it.code]
             val contact = entityManager.merge(ContactGenerator.generateContact(this, type!!.registrationContactType!!))
-            val registration = RegistrationGenerator.generate(this.id, LocalDate.parse("2023-06-14"), type, contact)
+            val registration = RegistrationGenerator.generate(this.id, LocalDate.parse("2023-06-14"), contact, type)
             val reviewContact = entityManager.merge(ContactGenerator.generateContact(this, type.reviewContactType!!))
             highestRiskColour = type.colour
             saveAll(this, registration.withReview(reviewContact))
@@ -91,6 +107,19 @@ class DataLoader(
         return this
     }
 
+    private fun Person.withRisks(vararg risks: Pair<RiskType, RiskLevel>): Person {
+        risks.forEach { risk ->
+            val type = RegistrationGenerator.TYPES[risk.first.code]
+            val level = ReferenceDataGenerator.LEVELS.single { it.code == risk.second.code }
+            val contact = entityManager.merge(ContactGenerator.generateContact(this, type!!.registrationContactType!!))
+            val registration =
+                RegistrationGenerator.generate(this.id, LocalDate.parse("2023-06-14"), contact, type, level)
+            val reviewContact = entityManager.merge(ContactGenerator.generateContact(this, type.reviewContactType!!))
+            saveAll(this, registration.withReview(reviewContact))
+        }
+        return this
+    }
+
     private fun Person.withAccreditedProgramRequirement(): Person {
         saveAll(PersonGenerator.generateRequirement(this))
         return this
diff --git a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PersonGenerator.kt b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PersonGenerator.kt
index 694a8ffbf4..23d42d3e2c 100644
--- a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PersonGenerator.kt
+++ b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PersonGenerator.kt
@@ -4,14 +4,18 @@ import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.*
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceData
 
 object PersonGenerator {
-    val NO_RISK = generate("N123456")
-    val LOW_RISK = generate("L123456")
-    val MEDIUM_RISK = generate("M123456")
-    val HIGH_RISK = generate("H123456")
-    val VERY_HIGH_RISK = generate("V123456")
-    val PERSON_NO_EVENT = generate("E123456")
-    val PERSON_SOFT_DELETED_EVENT = generate("F123456")
-    val PRISON_ASSESSMENT = generate("O123456")
+    val NO_ROSH = generate("A000001")
+    val LOW_ROSH = generate("A000002")
+    val MEDIUM_ROSH = generate("A000003")
+    val HIGH_ROSH = generate("A000004")
+    val VERY_HIGH_ROSH = generate("A000005")
+    val PERSON_NO_EVENT = generate("A000006")
+    val PERSON_SOFT_DELETED_EVENT = generate("A000007")
+    val PRISON_ASSESSMENT = generate("A000008")
+
+    val NO_EXISTING_RISKS = generate("A000009")
+    val EXISTING_RISKS = generate("A000010")
+    val FEATURE_FLAG = generate("A000011")
 
     fun generate(
         crn: String,
diff --git a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt
index 9e6c500987..98e61c67be 100644
--- a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt
+++ b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ReferenceDataGenerator.kt
@@ -1,6 +1,7 @@
 package uk.gov.justice.digital.hmpps.data.generator
 
 import uk.gov.justice.digital.hmpps.audit.BusinessInteraction
+import uk.gov.justice.digital.hmpps.enum.RiskLevel
 import uk.gov.justice.digital.hmpps.integrations.delius.audit.BusinessInteractionCode
 import uk.gov.justice.digital.hmpps.integrations.delius.court.entity.Court
 import uk.gov.justice.digital.hmpps.integrations.delius.court.entity.Offence
@@ -19,7 +20,10 @@ object ReferenceDataGenerator {
         )
     }
     val FLAG_DATASET = generateDataset(Dataset.Code.REGISTER_TYPE_FLAG.value)
-    val DEFAULT_FLAG = generateReferenceData("1", dataset = FLAG_DATASET)
+    val ROSH_FLAG = generateReferenceData("1", "RoSH", FLAG_DATASET)
+    val SAFEGUARDING_FLAG = generateReferenceData("3", "Safeguarding", FLAG_DATASET)
+    val LEVELS_DATASET = generateDataset(Dataset.Code.REGISTER_LEVEL.value)
+    val LEVELS = RiskLevel.entries.map { generateReferenceData(it.code, it.name, dataset = LEVELS_DATASET) }
     val OFFENCES = listOf("80400", "00857").map { generateOffence(it) }
     val COURTS = listOf("CRT150", "LVRPCC").map { generateCourt(it) }
     val REQ_MAIN_CATS = listOf("RM38").map { generateReqMainCat(it) }
diff --git a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/RegistrationGenerator.kt b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/RegistrationGenerator.kt
index 5b45700811..c3f1f1104d 100644
--- a/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/RegistrationGenerator.kt
+++ b/projects/assessment-summary-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/RegistrationGenerator.kt
@@ -1,46 +1,52 @@
 package uk.gov.justice.digital.hmpps.data.generator
 
+import uk.gov.justice.digital.hmpps.data.generator.ReferenceDataGenerator.ROSH_FLAG
+import uk.gov.justice.digital.hmpps.enum.RiskOfSeriousHarmType
+import uk.gov.justice.digital.hmpps.enum.RiskType
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.Contact
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.RegisterType
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.Registration
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceData
-import uk.gov.justice.digital.hmpps.service.Risk
 import java.time.LocalDate
 
 object RegistrationGenerator {
 
-    val TYPES = Risk.entries.map {
-        generateType(
-            it.code, colour = when (it) {
-                Risk.V -> "Red"
-                Risk.H -> "Orange"
-                Risk.M -> "Amber"
-                Risk.L -> "Green"
-            }
-        )
-    }.associateBy { it.code }
+    val TYPES = listOf(
+        RiskOfSeriousHarmType.entries.map { generateType(it.code, it.colour, flag = ROSH_FLAG) },
+        RiskType.entries.map { generateType(it.code, "Amber", "Risk to ${it.name.lowercase()}") }
+    ).flatten().associateBy { it.code }
+
+    val RiskOfSeriousHarmType.colour
+        get() = when (this) {
+            RiskOfSeriousHarmType.V -> "Red"
+            RiskOfSeriousHarmType.H -> "Orange"
+            RiskOfSeriousHarmType.M -> "Amber"
+            RiskOfSeriousHarmType.L -> "Green"
+        }
 
     fun generate(
         personId: Long,
         date: LocalDate,
-        type: RegisterType,
         contact: Contact,
+        type: RegisterType,
+        level: ReferenceData? = null,
         teamId: Long = ProviderGenerator.DEFAULT_TEAM_ID,
         staffId: Long = ProviderGenerator.DEFAULT_STAFF_ID,
         nextReviewDate: LocalDate? = type.reviewPeriod?.let { date.plusMonths(it) },
+        notes: String? = null,
         softDeleted: Boolean = false,
         id: Long = IdGenerator.getAndIncrement()
-    ) = Registration(personId, date, contact, teamId, staffId, type, nextReviewDate, softDeleted, id)
+    ) = Registration(personId, date, contact, teamId, staffId, type, level, nextReviewDate, notes, softDeleted, id)
 
     fun generateType(
         code: String,
+        colour: String,
         description: String = "Description of $code",
-        flag: ReferenceData = ReferenceDataGenerator.DEFAULT_FLAG,
+        flag: ReferenceData = ReferenceDataGenerator.SAFEGUARDING_FLAG,
         registrationContactType: ContactType? = ContactGenerator.TYPES[ContactType.Code.REGISTRATION.value],
         reviewContactType: ContactType? = ContactGenerator.TYPES[ContactType.Code.REGISTRATION_REVIEW.value],
         reviewPeriod: Long? = 6,
-        colour: String? = null,
         id: Long = IdGenerator.getAndIncrement()
     ) = RegisterType(code, description, flag, registrationContactType, reviewPeriod, reviewContactType, colour, id)
 }
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-F123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-F123456.json
deleted file mode 100644
index d53f4493ec..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-F123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/F123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"F123456\"}]}}",
-  "Timestamp": "2023-12-05T15:32:33.823Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-G123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-G123456.json
deleted file mode 100644
index f99b1a5363..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-G123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/G123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"G123456\"}]}}",
-  "Timestamp": "2023-12-05T15:32:33.823Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-H123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-H123456.json
deleted file mode 100644
index bb95020aca..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-H123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/H123456/ALLOW/10078385/COMPLETE\",\n  \"occurredAt\": \"2023-12-15T08:34:44+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"H123456\"}]}}",
-  "Timestamp": "2023-12-15T08:34:44.000Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-L123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-L123456.json
deleted file mode 100644
index 3263a70646..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-L123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/L123456/ALLOW/10096930/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"L123456\"}]}}",
-  "Timestamp": "2023-12-05T15:32:33.823Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-M123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-M123456.json
deleted file mode 100644
index ce9b0c9773..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-M123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/M123456/ALLOW/100835871/COMPLETE\",\n  \"occurredAt\": \"2023-12-15T08:34:44+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"M123456\"}]}}",
-  "Timestamp": "2023-12-15T08:34:44.000Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-N123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-N123456.json
deleted file mode 100644
index 36d6cb0dff..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-N123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/N123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\",personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"N123456\"}]}}",
-  "Timestamp": "2023-12-05T15:32:33.823Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-O123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-O123456.json
deleted file mode 100644
index 08e653eaf0..0000000000
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-O123456.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "Type": "Notification",
-  "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/O123456/ALLOW/10069391/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\",personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"O123456\"}]}}",
-  "Timestamp": "2023-12-05T15:32:33.823Z",
-  "MessageAttributes": {
-    "eventType": {
-      "Type": "String",
-      "Value": "risk-assessment.scores.determined"
-    }
-  }
-}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-E123456.json b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced.json
similarity index 69%
rename from projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-E123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced.json
index 34eb2b25d4..f05d47dfe2 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-E123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/messages/assessment-summary-produced.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/E123456/ALLOW/10069390/COMPLETE\",\n \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"E123456\"}]}}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/A000001/ALLOW/1/COMPLETE\",\n \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"A000001\"}]}}",
   "Timestamp": "2023-12-05T15:32:33.823Z",
   "MessageAttributes": {
     "eventType": {
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-N123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000001-no-rosh.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-N123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000001-no-rosh.json
index d0e15919d3..82745405b0 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-N123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000001-no-rosh.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "N123456",
+  "probNumber": "A000001",
   "assessments": [
     {
-      "assessmentPk": 10071389,
+      "assessmentPk": 1,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-07T12:22:44",
       "assessorSignedDate": "2023-12-07T12:16:12",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-L123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000002-low-rosh.json
similarity index 97%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-L123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000002-low-rosh.json
index 2b14921d26..1e04494b38 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-L123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000002-low-rosh.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "L123456",
+  "probNumber": "A000002",
   "assessments": [
     {
-      "assessmentPk": 10096930,
+      "assessmentPk": 2,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-07T12:22:44",
       "assessorSignedDate": "2023-12-07T12:16:12",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-M123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000003-medium-rosh.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-M123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000003-medium-rosh.json
index 9e5ffc4751..c9dcee3fdb 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-M123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000003-medium-rosh.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "H123456",
+  "probNumber": "A000003",
   "assessments": [
     {
-      "assessmentPk": 100835871,
+      "assessmentPk": 3,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-15T08:34:44",
       "assessorSignedDate": "2023-12-15T08:33:39",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-F123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000004-high-rosh.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-F123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000004-high-rosh.json
index e60cb73759..407007f606 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-F123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000004-high-rosh.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "F123456",
+  "probNumber": "A000004",
   "assessments": [
     {
-      "assessmentPk": 10078385,
+      "assessmentPk": 4,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-15T08:34:44",
       "assessorSignedDate": "2023-12-15T08:33:39",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-E123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000006-no-event.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-E123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000006-no-event.json
index 6646c0e2e9..f501065158 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-E123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000006-no-event.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "E123456",
+  "probNumber": "A000006",
   "assessments": [
     {
-      "assessmentPk": 10078385,
+      "assessmentPk": 6,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-15T08:34:44",
       "assessorSignedDate": "2023-12-15T08:33:39",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-G123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000007-soft-deleted.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-G123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000007-soft-deleted.json
index 619543a41a..3136528dc4 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-G123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000007-soft-deleted.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "G123456",
+  "probNumber": "A000007",
   "assessments": [
     {
-      "assessmentPk": 10078385,
+      "assessmentPk": 7,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-15T08:34:44",
       "assessorSignedDate": "2023-12-15T08:33:39",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-O123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000008-prison.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-O123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000008-prison.json
index 12f0459ed0..033d805936 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-O123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000008-prison.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "O123456",
+  "probNumber": "A000008",
   "assessments": [
     {
-      "assessmentPk": 10069391,
+      "assessmentPk": 8,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-07T12:22:44",
       "assessorSignedDate": "2023-12-07T12:16:12",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000009-high-risk-to-children.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000009-high-risk-to-children.json
new file mode 100644
index 0000000000..86ea6a5b6d
--- /dev/null
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000009-high-risk-to-children.json
@@ -0,0 +1,127 @@
+{
+  "probNumber": "A000009",
+  "assessments": [
+    {
+      "assessmentPk": 9,
+      "riskChildrenCustody": "Low",
+      "riskChildrenCommunity": "High",
+      "riskPrisonersCustody": null,
+      "riskStaffCustody": null,
+      "riskStaffCommunity": null,
+      "riskKnownAdultCustody": null,
+      "riskKnownAdultCommunity": null,
+      "riskPublicCustody": null,
+      "riskPublicCommunity": null,
+      "assessmentType": "LAYER3",
+      "dateCompleted": "2023-12-07T12:22:44",
+      "assessorSignedDate": "2023-12-07T12:16:12",
+      "initiationDate": "2023-12-07T11:49:57",
+      "assessmentStatus": "COMPLETE",
+      "superStatus": "COMPLETE",
+      "laterWIPAssessmentExists": false,
+      "latestWIPDate": null,
+      "laterSignLockAssessmentExists": false,
+      "latestSignLockDate": null,
+      "laterPartCompUnsignedAssessmentExists": false,
+      "latestPartCompUnsignedDate": "2023-11-03T09:51:25",
+      "laterPartCompSignedAssessmentExists": false,
+      "latestPartCompSignedDate": null,
+      "laterCompleteAssessmentExists": false,
+      "latestCompleteDate": "2023-12-15T08:34:44",
+      "currentConcernsRiskOfSuicide": "Yes",
+      "reviewSpDate": null,
+      "initialSpDate": null,
+      "reviewNum": "01",
+      "currentConcernsBreachOfTrust": "Yes",
+      "currentConcernsDisruptive": "Yes",
+      "currentConcernsEscape": "Yes",
+      "currentConcernsVulnerablity": "Yes",
+      "currentConcernsHostel": "No",
+      "currentConcernsCustody": "Yes",
+      "currentConcernsRiskOfSelfHarm": "Yes",
+      "weightedScores": {
+        "accommodationWeightedScore": 8,
+        "eteWeightedScore": 7,
+        "relationshipsWeightedScore": 4,
+        "lifestyleWeightedScore": 5,
+        "drugWeightedScore": 4,
+        "alcoholWeightedScore": 0,
+        "thinkingWeightedScore": 5,
+        "attitudesWeightedScore": 5
+      },
+      "furtherInformation": {
+        "totWeightedScore": 108,
+        "pOAssessment": "270",
+        "pOAssessmentDesc": "Review",
+        "assessorName": "LevelTwo CentralSupport",
+        "ogrs1Year": 43,
+        "ogrs2Year": 61,
+        "reviewTerm": "N",
+        "cmsEventNumber": 1,
+        "courtCode": "LVRPCC",
+        "courtType": "CC",
+        "courtName": "Liverpool Crown Court"
+      },
+      "offender": {
+        "riskToOthers": "H",
+        "offenderPk": 7374816
+      },
+      "ogpOvp": {
+        "ogpNC": "N",
+        "ovpNC": "N",
+        "ogp1Year": 55,
+        "ogp2Year": 69,
+        "ovp1Year": 22,
+        "ovp2Year": 35,
+        "ogrs3RiskRecon": "M",
+        "ogpRisk": "H",
+        "ovpRisk": "M"
+      },
+      "basicSentencePlan": null,
+      "offences": [
+        {
+          "offenceCode": "008",
+          "offenceSubcode": "57",
+          "additionalOffence": "N"
+        }
+      ],
+      "sentencePlan": {
+        "objectives": [
+          {
+            "objectiveCodeDesc": "Increased knowledge of physical/ psychological/ emotional self harm linked to drug use",
+            "objectiveSequence": 1,
+            "criminogenicNeeds": [
+              {
+                "criminogenicNeed": "IHD",
+                "criminogenicNeedDesc": "Risk to Public"
+              }
+            ],
+            "actions": [
+              {
+                "actionDesc": "Drug counselling",
+                "actionComment": "Comments about the action"
+              }
+            ]
+          },
+          {
+            "objectiveCodeDesc": "Improve employment related skills",
+            "objectiveSequence": 2,
+            "criminogenicNeeds": [
+              {
+                "criminogenicNeed": "I4",
+                "criminogenicNeedDesc": "Education Training and Employment"
+              }
+            ],
+            "actions": [
+              {
+                "action": "VIII1",
+                "actionDesc": "Basic skills",
+                "actionComment": "Some comment about their basic skills"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000010-multiple-risks.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000010-multiple-risks.json
new file mode 100644
index 0000000000..ee5e303cad
--- /dev/null
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000010-multiple-risks.json
@@ -0,0 +1,127 @@
+{
+  "probNumber": "A000010",
+  "assessments": [
+    {
+      "assessmentPk": 10,
+      "riskChildrenCustody": "Low",
+      "riskChildrenCommunity": "High",
+      "riskPrisonersCustody": "Medium",
+      "riskStaffCustody": "None",
+      "riskStaffCommunity": null,
+      "riskKnownAdultCustody": "Low",
+      "riskKnownAdultCommunity": "Low",
+      "riskPublicCustody": "High",
+      "riskPublicCommunity": "Very High",
+      "assessmentType": "LAYER3",
+      "dateCompleted": "2023-12-07T12:22:44",
+      "assessorSignedDate": "2023-12-07T12:16:12",
+      "initiationDate": "2023-12-07T11:49:57",
+      "assessmentStatus": "COMPLETE",
+      "superStatus": "COMPLETE",
+      "laterWIPAssessmentExists": false,
+      "latestWIPDate": null,
+      "laterSignLockAssessmentExists": false,
+      "latestSignLockDate": null,
+      "laterPartCompUnsignedAssessmentExists": false,
+      "latestPartCompUnsignedDate": "2023-11-03T09:51:25",
+      "laterPartCompSignedAssessmentExists": false,
+      "latestPartCompSignedDate": null,
+      "laterCompleteAssessmentExists": false,
+      "latestCompleteDate": "2023-12-15T08:34:44",
+      "currentConcernsRiskOfSuicide": "Yes",
+      "reviewSpDate": null,
+      "initialSpDate": null,
+      "reviewNum": "01",
+      "currentConcernsBreachOfTrust": "Yes",
+      "currentConcernsDisruptive": "Yes",
+      "currentConcernsEscape": "Yes",
+      "currentConcernsVulnerablity": "Yes",
+      "currentConcernsHostel": "No",
+      "currentConcernsCustody": "Yes",
+      "currentConcernsRiskOfSelfHarm": "Yes",
+      "weightedScores": {
+        "accommodationWeightedScore": 8,
+        "eteWeightedScore": 7,
+        "relationshipsWeightedScore": 4,
+        "lifestyleWeightedScore": 5,
+        "drugWeightedScore": 4,
+        "alcoholWeightedScore": 0,
+        "thinkingWeightedScore": 5,
+        "attitudesWeightedScore": 5
+      },
+      "furtherInformation": {
+        "totWeightedScore": 108,
+        "pOAssessment": "270",
+        "pOAssessmentDesc": "Review",
+        "assessorName": "LevelTwo CentralSupport",
+        "ogrs1Year": 43,
+        "ogrs2Year": 61,
+        "reviewTerm": "N",
+        "cmsEventNumber": 1,
+        "courtCode": "LVRPCC",
+        "courtType": "CC",
+        "courtName": "Liverpool Crown Court"
+      },
+      "offender": {
+        "riskToOthers": "H",
+        "offenderPk": 7374816
+      },
+      "ogpOvp": {
+        "ogpNC": "N",
+        "ovpNC": "N",
+        "ogp1Year": 55,
+        "ogp2Year": 69,
+        "ovp1Year": 22,
+        "ovp2Year": 35,
+        "ogrs3RiskRecon": "M",
+        "ogpRisk": "H",
+        "ovpRisk": "M"
+      },
+      "basicSentencePlan": null,
+      "offences": [
+        {
+          "offenceCode": "008",
+          "offenceSubcode": "57",
+          "additionalOffence": "N"
+        }
+      ],
+      "sentencePlan": {
+        "objectives": [
+          {
+            "objectiveCodeDesc": "Increased knowledge of physical/ psychological/ emotional self harm linked to drug use",
+            "objectiveSequence": 1,
+            "criminogenicNeeds": [
+              {
+                "criminogenicNeed": "IHD",
+                "criminogenicNeedDesc": "Risk to Public"
+              }
+            ],
+            "actions": [
+              {
+                "actionDesc": "Drug counselling",
+                "actionComment": "Comments about the action"
+              }
+            ]
+          },
+          {
+            "objectiveCodeDesc": "Improve employment related skills",
+            "objectiveSequence": 2,
+            "criminogenicNeeds": [
+              {
+                "criminogenicNeed": "I4",
+                "criminogenicNeedDesc": "Education Training and Employment"
+              }
+            ],
+            "actions": [
+              {
+                "action": "VIII1",
+                "actionDesc": "Basic skills",
+                "actionComment": "Some comment about their basic skills"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000011-multiple-risks.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000011-multiple-risks.json
new file mode 100644
index 0000000000..ee5e303cad
--- /dev/null
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/A000011-multiple-risks.json
@@ -0,0 +1,127 @@
+{
+  "probNumber": "A000010",
+  "assessments": [
+    {
+      "assessmentPk": 10,
+      "riskChildrenCustody": "Low",
+      "riskChildrenCommunity": "High",
+      "riskPrisonersCustody": "Medium",
+      "riskStaffCustody": "None",
+      "riskStaffCommunity": null,
+      "riskKnownAdultCustody": "Low",
+      "riskKnownAdultCommunity": "Low",
+      "riskPublicCustody": "High",
+      "riskPublicCommunity": "Very High",
+      "assessmentType": "LAYER3",
+      "dateCompleted": "2023-12-07T12:22:44",
+      "assessorSignedDate": "2023-12-07T12:16:12",
+      "initiationDate": "2023-12-07T11:49:57",
+      "assessmentStatus": "COMPLETE",
+      "superStatus": "COMPLETE",
+      "laterWIPAssessmentExists": false,
+      "latestWIPDate": null,
+      "laterSignLockAssessmentExists": false,
+      "latestSignLockDate": null,
+      "laterPartCompUnsignedAssessmentExists": false,
+      "latestPartCompUnsignedDate": "2023-11-03T09:51:25",
+      "laterPartCompSignedAssessmentExists": false,
+      "latestPartCompSignedDate": null,
+      "laterCompleteAssessmentExists": false,
+      "latestCompleteDate": "2023-12-15T08:34:44",
+      "currentConcernsRiskOfSuicide": "Yes",
+      "reviewSpDate": null,
+      "initialSpDate": null,
+      "reviewNum": "01",
+      "currentConcernsBreachOfTrust": "Yes",
+      "currentConcernsDisruptive": "Yes",
+      "currentConcernsEscape": "Yes",
+      "currentConcernsVulnerablity": "Yes",
+      "currentConcernsHostel": "No",
+      "currentConcernsCustody": "Yes",
+      "currentConcernsRiskOfSelfHarm": "Yes",
+      "weightedScores": {
+        "accommodationWeightedScore": 8,
+        "eteWeightedScore": 7,
+        "relationshipsWeightedScore": 4,
+        "lifestyleWeightedScore": 5,
+        "drugWeightedScore": 4,
+        "alcoholWeightedScore": 0,
+        "thinkingWeightedScore": 5,
+        "attitudesWeightedScore": 5
+      },
+      "furtherInformation": {
+        "totWeightedScore": 108,
+        "pOAssessment": "270",
+        "pOAssessmentDesc": "Review",
+        "assessorName": "LevelTwo CentralSupport",
+        "ogrs1Year": 43,
+        "ogrs2Year": 61,
+        "reviewTerm": "N",
+        "cmsEventNumber": 1,
+        "courtCode": "LVRPCC",
+        "courtType": "CC",
+        "courtName": "Liverpool Crown Court"
+      },
+      "offender": {
+        "riskToOthers": "H",
+        "offenderPk": 7374816
+      },
+      "ogpOvp": {
+        "ogpNC": "N",
+        "ovpNC": "N",
+        "ogp1Year": 55,
+        "ogp2Year": 69,
+        "ovp1Year": 22,
+        "ovp2Year": 35,
+        "ogrs3RiskRecon": "M",
+        "ogpRisk": "H",
+        "ovpRisk": "M"
+      },
+      "basicSentencePlan": null,
+      "offences": [
+        {
+          "offenceCode": "008",
+          "offenceSubcode": "57",
+          "additionalOffence": "N"
+        }
+      ],
+      "sentencePlan": {
+        "objectives": [
+          {
+            "objectiveCodeDesc": "Increased knowledge of physical/ psychological/ emotional self harm linked to drug use",
+            "objectiveSequence": 1,
+            "criminogenicNeeds": [
+              {
+                "criminogenicNeed": "IHD",
+                "criminogenicNeedDesc": "Risk to Public"
+              }
+            ],
+            "actions": [
+              {
+                "actionDesc": "Drug counselling",
+                "actionComment": "Comments about the action"
+              }
+            ]
+          },
+          {
+            "objectiveCodeDesc": "Improve employment related skills",
+            "objectiveSequence": 2,
+            "criminogenicNeeds": [
+              {
+                "criminogenicNeed": "I4",
+                "criminogenicNeedDesc": "Education Training and Employment"
+              }
+            ],
+            "actions": [
+              {
+                "action": "VIII1",
+                "actionDesc": "Basic skills",
+                "actionComment": "Some comment about their basic skills"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-H123456.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/Z999999-no-delius-record.json
similarity index 98%
rename from projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-H123456.json
rename to projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/Z999999-no-delius-record.json
index 3879249d8f..4e8a3ec1ee 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/assessment-summary-H123456.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/__files/Z999999-no-delius-record.json
@@ -1,8 +1,8 @@
 {
-  "probNumber": "H123456",
+  "probNumber": "Z999999",
   "assessments": [
     {
-      "assessmentPk": 10078385,
+      "assessmentPk": 999999,
       "assessmentType": "LAYER3",
       "dateCompleted": "2023-12-15T08:34:44",
       "assessorSignedDate": "2023-12-15T08:33:39",
diff --git a/projects/assessment-summary-and-delius/src/dev/resources/simulations/mappings/oasys-mappings.json b/projects/assessment-summary-and-delius/src/dev/resources/simulations/mappings/oasys-mappings.json
index a6a142c14b..632a65bed9 100644
--- a/projects/assessment-summary-and-delius/src/dev/resources/simulations/mappings/oasys-mappings.json
+++ b/projects/assessment-summary-and-delius/src/dev/resources/simulations/mappings/oasys-mappings.json
@@ -3,105 +3,144 @@
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/N123456/ALLOW/10069390/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000001/ALLOW/1/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-N123456.json"
+        "bodyFileName": "A000001-no-rosh.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/L123456/ALLOW/10096930/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000002/ALLOW/2/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-L123456.json"
+        "bodyFileName": "A000002-low-rosh.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/M123456/ALLOW/100835871/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000003/ALLOW/3/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-M123456.json"
+        "bodyFileName": "A000003-medium-rosh.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/H123456/ALLOW/10078385/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000004/ALLOW/4/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-H123456.json"
+        "bodyFileName": "A000004-high-rosh.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/E123456/ALLOW/10069390/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000006/ALLOW/6/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-E123456.json"
+        "bodyFileName": "A000006-no-event.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/F123456/ALLOW/10069390/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000007/ALLOW/7/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-F123456.json"
+        "bodyFileName": "A000007-soft-deleted.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/G123456/ALLOW/10069390/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/Z999999/ALLOW/999999/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-G123456.json"
+        "bodyFileName": "Z999999-no-delius-record.json"
       }
     },
     {
       "request": {
         "method": "GET",
-        "urlPath": "/eor/oasys/ass/asssumm/O123456/ALLOW/10069391/COMPLETE"
+        "urlPath": "/eor/oasys/ass/asssumm/A000008/ALLOW/8/COMPLETE"
       },
       "response": {
         "headers": {
           "Content-Type": "application/json"
         },
         "status": 200,
-        "bodyFileName": "assessment-summary-O123456.json"
+        "bodyFileName": "A000008-prison.json"
+      }
+    },
+    {
+      "request": {
+        "method": "GET",
+        "urlPath": "/eor/oasys/ass/asssumm/A000009/ALLOW/9/COMPLETE"
+      },
+      "response": {
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "status": 200,
+        "bodyFileName": "A000009-high-risk-to-children.json"
+      }
+    },
+    {
+      "request": {
+        "method": "GET",
+        "urlPath": "/eor/oasys/ass/asssumm/A000010/ALLOW/10/COMPLETE"
+      },
+      "response": {
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "status": 200,
+        "bodyFileName": "A000010-multiple-risks.json"
+      }
+    },
+    {
+      "request": {
+        "method": "GET",
+        "urlPath": "/eor/oasys/ass/asssumm/A000011/ALLOW/11/COMPLETE"
+      },
+      "response": {
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "status": 200,
+        "bodyFileName": "A000011-multiple-risks.json"
       }
     }
   ]
diff --git a/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
index 796d2d5b9f..f7f5f21955 100644
--- a/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
+++ b/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
@@ -1,16 +1,16 @@
 package uk.gov.justice.digital.hmpps
 
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import com.github.tomakehurst.wiremock.WireMockServer
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers
+import org.hamcrest.Matchers.*
 import org.hamcrest.core.IsEqual.equalTo
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentMatchers.anyMap
-import org.mockito.kotlin.check
-import org.mockito.kotlin.eq
-import org.mockito.kotlin.timeout
-import org.mockito.kotlin.verify
+import org.mockito.kotlin.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
@@ -21,16 +21,26 @@ import uk.gov.justice.digital.hmpps.data.entity.IapsPersonRepository
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator
 import uk.gov.justice.digital.hmpps.data.generator.ReferenceDataGenerator
 import uk.gov.justice.digital.hmpps.data.generator.RegistrationGenerator
+import uk.gov.justice.digital.hmpps.datetime.DeliusDateFormatter
+import uk.gov.justice.digital.hmpps.enum.RiskLevel
+import uk.gov.justice.digital.hmpps.enum.RiskOfSeriousHarmType
+import uk.gov.justice.digital.hmpps.enum.RiskType
+import uk.gov.justice.digital.hmpps.flags.FeatureFlags
 import uk.gov.justice.digital.hmpps.integrations.delius.assessment.entity.OasysAssessmentRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType
+import uk.gov.justice.digital.hmpps.integrations.delius.domainevent.entity.DomainEventRepository
+import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.Person
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.PersonRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.RegistrationRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.getByCrn
 import uk.gov.justice.digital.hmpps.message.HmppsDomainEvent
+import uk.gov.justice.digital.hmpps.message.Notification
+import uk.gov.justice.digital.hmpps.message.PersonIdentifier
+import uk.gov.justice.digital.hmpps.message.PersonReference
 import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager
+import uk.gov.justice.digital.hmpps.messaging.crn
 import uk.gov.justice.digital.hmpps.resourceloader.ResourceLoader.notification
-import uk.gov.justice.digital.hmpps.service.Risk
 import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
 import java.time.LocalDate
 
@@ -63,35 +73,45 @@ internal class IntegrationTest {
     @Autowired
     lateinit var transactionManager: PlatformTransactionManager
 
+    @Autowired
+    lateinit var domainEventRepository: DomainEventRepository
+
+    @Autowired
+    lateinit var objectMapper: ObjectMapper
+
     @MockBean
     lateinit var telemetryService: TelemetryService
 
+    @MockBean
+    lateinit var featureFlags: FeatureFlags
+
     lateinit var transactionTemplate: TransactionTemplate
 
     @BeforeEach
     fun setUp() {
         transactionTemplate = TransactionTemplate(transactionManager)
+        whenever(featureFlags.enabled("assessment-summary-additional-risks")).thenReturn(true)
     }
 
     @Test
     fun `assessment with no risk information does not change registrations, but does add assessment and contact`() {
-        val message = notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.NO_RISK.crn}")
+        val message = notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.NO_ROSH.crn)
         val prevRegs =
             registrationRepository.findByPersonIdAndTypeFlagCode(
-                PersonGenerator.NO_RISK.id,
-                ReferenceDataGenerator.DEFAULT_FLAG.code
+                PersonGenerator.NO_ROSH.id,
+                ReferenceDataGenerator.ROSH_FLAG.code
             )
         assertThat(prevRegs.size, equalTo(2))
-        val prevRiskColour = personRepository.getByCrn(PersonGenerator.NO_RISK.crn).highestRiskColour
+        val prevRiskColour = personRepository.getByCrn(PersonGenerator.NO_ROSH.crn).highestRiskColour
         assertThat(prevRiskColour, equalTo("Green"))
 
-        channelManager.getChannel(queueName).publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
-        val person = personRepository.getByCrn(PersonGenerator.NO_RISK.crn)
+        val person = personRepository.getByCrn(PersonGenerator.NO_ROSH.crn)
         assertThat(person.highestRiskColour, equalTo(prevRiskColour))
 
         val registrations =
-            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.DEFAULT_FLAG.code)
+            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.ROSH_FLAG.code)
         assertThat(registrations.size, equalTo(2))
         assertThat(registrations.map { it.id }, equalTo(prevRegs.map { it.id }))
 
@@ -112,28 +132,31 @@ internal class IntegrationTest {
 
     @Test
     fun `an existing assessment is replaced, a new registration is added, existing registrations are deregistered, and iaps is notified`() {
-        val message = notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.LOW_RISK.crn}")
+        val message =
+            notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.LOW_ROSH.crn)
         val prevRegs =
             registrationRepository.findByPersonIdAndTypeFlagCode(
-                PersonGenerator.LOW_RISK.id,
-                ReferenceDataGenerator.DEFAULT_FLAG.code
+                PersonGenerator.LOW_ROSH.id,
+                ReferenceDataGenerator.ROSH_FLAG.code
             )
         assertThat(prevRegs.size, equalTo(2))
-        assertThat(prevRegs.map { it.type.code }, equalTo(listOf(Risk.M.code, Risk.H.code)))
+        assertThat(
+            prevRegs.map { it.type.code },
+            equalTo(listOf(RiskOfSeriousHarmType.M.code, RiskOfSeriousHarmType.H.code))
+        )
 
-        channelManager.getChannel(queueName)
-            .publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
-        val person = personRepository.getByCrn(PersonGenerator.LOW_RISK.crn)
+        val person = personRepository.getByCrn(PersonGenerator.LOW_ROSH.crn)
         assertThat(person.highestRiskColour, equalTo("Green"))
 
         val registrations =
-            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.DEFAULT_FLAG.code)
+            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.ROSH_FLAG.code)
         assertThat(registrations.size, equalTo(1))
         val reg = registrations.first()
-        assertThat(reg.type.code, equalTo(Risk.L.code))
+        assertThat(reg.type.code, equalTo(RiskOfSeriousHarmType.L.code))
 
-        val assessment = oasysAssessmentRepository.findByOasysId("10096930")
+        val assessment = oasysAssessmentRepository.findByOasysId(PersonGenerator.LOW_ROSH.oasysId())
         assertThat(assessment?.court?.code, equalTo("CRT150"))
         assertThat(assessment?.offence?.code, equalTo("80400"))
         assertThat(assessment?.assessedBy, equalTo("John Smith"))
@@ -156,22 +179,22 @@ internal class IntegrationTest {
 
     @Test
     fun `a new assessment is created with sentence plan objectives, needs and actions`() {
-        val message = notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.MEDIUM_RISK.crn}")
+        val message =
+            notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.MEDIUM_ROSH.crn)
 
-        channelManager.getChannel(queueName)
-            .publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
-        val person = personRepository.getByCrn(PersonGenerator.MEDIUM_RISK.crn)
+        val person = personRepository.getByCrn(PersonGenerator.MEDIUM_ROSH.crn)
         assertThat(person.highestRiskColour, equalTo("Amber"))
 
         val registrations =
-            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.DEFAULT_FLAG.code)
+            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.ROSH_FLAG.code)
         assertThat(registrations.size, equalTo(1))
         val reg = registrations.first()
-        assertThat(reg.type.code, equalTo(RegistrationGenerator.TYPES[Risk.M.code]?.code))
+        assertThat(reg.type.code, equalTo(RegistrationGenerator.TYPES[RiskOfSeriousHarmType.M.code]?.code))
 
         transactionTemplate.execute {
-            val assessment = oasysAssessmentRepository.findByOasysId("100835871")
+            val assessment = oasysAssessmentRepository.findByOasysId(PersonGenerator.MEDIUM_ROSH.oasysId())
             assertThat(assessment?.court?.code, equalTo("LVRPCC"))
             assertThat(assessment?.offence?.code, equalTo("00857"))
             assertThat(assessment?.assessedBy, equalTo("R. L. Name"))
@@ -197,21 +220,21 @@ internal class IntegrationTest {
 
     @Test
     fun `a new assessment is created and an existing registration matches the current risk`() {
-        val message = notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.HIGH_RISK.crn}")
+        val message =
+            notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.HIGH_ROSH.crn)
 
-        channelManager.getChannel(queueName)
-            .publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
-        val person = personRepository.getByCrn(PersonGenerator.HIGH_RISK.crn)
+        val person = personRepository.getByCrn(PersonGenerator.HIGH_ROSH.crn)
         assertThat(person.highestRiskColour, equalTo("Orange"))
 
         val registrations =
-            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.DEFAULT_FLAG.code)
+            registrationRepository.findByPersonIdAndTypeFlagCode(person.id, ReferenceDataGenerator.ROSH_FLAG.code)
         assertThat(registrations.size, equalTo(1))
         val reg = registrations.first()
-        assertThat(reg.type.code, equalTo(RegistrationGenerator.TYPES[Risk.H.code]?.code))
+        assertThat(reg.type.code, equalTo(RegistrationGenerator.TYPES[RiskOfSeriousHarmType.H.code]?.code))
 
-        val assessment = oasysAssessmentRepository.findByOasysId("10078385")
+        val assessment = oasysAssessmentRepository.findByOasysId(PersonGenerator.HIGH_ROSH.oasysId())
         assertThat(assessment?.court?.code, equalTo("LVRPCC"))
         assertThat(assessment?.offence?.code, equalTo("00857"))
         assertThat(assessment?.assessedBy, equalTo("LevelTwo CentralSupport"))
@@ -231,10 +254,9 @@ internal class IntegrationTest {
     @Test
     fun `an assessment with a cmsEventNumber that is soft deleted is logged and ignored`() {
         val message =
-            notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.PERSON_SOFT_DELETED_EVENT.crn}")
+            notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.PERSON_SOFT_DELETED_EVENT.crn)
 
-        channelManager.getChannel(queueName)
-            .publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
         verify(telemetryService, timeout(5000)).trackEvent(
             eq("AssessmentSummaryFailureReport"),
@@ -247,16 +269,14 @@ internal class IntegrationTest {
 
     @Test
     fun `an assessment with a crn that is not found is logged and ignored`() {
-        val message =
-            notification<HmppsDomainEvent>("assessment-summary-produced-G123456")
+        val message = notification<HmppsDomainEvent>("assessment-summary-produced").withCrn("Z999999")
 
-        channelManager.getChannel(queueName)
-            .publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
         verify(telemetryService, timeout(5000)).trackEvent(
             eq("AssessmentSummaryFailureReport"),
             check {
-                assertThat(it["reason"], Matchers.equalTo("Person with crn of G123456 not found"))
+                assertThat(it["reason"], Matchers.equalTo("Person with crn of Z999999 not found"))
             },
             anyMap()
         )
@@ -265,22 +285,21 @@ internal class IntegrationTest {
     @Test
     fun `event number is inferred for prison assessments`() {
         val message =
-            notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.PRISON_ASSESSMENT.crn}")
+            notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.PRISON_ASSESSMENT.crn)
 
-        channelManager.getChannel(queueName).publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
         verify(telemetryService, timeout(5000)).trackEvent(eq("AssessmentSummarySuccess"), anyMap(), anyMap())
-        val assessment = oasysAssessmentRepository.findByOasysId("10069391")
+        val assessment = oasysAssessmentRepository.findByOasysId(PersonGenerator.PRISON_ASSESSMENT.oasysId())
         assertThat(assessment?.eventNumber, equalTo("1"))
     }
 
     @Test
     fun `an assessment without a cmsEventNumber for a person without a matching event is logged and ignored`() {
         val message =
-            notification<HmppsDomainEvent>("assessment-summary-produced-${PersonGenerator.PERSON_NO_EVENT.crn}")
+            notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(PersonGenerator.PERSON_NO_EVENT.crn)
 
-        channelManager.getChannel(queueName)
-            .publishAndWait(prepNotification(message, wireMockServer.port()))
+        channelManager.getChannel(queueName).publishAndWait(message)
 
         verify(telemetryService, timeout(5000)).trackEvent(
             eq("AssessmentSummaryFailureReport"),
@@ -288,4 +307,132 @@ internal class IntegrationTest {
             anyMap()
         )
     }
+
+    @Test
+    fun `an assessment with risks identified creates individual registrations`() {
+        val person = personRepository.getByCrn(PersonGenerator.NO_EXISTING_RISKS.crn)
+        val message = notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(person.crn)
+        val previousRegistrations = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.CHILDREN.code)
+        assertThat(previousRegistrations.size, equalTo(0))
+
+        channelManager.getChannel(queueName).publishAndWait(message)
+
+        val registrations = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.CHILDREN.code)
+        assertThat(registrations, hasSize(1))
+        val registration = registrations.single()
+        assertThat(registration.type.code, equalTo(RiskType.CHILDREN.code))
+        assertThat(registration.level?.code, equalTo(RiskLevel.H.code))
+        assertThat(
+            registration.notes,
+            equalTo("The OASys assessment of Review on 07/12/2023 identified the Risk to children to be H")
+        )
+
+        assertThat(registration.reviews, hasSize(1))
+        val review = registration.reviews.single()
+        assertThat(
+            review.contact.notes?.trim(), equalTo(
+                """
+                    Type: Safeguarding - Risk to children
+                    Next Review Date: ${DeliusDateFormatter.format(LocalDate.now().plusMonths(6))}
+                """.trimIndent()
+            )
+        )
+        assertThat(review.date, equalTo(LocalDate.now().plusMonths(6)))
+    }
+
+    @Test
+    fun `existing risks are updated and new reviews are created`() {
+        val person = personRepository.getByCrn(PersonGenerator.EXISTING_RISKS.crn)
+        val message = notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(person.crn)
+
+        val riskToChildrenBefore =
+            registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.CHILDREN.code).single()
+        assertThat(riskToChildrenBefore.level?.code, equalTo(RiskLevel.H.code))
+        assertThat(riskToChildrenBefore.reviews, hasSize(1))
+        val riskToPrisonerBefore = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.PRISONER.code)
+        assertThat(riskToPrisonerBefore, hasSize(0))
+        val riskToStaffBefore =
+            registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.STAFF.code).single()
+        assertThat(riskToStaffBefore.level?.code, equalTo(RiskLevel.V.code))
+        val riskToAdultBefore =
+            registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.KNOWN_ADULT.code).single()
+        assertThat(riskToAdultBefore.level?.code, equalTo(RiskLevel.M.code))
+        val riskToPublicBefore =
+            registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.PUBLIC.code).single()
+        assertThat(riskToPublicBefore.level?.code, equalTo(RiskLevel.M.code))
+
+        channelManager.getChannel(queueName).publishAndWait(message)
+
+        val domainEvents = domainEventRepository.findAll()
+            .map { objectMapper.readValue<HmppsDomainEvent>(it.messageBody) }
+            .filter { it.crn() == PersonGenerator.EXISTING_RISKS.crn }
+
+        val riskToChildren =
+            registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.CHILDREN.code).single()
+        assertThat(riskToChildren.level?.code, equalTo(RiskLevel.H.code))
+        assertThat(riskToChildren.reviews, hasSize(2))
+        assertThat(
+            riskToChildren.reviews[1].contact.notes?.trim(), equalTo(
+                """
+                    Type: Safeguarding - Risk to children
+                    Next Review Date: 14/12/2023
+                """.trimIndent()
+            )
+        )
+        assertThat(domainEvents.ofType(RiskType.CHILDREN), hasSize(0))
+
+        val riskToPrisoner =
+            registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.PRISONER.code).single()
+        assertThat(riskToPrisoner.level?.code, equalTo(RiskLevel.M.code))
+        assertThat(riskToPrisoner.reviews, hasSize(1))
+        assertThat(domainEvents.ofType(RiskType.PRISONER), hasSize(1))
+
+        val riskToStaff = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.STAFF.code).single()
+        assertThat(riskToStaff.level?.code, equalTo(RiskLevel.V.code))
+        assertThat(riskToStaff.reviews, hasSize(1))
+        assertThat(domainEvents.ofType(RiskType.STAFF), hasSize(0))
+
+        val riskToAdult = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.KNOWN_ADULT.code)
+        assertThat(riskToAdult, hasSize(0))
+        assertThat(domainEvents.ofType(RiskType.KNOWN_ADULT), hasSize(1))
+
+        val riskToPublic = registrationRepository.findByPersonIdAndTypeCode(person.id, RiskType.PUBLIC.code).single()
+        assertThat(riskToPublic.level?.code, equalTo(RiskLevel.V.code))
+        assertThat(riskToPublicBefore.reviews, hasSize(1))
+        assertThat(domainEvents.ofType(RiskType.PUBLIC), hasSize(2))
+        assertThat(
+            domainEvents.ofType(RiskType.PUBLIC).map { it.eventType },
+            hasItems("probation-case.registration.added", "probation-case.registration.deregistered")
+        )
+    }
+
+    @Test
+    fun `risks are not changed when feature flag is disabled`() {
+        whenever(featureFlags.enabled("assessment-summary-additional-risks")).thenReturn(false)
+
+        val person = personRepository.getByCrn(PersonGenerator.FEATURE_FLAG.crn)
+        val message = notification<HmppsDomainEvent>("assessment-summary-produced").withCrn(person.crn)
+
+        channelManager.getChannel(queueName).publishAndWait(message)
+
+        val domainEvents = domainEventRepository.findAll()
+            .map { objectMapper.readValue<HmppsDomainEvent>(it.messageBody) }
+            .filter { it.crn() == PersonGenerator.FEATURE_FLAG.crn }
+        assertThat(domainEvents, empty())
+    }
+
+    private fun Notification<HmppsDomainEvent>.withCrn(crn: String): Notification<HmppsDomainEvent> {
+        val oasysId = crn.drop(1).toInt()
+        return this.copy(
+            message = this.message.copy(
+                detailUrl = "http://localhost:${wireMockServer.port()}/eor/oasys/ass/asssumm/$crn/ALLOW/${oasysId}/COMPLETE",
+                personReference = PersonReference(listOf(PersonIdentifier("CRN", crn)))
+            )
+        )
+    }
+
+    private fun Person.oasysId() = crn.drop(1).toInt().toString()
+
+    private fun List<HmppsDomainEvent>.ofType(type: RiskType) =
+        filter { it.additionalInformation["registerTypeCode"] == type.code }
 }
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskLevel.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskLevel.kt
new file mode 100644
index 0000000000..d4e31467c9
--- /dev/null
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskLevel.kt
@@ -0,0 +1,12 @@
+package uk.gov.justice.digital.hmpps.enum
+
+enum class RiskLevel(val code: String) {
+    L("RSKL"), M("RSKM"), H("RSKH"), V("RSKV");
+
+    companion object {
+        fun of(value: String): RiskLevel? = entries.firstOrNull { it.name.equals(value.first().toString(), true) }
+
+        fun of(vararg values: String?): RiskLevel? =
+            values.filterNotNull().mapNotNull(RiskLevel::of).maxByOrNull { it.ordinal }
+    }
+}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskOfSeriousHarmType.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskOfSeriousHarmType.kt
new file mode 100644
index 0000000000..3a961de81c
--- /dev/null
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskOfSeriousHarmType.kt
@@ -0,0 +1,9 @@
+package uk.gov.justice.digital.hmpps.enum
+
+enum class RiskOfSeriousHarmType(val code: String) {
+    L("RLRH"), M("RMRH"), H("RHRH"), V("RVHR");
+
+    companion object {
+        fun of(value: String): RiskOfSeriousHarmType? = entries.firstOrNull { it.name.equals(value, true) }
+    }
+}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskType.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskType.kt
new file mode 100644
index 0000000000..81ba111cf3
--- /dev/null
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/enum/RiskType.kt
@@ -0,0 +1,15 @@
+package uk.gov.justice.digital.hmpps.enum
+
+import uk.gov.justice.digital.hmpps.integrations.oasys.AssessmentSummary
+
+enum class RiskType(val code: String, val riskLevel: (AssessmentSummary) -> RiskLevel?) {
+    CHILDREN("RCHD", { RiskLevel.of(it.riskChildrenCommunity, it.riskChildrenCustody) }),
+    KNOWN_ADULT("REG15", { RiskLevel.of(it.riskKnownAdultCommunity, it.riskKnownAdultCustody) }),
+    PRISONER("REG16", { RiskLevel.of(it.riskPrisonersCustody) }),
+    PUBLIC("REG17", { RiskLevel.of(it.riskPublicCommunity, it.riskPublicCustody) }),
+    STAFF("AV2S", { RiskLevel.of(it.riskStaffCommunity, it.riskStaffCustody) });
+
+    companion object {
+        fun of(value: String): RiskType? = entries.firstOrNull { it.name.equals(value, true) }
+    }
+}
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Registration.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Registration.kt
index a3846ace49..2fc8905d08 100644
--- a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Registration.kt
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/person/entity/Registration.kt
@@ -33,6 +33,7 @@ class Registration(
 
     @Column(name = "registering_team_id")
     val teamId: Long,
+
     @Column(name = "registering_staff_id")
     val staffId: Long,
 
@@ -40,8 +41,16 @@ class Registration(
     @JoinColumn(name = "register_type_id")
     val type: RegisterType,
 
+    @ManyToOne
+    @JoinColumn(name = "register_level_id")
+    val level: ReferenceData? = null,
+
     var nextReviewDate: LocalDate? = null,
 
+    @Lob
+    @Column(name = "registration_notes")
+    val notes: String? = null,
+
     @Column(columnDefinition = "number")
     val softDeleted: Boolean = false,
 
@@ -191,6 +200,9 @@ class DeRegistration(
 interface RegistrationRepository : JpaRepository<Registration, Long> {
     @EntityGraph(attributePaths = ["contact", "type.flag", "type.registrationContactType", "type.reviewContactType", "reviews.contact"])
     fun findByPersonIdAndTypeFlagCode(personId: Long, flagCode: String): List<Registration>
+
+    @EntityGraph(attributePaths = ["contact", "type.flag", "type.registrationContactType", "type.reviewContactType", "reviews.contact"])
+    fun findByPersonIdAndTypeCode(personId: Long, typeCode: String): List<Registration>
 }
 
 interface RegisterTypeRepository : JpaRepository<RegisterType, Long> {
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referencedata/entity/ReferenceData.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referencedata/entity/ReferenceData.kt
index c5b5ae4d30..87d9a8d01b 100644
--- a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referencedata/entity/ReferenceData.kt
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referencedata/entity/ReferenceData.kt
@@ -48,7 +48,8 @@ class Dataset(
 ) {
     enum class Code(val value: String) {
         DOMAIN_EVENT_TYPE("DOMAIN EVENT TYPE"),
-        REGISTER_TYPE_FLAG("REGISTER TYPE FLAG")
+        REGISTER_TYPE_FLAG("REGISTER TYPE FLAG"),
+        REGISTER_LEVEL("REGISTER LEVEL"),
     }
 }
 
@@ -66,4 +67,6 @@ interface ReferenceDataRepository : JpaRepository<ReferenceData, Long> {
 fun ReferenceDataRepository.getByCode(code: String, datasetCode: String) =
     findByCode(code, datasetCode) ?: throw NotFoundException(datasetCode, "code", code)
 
-fun ReferenceDataRepository.domainEventType(code: String) = getByCode(code, Dataset.Code.DOMAIN_EVENT_TYPE.value)
\ No newline at end of file
+fun ReferenceDataRepository.domainEventType(code: String) = getByCode(code, Dataset.Code.DOMAIN_EVENT_TYPE.value)
+
+fun ReferenceDataRepository.registerLevel(code: String) = getByCode(code, Dataset.Code.REGISTER_LEVEL.value)
\ No newline at end of file
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/DomainEventService.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/DomainEventService.kt
index 2bf6945061..d3265de3f6 100644
--- a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/DomainEventService.kt
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/DomainEventService.kt
@@ -4,10 +4,15 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.integrations.delius.domainevent.entity.DomainEvent
 import uk.gov.justice.digital.hmpps.integrations.delius.domainevent.entity.DomainEventRepository
+import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.Registration
+import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceData
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceDataRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.domainEventType
 import uk.gov.justice.digital.hmpps.message.HmppsDomainEvent
 import uk.gov.justice.digital.hmpps.message.MessageAttributes
+import uk.gov.justice.digital.hmpps.message.PersonIdentifier
+import uk.gov.justice.digital.hmpps.message.PersonReference
+import java.time.ZonedDateTime
 
 @Service
 class DomainEventService(
@@ -25,3 +30,32 @@ class DomainEventService(
         }
     )
 }
+
+fun Registration.deRegEvent(crn: String): HmppsDomainEvent = HmppsDomainEvent(
+    eventType = ReferenceData.Code.REGISTRATION_DEREGISTERED.value,
+    version = 1,
+    occurredAt = ZonedDateTime.now(),
+    personReference = forCrn(crn),
+    additionalInformation = mapOf(
+        "registerTypeCode" to type.code,
+        "registerTypeDescription" to type.description,
+        "deregistrationId" to deregistration!!.id,
+        "deregistrationDate" to deregistration!!.date,
+        "createdDateAndTime" to deregistration!!.createdDatetime
+    )
+)
+
+fun Registration.regEvent(crn: String): HmppsDomainEvent = HmppsDomainEvent(
+    eventType = ReferenceData.Code.REGISTRATION_ADDED.value,
+    version = 1,
+    personReference = forCrn(crn),
+    additionalInformation = mapOf(
+        "registrationId" to id,
+        "registerTypeCode" to type.code,
+        "registerTypeDescription" to type.description,
+        "registrationDate" to date,
+        "createdDateAndTime" to createdDatetime
+    )
+)
+
+fun forCrn(crn: String) = PersonReference(listOf(PersonIdentifier("CRN", crn)))
diff --git a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt
index 14dd4639f9..8914d7c2e7 100644
--- a/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt
+++ b/projects/assessment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt
@@ -2,33 +2,41 @@ package uk.gov.justice.digital.hmpps.service
 
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.datetime.DeliusDateFormatter
-import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.Contact
+import uk.gov.justice.digital.hmpps.enum.RiskLevel
+import uk.gov.justice.digital.hmpps.enum.RiskOfSeriousHarmType
+import uk.gov.justice.digital.hmpps.enum.RiskType
+import uk.gov.justice.digital.hmpps.flags.FeatureFlags
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType
 import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType.Code.DEREGISTRATION
 import uk.gov.justice.digital.hmpps.integrations.delius.person.entity.*
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceData
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceData.Code.OASYS_RISK_FLAG
+import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceDataRepository
+import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.registerLevel
 import uk.gov.justice.digital.hmpps.integrations.oasys.AssessmentSummary
 import uk.gov.justice.digital.hmpps.message.HmppsDomainEvent
-import uk.gov.justice.digital.hmpps.message.PersonIdentifier
-import uk.gov.justice.digital.hmpps.message.PersonReference
 import java.time.LocalDate
-import java.time.ZonedDateTime
 
 @Service
 class RiskService(
     private val registrationRepository: RegistrationRepository,
     private val registerTypeRepository: RegisterTypeRepository,
-    private val contactService: ContactService
+    private val referenceDataRepository: ReferenceDataRepository,
+    private val contactService: ContactService,
+    private val featureFlags: FeatureFlags
 ) {
-    fun recordRisk(person: Person, summary: AssessmentSummary): List<HmppsDomainEvent> {
-        val highestRisk = summary.riskFlags.mapNotNull(Risk::of).maxByOrNull { it.ordinal } ?: return emptyList()
+    fun recordRisk(person: Person, summary: AssessmentSummary) =
+        recordRiskOfSeriousHarm(person, summary) + recordOtherRisks(person, summary)
+
+    private fun recordRiskOfSeriousHarm(person: Person, summary: AssessmentSummary): List<HmppsDomainEvent> {
+        val roshType = summary.riskFlags.mapNotNull(RiskOfSeriousHarmType::of).maxByOrNull { it.ordinal }
+            ?: return emptyList()
 
         val registrations = registrationRepository
             .findByPersonIdAndTypeFlagCode(person.id, OASYS_RISK_FLAG.value)
             .toMutableList()
 
-        val (matchingRegistrations, registrationsToRemove) = registrations.partition { Risk.from(it.type) == highestRisk }
+        val (matchingRegistrations, registrationsToRemove) = registrations.partition { it.type.code == roshType.code }
 
         val deRegEvents = registrationsToRemove.map {
             val contact = contactService.createContact(ContactDetail(DEREGISTRATION, notes = it.notes()), person)
@@ -36,7 +44,11 @@ class RiskService(
             it.deRegEvent(person.crn)
         }
         val regEvent = if (matchingRegistrations.isEmpty()) {
-            createRegistration(person, registrations, highestRisk)
+            val type = registerTypeRepository.getByCode(roshType.code)
+            val registration = registrations.addRegistration(person, type)
+            registration
+                .withReview(registration.reviewContact(person))
+                .regEvent(person.crn)
         } else null
 
         person.highestRiskColour = registrations.firstOrNull { !it.deregistered }?.type?.colour
@@ -44,90 +56,91 @@ class RiskService(
         return listOfNotNull(regEvent) + deRegEvents
     }
 
-    private fun createRegistration(
+    private fun recordOtherRisks(person: Person, summary: AssessmentSummary): List<HmppsDomainEvent> {
+        if (!featureFlags.enabled("assessment-summary-additional-risks")) return emptyList()
+        return RiskType.entries.flatMap { riskType ->
+            val desiredLevel = riskType.riskLevel(summary) ?: return@flatMap emptyList()
+            val registrations =
+                registrationRepository.findByPersonIdAndTypeCode(person.id, riskType.code).toMutableList()
+
+            val (matchingRegistrations, registrationsToRemove) = registrations.partition { existing ->
+                existing.level != null && existing.level.code == desiredLevel.code && desiredLevel != RiskLevel.L
+            }
+
+            val deRegEvents = registrationsToRemove.map {
+                val contact = contactService.createContact(ContactDetail(DEREGISTRATION, notes = it.notes()), person)
+                it.deregister(contact)
+                it.deRegEvent(person.crn)
+            }
+            val regEvent = if (matchingRegistrations.isEmpty() && desiredLevel != RiskLevel.L) {
+                val type = registerTypeRepository.getByCode(riskType.code)
+                val level = referenceDataRepository.registerLevel(desiredLevel.code)
+                val notes =
+                    "The OASys assessment of ${summary.furtherInformation.pOAssessmentDesc} on ${
+                        DeliusDateFormatter.format(
+                            summary.dateCompleted
+                        )
+                    } identified the ${type.description} to be ${level.description}"
+                val registration = registrations.addRegistration(person, type, level, notes)
+                registration.regEvent(person.crn)
+            } else null
+
+            if (desiredLevel != RiskLevel.L) {
+                // Always add a review if medium or higher, regardless of whether the register level has changed
+                registrationRepository.findByPersonIdAndTypeCode(person.id, riskType.code).singleOrNull()
+                    ?.let { it.withReview(it.reviewContact(person)) }
+            }
+
+            return@flatMap listOfNotNull(regEvent) + deRegEvents
+        }
+    }
+
+    private fun MutableList<Registration>.addRegistration(
         person: Person,
-        registrations: MutableList<Registration>,
-        risk: Risk
-    ): HmppsDomainEvent {
-        val type = registerTypeRepository.getByCode(risk.code)
+        type: RegisterType,
+        level: ReferenceData? = null,
+        notes: String? = null,
+    ): Registration {
         val nextReviewDate = type.reviewPeriod?.let { LocalDate.now().plusMonths(it) }
-        val notes = listOfNotNull(
-            "Type: ${type.flag.description} - ${type.description}",
-            nextReviewDate?.let { "Next Review Date: ${DeliusDateFormatter.format(it)}" }
-        ).joinToString(System.lineSeparator())
 
-        val contact: Contact = contactService.createContact(
+        val contact = contactService.createContact(
             ContactDetail(
                 ContactType.Code.REGISTRATION,
-                notes = notes,
+                notes = reviewNotes(type, nextReviewDate),
                 contactType = type.registrationContactType
             ),
             person
         )
-        val reviewContact: Contact = contactService.createContact(
-            ContactDetail(
-                ContactType.Code.REGISTRATION_REVIEW,
-                notes = notes,
-                contactType = type.reviewContactType
-            ),
-            person
-        )
         val registration = registrationRepository.save(
             Registration(
-                person.id,
-                LocalDate.now(),
-                contact,
-                contact.teamId,
-                contact.staffId,
-                type,
-                nextReviewDate
-            ).withReview(reviewContact)
+                personId = person.id,
+                date = LocalDate.now(),
+                contact = contact,
+                teamId = contact.teamId,
+                staffId = contact.staffId,
+                type = type,
+                level = level,
+                nextReviewDate = nextReviewDate,
+                notes = notes,
+            )
         )
-        registrations += registration
-        return registration.regEvent(person.crn)
+        this += registration
+        return registration
     }
-}
-
-enum class Risk(val code: String) {
-    L("RLRH"), M("RMRH"), H("RHRH"), V("RVHR");
 
-    companion object {
-        fun of(value: String): Risk? = entries.firstOrNull { it.name.equals(value, true) }
-        fun from(type: RegisterType): Risk = entries.firstOrNull { it.code.equals(type.code, true) }
-            ?: throw IllegalArgumentException("Unrecognised Register Type Code: ${type.code}")
-    }
+    private fun Registration.reviewContact(person: Person) = contactService.createContact(
+        ContactDetail(
+            ContactType.Code.REGISTRATION_REVIEW,
+            notes = notes(),
+            contactType = type.reviewContactType
+        ),
+        person
+    )
 }
 
-fun Registration.notes(): String = listOfNotNull(
+fun reviewNotes(type: RegisterType, nextReviewDate: LocalDate?) = listOfNotNull(
     "Type: ${type.flag.description} - ${type.description}",
     nextReviewDate?.let { "Next Review Date: ${DeliusDateFormatter.format(it)}" }
 ).joinToString(System.lineSeparator())
 
-fun Registration.deRegEvent(crn: String): HmppsDomainEvent = HmppsDomainEvent(
-    eventType = ReferenceData.Code.REGISTRATION_DEREGISTERED.value,
-    version = 1,
-    occurredAt = ZonedDateTime.now(),
-    personReference = forCrn(crn),
-    additionalInformation = mapOf(
-        "registerTypeCode" to type.code,
-        "registerTypeDescription" to type.description,
-        "deregistrationId" to deregistration!!.id,
-        "deregistrationDate" to deregistration!!.date,
-        "createdDateAndTime" to deregistration!!.createdDatetime
-    )
-)
-
-fun Registration.regEvent(crn: String): HmppsDomainEvent = HmppsDomainEvent(
-    eventType = ReferenceData.Code.REGISTRATION_ADDED.value,
-    version = 1,
-    personReference = forCrn(crn),
-    additionalInformation = mapOf(
-        "registrationId" to id,
-        "registerTypeCode" to type.code,
-        "registerTypeDescription" to type.description,
-        "registrationDate" to date,
-        "createdDateAndTime" to createdDatetime
-    )
-)
-
-fun forCrn(crn: String) = PersonReference(listOf(PersonIdentifier("CRN", crn)))
+fun Registration.notes(): String = reviewNotes(type, nextReviewDate)