Merge branch 'main' into VB-6479-add-sort-order-to-paged-results

Author: dhirajshettymoj

.gitignore

@@ -76,4 +76,4 @@ sonar-project.properties
 .env
 
 #Perf tests
-./src/gatling/resources/data/
+src/gatling/resources/data/

README.md

@@ -1,6 +1,6 @@
 # hmpps-personal-relationships-api
 
-[![repo standards badge](https://img.shields.io/badge/endpoint.svg?&style=flat&logo=github&url=https%3A%2F%2Foperations-engineering-reports.cloud-platform.service.justice.gov.uk%2Fapi%2Fv1%2Fcompliant_public_repositories%2Fhmpps-personal-relationships-api)](https://operations-engineering-reports.cloud-platform.service.justice.gov.uk/public-report/hmpps-personal-relationships-api "Link to report")
+[![Ministry of Justice Repository Compliance Badge](https://github-community.service.justice.gov.uk/repository-standards/api/hmpps-personal-relationships-api/badge)](https://github-community.service.justice.gov.uk/repository-standards/hmpps-personal-relationships-api)
 [![Docker Repository on ghcr](https://img.shields.io/badge/ghcr.io-repository-2496ED.svg?logo=docker)](https://ghcr.io/ministryofjustice/hmpps-personal-relationships-api)
 [![API docs](https://img.shields.io/badge/API_docs_-view-85EA2D.svg?logo=swagger)](https://personal-relationships-api-dev.hmpps.service.justice.gov.uk/swagger-ui/index.html)
 [![GitHub Actions Pipeline](https://github.com/ministryofjustice/hmpps-personal-relationships-api/actions/workflows/pipeline.yml/badge.svg)](https://github.com/ministryofjustice/hmpps-personal-relationships-api/actions/workflows/pipeline.yml)

build.gradle.kts

@@ -2,11 +2,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
 
 plugins {
-  id("uk.gov.justice.hmpps.gradle-spring-boot") version "10.0.3"
+  id("uk.gov.justice.hmpps.gradle-spring-boot") version "10.0.4"
   id("org.openapi.generator") version "7.20.0"
-  id("io.gatling.gradle") version "3.14.9"
-  kotlin("plugin.spring") version "2.3.0"
-  kotlin("plugin.jpa") version "2.3.0"
+  id("io.gatling.gradle") version "3.15.0"
+  kotlin("plugin.spring") version "2.3.10"
+  kotlin("plugin.jpa") version "2.3.10"
 }
 
 allOpen {
@@ -43,48 +43,47 @@ dependencyCheck {
 dependencies {
   // Spring boot dependencies
 
-  implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:2.0.0")
+  implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:2.0.2")
   implementation("org.springframework.boot:spring-boot-starter-webclient")
   implementation("org.springframework.boot:spring-boot-starter-webflux")
   implementation("org.springframework.boot:spring-boot-starter-flyway")
   implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-  implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:6.0.0")
-  implementation("io.sentry:sentry-spring-boot-4-starter:8.31.0")
+  implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:6.0.1")
+  implementation("io.sentry:sentry-spring-boot-4-starter:8.33.0")
   implementation("org.springframework.boot:spring-boot-starter-validation")
   implementation("org.openapitools:jackson-databind-nullable:0.2.9")
   implementation("org.apache.logging.log4j:log4j-api:2.25.3")
-  implementation("io.github.cdimascio:dotenv-kotlin:6.4.1")
+  implementation("io.github.cdimascio:dotenv-kotlin:6.5.1")
 
   // CSV dependencies
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.20.1")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.21.1")
 
   // Database dependencies
   runtimeOnly("org.flywaydb:flyway-database-postgresql")
-  runtimeOnly("org.postgresql:postgresql:42.7.8")
+  runtimeOnly("org.postgresql:postgresql:42.7.10")
   implementation("org.hibernate.orm:hibernate-envers")
   implementation("org.springframework.data:spring-data-envers")
 
   // OpenAPI
-  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1")
+  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2")
 
-  implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.21.0")
+  implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.25.0")
   implementation("org.springframework.boot:spring-boot-jackson2")
-  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.21.0")
+  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.21.1")
 
   // Test dependencies
-  testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:2.0.0")
+  testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:2.0.2")
   testImplementation("org.springframework.boot:spring-boot-starter-webclient-test")
-
   testImplementation("org.springframework.boot:spring-boot-starter-webflux-test")
   testImplementation("org.wiremock:wiremock-standalone:3.13.2")
-  testImplementation("io.swagger.parser.v3:swagger-parser:2.1.37") {
-    testImplementation("org.mockito:mockito-inline:5.2.0")
+  testImplementation("io.swagger.parser.v3:swagger-parser:2.1.39") {
     exclude(group = "io.swagger.core.v3")
   }
+  testImplementation("org.mockito:mockito-inline:5.2.0")
   testImplementation("org.testcontainers:testcontainers-postgresql:2.0.3")
   testImplementation("org.testcontainers:testcontainers-localstack:2.0.3")
   testImplementation("org.awaitility:awaitility-kotlin:4.3.0")
-  testImplementation("io.opentelemetry:opentelemetry-sdk-testing:1.56.0")
+  testImplementation("io.opentelemetry:opentelemetry-sdk-testing:1.59.0")
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException
 import org.springframework.web.servlet.resource.NoResourceFoundException
 import uk.gov.justice.digital.hmpps.personalrelationships.exception.DuplicateEmailException
+import uk.gov.justice.digital.hmpps.personalrelationships.exception.DuplicateIdentityDocumentException
 import uk.gov.justice.digital.hmpps.personalrelationships.exception.DuplicatePersonException
 import uk.gov.justice.digital.hmpps.personalrelationships.exception.DuplicateRelationshipException
 import uk.gov.justice.digital.hmpps.personalrelationships.exception.InvalidReferenceCodeGroupException
@@ -149,7 +150,7 @@ class HmppsContactsApiExceptionHandler {
       ),
     )
 
-  @ExceptionHandler(DuplicatePersonException::class, DuplicateEmailException::class, DuplicateRelationshipException::class)
+  @ExceptionHandler(DuplicatePersonException::class, DuplicateEmailException::class, DuplicateRelationshipException::class, DuplicateIdentityDocumentException::class)
   fun handleDuplicateException(e: RuntimeException): ResponseEntity<ErrorResponse> = ResponseEntity
     .status(CONFLICT)
     .body(

gradlew

@@ -0,0 +1,3 @@
+package uk.gov.justice.digital.hmpps.personalrelationships.exception
+
+class DuplicateIdentityDocumentException(val type: String, val value: String) : RuntimeException("Contact already has an identity document matching type \"$type\" and value \"$value\"")

gradlew.bat

@@ -6,10 +6,12 @@ import jakarta.validation.ValidationException
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.personalrelationships.config.User
 import uk.gov.justice.digital.hmpps.personalrelationships.entity.ContactIdentityEntity
+import uk.gov.justice.digital.hmpps.personalrelationships.exception.DuplicateIdentityDocumentException
 import uk.gov.justice.digital.hmpps.personalrelationships.mapping.toModel
 import uk.gov.justice.digital.hmpps.personalrelationships.model.ReferenceCodeGroup
 import uk.gov.justice.digital.hmpps.personalrelationships.model.request.identity.CreateIdentityRequest
 import uk.gov.justice.digital.hmpps.personalrelationships.model.request.identity.CreateMultipleIdentitiesRequest
+import uk.gov.justice.digital.hmpps.personalrelationships.model.request.identity.IdentityDocument
 import uk.gov.justice.digital.hmpps.personalrelationships.model.request.identity.UpdateIdentityRequest
 import uk.gov.justice.digital.hmpps.personalrelationships.model.response.ContactIdentityDetails
 import uk.gov.justice.digital.hmpps.personalrelationships.model.response.ReferenceCode
@@ -30,6 +32,8 @@ class ContactIdentityService(
   @Transactional
   fun create(contactId: Long, request: CreateIdentityRequest, user: User): ContactIdentityDetails {
     validateContactExists(contactId)
+    validateDuplicateIdentityDocuments(contactId, listOf(IdentityDocument(identityType = request.identityType, identityValue = request.identityValue, issuingAuthority = request.issuingAuthority)))
+
     return createAContactIdentity(
       contactId,
       request.identityType,
@@ -42,6 +46,7 @@ class ContactIdentityService(
   @Transactional
   fun createMultiple(contactId: Long, request: CreateMultipleIdentitiesRequest, user: User): List<ContactIdentityDetails> {
     validateContactExists(contactId)
+    validateDuplicateIdentityDocuments(contactId, request.identities)
     return request.identities.map {
       createAContactIdentity(
         contactId,
@@ -126,6 +131,31 @@ class ContactIdentityService(
       .orElseThrow { EntityNotFoundException("Contact ($contactId) not found") }
   }
 
+  private fun validateDuplicateIdentityDocuments(contactId: Long, identities: List<IdentityDocument>) {
+    val requestedIdentities = identities.map { it.identityType to it.identityValue }
+
+    val duplicateInRequest = requestedIdentities
+      .groupingBy { it }
+      .eachCount()
+      .entries
+      .firstOrNull { it.value > 1 }
+      ?.key
+
+    if (duplicateInRequest != null) {
+      throw DuplicateIdentityDocumentException(duplicateInRequest.first, duplicateInRequest.second)
+    }
+
+    val existingIdentities = contactIdentityRepository.findByContactId(contactId)
+      .map { it.identityType to it.identityValue }
+      .toSet()
+
+    val duplicateExisting = requestedIdentities.firstOrNull { it in existingIdentities }
+
+    if (duplicateExisting != null) {
+      throw DuplicateIdentityDocumentException(duplicateExisting.first, duplicateExisting.second)
+    }
+  }
+
   private fun ContactIdentityEntity.toDomainWithType(
     type: ReferenceCode,
   ) = ContactIdentityDetails(