CDPS-1086: Dependency bumps and fixing subsequent issues

.trivyignore

@@ -10,3 +10,6 @@
 # Suppression for h2 2.1.214 password on command line vulnerability
 #   can be suppressed as we only run h2 locally and not on build environments
 CVE-2022-45868
+# Suppression for tomcat vulnerability affecting jsp compilation in the default servlet
+#   can be suppressed as we do not use the default servlet and haven't configured it for write either
+CVE-2024-50379

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.0.9"
+  id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.1.2"
   kotlin("plugin.spring") version "2.0.21"
   kotlin("plugin.jpa") version "2.0.21"
   jacoco
@@ -13,12 +13,12 @@ configurations {
 dependencies {
 
   // Spring Boot
-  implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.0.8")
+  implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.1.1")
   implementation("org.springframework.boot:spring-boot-starter-webflux")
   implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 
   // OpenAPI
-  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0")
+  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.3")
 
   // UUIDs
   implementation("com.fasterxml.uuid:java-uuid-generator:5.1.0")
@@ -32,9 +32,9 @@ dependencies {
   testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.1.1")
   testImplementation("org.testcontainers:junit-jupiter:1.20.4")
   testImplementation("org.testcontainers:postgresql:1.20.4")
-  testImplementation("io.mockk:mockk:1.13.13")
+  testImplementation("io.mockk:mockk:1.13.16")
   testImplementation("org.wiremock:wiremock-standalone:3.10.0")
-  testImplementation("io.swagger.parser.v3:swagger-parser:2.1.24") {
+  testImplementation("io.swagger.parser.v3:swagger-parser:2.1.25") {
     exclude(group = "io.swagger.core.v3")
   }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/config/OpenApiConfiguration.kt

@@ -5,7 +5,6 @@ import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Contact
 import io.swagger.v3.oas.models.info.Info
-import io.swagger.v3.oas.models.media.DateTimeSchema
 import io.swagger.v3.oas.models.media.Schema
 import io.swagger.v3.oas.models.media.StringSchema
 import io.swagger.v3.oas.models.security.OAuthFlow
@@ -84,7 +83,8 @@ class OpenApiConfiguration(
         val properties = schema.properties ?: mutableMapOf()
         for (propertyName in properties.keys) {
           val propertySchema = properties[propertyName]!!
-          if (propertySchema is DateTimeSchema) {
+
+          if (propertySchema.format == "date-time") {
             properties.replace(
               propertyName,
               StringSchema()

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/dto/ReferenceDataCodeDto.kt

@@ -8,16 +8,16 @@ import java.time.ZonedDateTime
 @Schema(description = "Reference Data Code")
 @JsonInclude(NON_NULL)
 data class ReferenceDataCodeDto(
-  @Schema(description = "Id", example = "FACIAL_HAIR_BEARDED")
+  @Schema(description = "Id", example = "FOOD_ALLERGY_MILK")
   val id: String,
 
-  @Schema(description = "Short code for the reference data code", example = "FACIAL_HAIR")
+  @Schema(description = "Short code for the reference data domain", example = "FOOD_ALLERGY")
   val domain: String,
 
-  @Schema(description = "Short code for reference data code", example = "BEARDED")
+  @Schema(description = "Short code for reference data code", example = "MILK")
   val code: String,
 
-  @Schema(description = "Description of the reference data code", example = "Full Beard")
+  @Schema(description = "Description of the reference data code", example = "Milk")
   val description: String,
 
   @Schema(

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/dto/ReferenceDataDomainDto.kt

@@ -8,10 +8,10 @@ import java.time.ZonedDateTime
 @Schema(description = "Reference Data Domain")
 @JsonInclude(NON_NULL)
 data class ReferenceDataDomainDto(
-  @Schema(description = "Short code for the reference data domain", example = "HAIR")
+  @Schema(description = "Short code for the reference data domain", example = "FOOD_ALLERGY")
   val code: String,
 
-  @Schema(description = "Description of the reference data domain", example = "Hair type or colour")
+  @Schema(description = "Description of the reference data domain", example = "Food allergy")
   val description: String,
 
   @Schema(

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/dto/ReferenceDataSimpleDto.kt

@@ -7,10 +7,10 @@ import io.swagger.v3.oas.annotations.media.Schema
 @Schema(description = "Reference Data Simple DTO - for use in dropdowns")
 @JsonInclude(NON_NULL)
 data class ReferenceDataSimpleDto(
-  @Schema(description = "Id", example = "FACIAL_HAIR_BEARDED")
+  @Schema(description = "Id", example = "FOOD_ALLERGY_MILK")
   val id: String,
 
-  @Schema(description = "Description of the reference data code", example = "Full Beard")
+  @Schema(description = "Description of the reference data code", example = "Milk")
   val description: String,
 
   @Schema(

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/dto/request/PrisonerHealthUpdateRequest.kt

@@ -1,43 +1,47 @@
 package uk.gov.justice.digital.hmpps.healthandmedication.dto.request
 
+import com.fasterxml.jackson.annotation.JsonAnySetter
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL
+import io.swagger.v3.oas.annotations.StringToClassMapItem
 import io.swagger.v3.oas.annotations.media.Schema
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED
 import uk.gov.justice.digital.hmpps.healthandmedication.annotation.NullishReferenceDataCodeList
 import uk.gov.justice.digital.hmpps.healthandmedication.utils.Nullish
 import uk.gov.justice.digital.hmpps.healthandmedication.utils.getAttributeAsNullish
 
+private abstract class StringList : List<String>
+
 @Schema(
   description = "Request object for updating a prisoner's health information. Can include one or multiple fields. " +
-    "If an attribute is provided and set to 'null' it will be updated equal to 'null'. " +
-    "If it is not provided it is not updated",
+    "If an attribute is not provided it is not updated. Valid reference codes for `foodAllergies` can be retrieved by " +
+    "querying `GET /reference-data/domains/FOOD_ALLERGY` and `GET /reference-data/domains/MEDICAL_DIET` for " +
+    "`medicalDietaryRequirements`.",
+  type = "object",
+  properties = [
+    StringToClassMapItem(key = "foodAllergies", value = StringList::class),
+    StringToClassMapItem(key = "medicalDietaryRequirements", value = StringList::class),
+  ],
+  example = """
+    {
+      "foodAllergies": ["FOOD_ALLERGY_EGG", "FOOD_ALLERGY_MILK"],
+      "medicalDietaryRequirements": ["MEDICAL_DIET_LOW_CHOLESTEROL"]
+    }
+    """,
 )
 @JsonInclude(NON_NULL)
 data class PrisonerHealthUpdateRequest(
   @Schema(hidden = true)
+  @JsonAnySetter
   private val attributes: MutableMap<String, Any?> = mutableMapOf(),
 ) {
-  @Schema(
-    description = "The food allergies the prisoner has. A list of `ReferenceDataCode`.`id`",
-    type = "string[]",
-    example = "[FOOD_ALLERGY_EGG, FOOD_ALLERGY_MILK]",
-    requiredMode = NOT_REQUIRED,
-  )
-  @field:NullishReferenceDataCodeList(
-    domains = ["FOOD_ALLERGY"],
-  )
-  val foodAllergies: Nullish<List<String>> = getAttributeAsNullish<List<String>>(attributes, "foodAllergies")
+  @field:NullishReferenceDataCodeList(domains = ["FOOD_ALLERGY"])
+  @JsonIgnore
+  val foodAllergies: Nullish<List<String>> =
+    getAttributeAsNullish<List<String>>(attributes, "foodAllergies")
 
-  @Schema(
-    description = "The medical dietary requirements the prisoner has. A list of `ReferenceDataCode`.`id`",
-    type = "string[]",
-    example = "[MEDICAL_DIET_LOW_FAT, FREE_FROM_EGG]",
-    requiredMode = NOT_REQUIRED,
-  )
-  @field:NullishReferenceDataCodeList(
-    domains = ["MEDICAL_DIET", "FREE_FROM"],
-  )
+  @field:NullishReferenceDataCodeList(domains = ["MEDICAL_DIET"])
+  @JsonIgnore
   val medicalDietaryRequirements: Nullish<List<String>> =
     getAttributeAsNullish<List<String>>(attributes, "medicalDietaryRequirements")
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/dto/response/HealthDto.kt

@@ -5,9 +5,6 @@ import uk.gov.justice.digital.hmpps.healthandmedication.dto.ReferenceDataSimpleD
 
 @Schema(description = "Health data")
 data class HealthDto(
-  @Schema(description = "Smoker or vaper")
-  val smokerOrVaper: ValueWithMetadata<ReferenceDataSimpleDto?>? = null,
-
   @Schema(description = "Food allergies")
   val foodAllergies: ValueWithMetadata<List<ReferenceDataSimpleDto>>? = null,
 

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/jpa/FieldHistory.kt

@@ -19,7 +19,7 @@ import java.time.ZonedDateTime
 class FieldHistory(
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  val fieldHistoryId: Long = -1,
+  val fieldHistoryId: Long = 0,
 
   // Allow this to mutate in order to handle merges
   var prisonerNumber: String,

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/jpa/FoodAllergy.kt

@@ -20,7 +20,7 @@ class FoodAllergy(
 ) {
   @Id
   @GeneratedValue(strategy = IDENTITY)
-  val id: Long = -1
+  val id: Long = 0
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/jpa/MedicalDietaryRequirement.kt

@@ -22,7 +22,7 @@ class MedicalDietaryRequirement(
 ) {
   @Id
   @GeneratedValue(strategy = IDENTITY)
-  val id: Long = -1
+  val id: Long = 0
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true

src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/ReferenceDataCodeService.kt

@@ -12,18 +12,8 @@ import uk.gov.justice.digital.hmpps.healthandmedication.mapper.toDto
 class ReferenceDataCodeService(
   private val referenceDataCodeRepository: ReferenceDataCodeRepository,
 ) {
-
-  /*
-   * Exclude certain reference data codes
-   */
-  private val excludedCodes = setOf(
-    Pair("FACIAL_HAIR", "NA"),
-    Pair("EYE", "MISSING"),
-  )
-
   fun getReferenceDataCodes(domain: String, includeInactive: Boolean): Collection<ReferenceDataCodeDto> =
     referenceDataCodeRepository.findAllByDomainAndIncludeInactive(domain, includeInactive)
-      .filterNot { excludedCodes.contains(Pair(it.domain.code, it.code)) }
       .map { it.toDto() }
 
   fun getReferenceDataCode(code: String, domain: String): ReferenceDataCodeDto =

src/test/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/controller/PrisonerPrisonerHealthControllerIntTest.kt

@@ -207,7 +207,7 @@ class PrisonerPrisonerHealthControllerIntTest : IntegrationTestBase() {
         ).expectBody().json(
           // language=json
           """
-            { "smokerOrVaper": null,
+            {
               "foodAllergies": {
                 "value": [], 
                 "lastModifiedAt":"2024-06-14T09:10:11+0100",
@@ -263,7 +263,6 @@ class PrisonerPrisonerHealthControllerIntTest : IntegrationTestBase() {
       // language=json
       """
       {
-        "smokerOrVaper": null,
         "foodAllergies": {
           "value": [
             {
@@ -288,7 +287,6 @@ class PrisonerPrisonerHealthControllerIntTest : IntegrationTestBase() {
       // language=json
       """
       {
-        "smokerOrVaper": null,
         "foodAllergies": {
           "value": [
             {

src/test/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/jpa/repository/FieldHistoryRepositoryTest.kt

@@ -4,7 +4,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 import org.springframework.dao.DataIntegrityViolationException
-import org.springframework.orm.jpa.JpaObjectRetrievalFailureException
+import org.springframework.dao.InvalidDataAccessApiUsageException
 import org.springframework.test.context.transaction.TestTransaction
 import uk.gov.justice.digital.hmpps.healthandmedication.enums.HealthAndMedicationField.FOOD_ALLERGY
 import uk.gov.justice.digital.hmpps.healthandmedication.jpa.FieldHistory
@@ -71,7 +71,7 @@ class FieldHistoryRepositoryTest : RepositoryTest() {
       createdBy = USER1,
     )
 
-    assertThrows(JpaObjectRetrievalFailureException::class.java) {
+    assertThrows(InvalidDataAccessApiUsageException::class.java) {
       fieldHistoryRepository.save(fieldHistory).fieldHistoryId
 
       TestTransaction.flagForCommit()