feat(*): fix failing tests after rebase main

ministryofjustice · Feb 26, 2025 · 953a987 · 953a987
1 parent c0b09b3
commit 953a987
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/...n/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/LearnerEventsResource.kt b/...n/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/LearnerEventsResource.kt
@@ -14,9 +14,9 @@ import uk.gov.justice.digital.hmpps.learnerrecordsapi.config.AuditEvent.createAu
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.config.Roles.ROLE_LEARNER_RECORDS_SEARCH__RO
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.logging.LoggerUtil
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.logging.LoggerUtil.log
-import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.db.MatchEntity
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.lrsapi.response.exceptions.MatchNotFoundException
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.request.LearnerEventsRequest
+import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.CheckMatchResponse
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.LearnerEventsResponse
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.openapi.LearnerEventsApi
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.openapi.LearnerEventsByNomisIdApi
@@ -57,11 +57,11 @@ class LearnerEventsResource(
     val nomisId = nomisId.getAsString("nomisId")
     auditService.publishEvent(createAuditEvent(searchLearnerEventsByNomisId, userName, nomisId))
     logger.log("Received a post request to learner events by Nomis ID endpoint", nomisId)
-    val matchEntity: MatchEntity? = learnerEventsService.getMatchEntityForNomisId(nomisId)
-    if (matchEntity == null) {
+    val checkMatchResponse: CheckMatchResponse? = learnerEventsService.getMatchEntityForNomisId(nomisId)
+    if (checkMatchResponse == null) {
       throw MatchNotFoundException(nomisId)
     } else {
-      val learnerEventsRequest = learnerEventsService.formLearningEventRequestFromMatchEntity(matchEntity)
+      val learnerEventsRequest = learnerEventsService.formLearningEventRequestFromMatchEntity(checkMatchResponse)
       val learnerEventsResponse = learnerEventsService.getLearningEvents(learnerEventsRequest, userName)
       return ResponseEntity.status(HttpStatus.OK).body(learnerEventsResponse)
     }

diff --git a/...ain/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/LearnerEventsService.kt b/...ain/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/LearnerEventsService.kt
@@ -7,11 +7,11 @@ import uk.gov.justice.digital.hmpps.learnerrecordsapi.config.HttpClientConfigura
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.config.LRSConfiguration
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.logging.LoggerUtil
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.logging.LoggerUtil.debugLog
-import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.db.MatchEntity
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.lrsapi.response.LearningEventsResponse
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.lrsapi.response.exceptions.LRSException
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.request.Gender
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.request.LearnerEventsRequest
+import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.CheckMatchResponse
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.LRSResponseType
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.LearnerEventsResponse
 
@@ -57,13 +57,13 @@ class LearnerEventsService(
     )
   }
 
-  fun getMatchEntityForNomisId(nomisId: String): MatchEntity? = matchService.findMatch(MatchEntity(nomisId = nomisId))
+  fun getMatchEntityForNomisId(nomisId: String): CheckMatchResponse? = matchService.findMatch(nomisId = nomisId)
 
-  fun formLearningEventRequestFromMatchEntity(matchEntity: MatchEntity): LearnerEventsRequest = LearnerEventsRequest(
-    matchEntity.givenName.orEmpty(),
-    matchEntity.familyName.orEmpty(),
-    matchEntity.matchedUln.orEmpty(),
-    matchEntity.dateOfBirth,
-    Gender.valueOf(matchEntity.gender.orEmpty()),
+  fun formLearningEventRequestFromMatchEntity(checkMatchResponse: CheckMatchResponse): LearnerEventsRequest = LearnerEventsRequest(
+    checkMatchResponse.givenName.orEmpty(),
+    checkMatchResponse.familyName.orEmpty(),
+    checkMatchResponse.matchedUln.orEmpty(),
+    checkMatchResponse.dateOfBirth,
+    Gender.valueOf(checkMatchResponse.gender.orEmpty()),
   )
 }
diff --git a/...k/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnerEventsResourceIntTest.kt b/...k/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnerEventsResourceIntTest.kt
@@ -382,7 +382,7 @@ class LearnerEventsResourceIntTest : IntegrationTestBase() {
     val actualResponse = objectMapper.readValue(
       webTestClient.post()
         .uri("/learner-events/nomisId")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RO")))
+        .headers(setAuthorisation(roles = listOf(ROLE_LEARNER_RECORDS_SEARCH__RO)))
         .header("X-Username", "TestUser")
         .bodyValue(requestJson)
         .accept(MediaType.parseMediaType("application/json"))
@@ -414,7 +414,7 @@ class LearnerEventsResourceIntTest : IntegrationTestBase() {
     val actualResponse = objectMapper.readValue(
       webTestClient.post()
         .uri("/learner-events/nomisId")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RO")))
+        .headers(setAuthorisation(roles = listOf(ROLE_LEARNER_RECORDS_SEARCH__RO)))
         .header("X-Username", "TestUser")
         .bodyValue(requestJson)
         .accept(MediaType.parseMediaType("application/json"))

diff --git a/...lin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnersResourceIntTest.kt b/...lin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnersResourceIntTest.kt
@@ -412,7 +412,7 @@ class LearnersResourceIntTest : IntegrationTestBase() {
 
       webTestClient.post()
         .uri("/learner-events/nomisId")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RO")))
+        .headers(setAuthorisation(roles = listOf(ROLE_LEARNER_RECORDS_SEARCH__RO)))
         .header("X-Username", "TestUser")
         .bodyValue(requestJson)
         .accept(MediaType.parseMediaType("application/json"))

diff --git a/...tlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/LearnerEventsResourceTest.kt b/...tlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/LearnerEventsResourceTest.kt
@@ -12,8 +12,9 @@ import org.mockito.Mockito.`when`
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.any
 import org.springframework.http.HttpStatus
-import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.db.MatchEntity
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.lrsapi.response.exceptions.MatchNotFoundException
+import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.CheckMatchResponse
+import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.response.CheckMatchStatus
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.service.LearnerEventsService
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.service.MatchService
 import uk.gov.justice.hmpps.sqs.audit.HmppsAuditService
@@ -55,13 +56,13 @@ class LearnerEventsResourceTest {
   @Test
   fun `should return entity if record found`(): Unit = runTest {
     `when`(mockLearnerEventsService.getMatchEntityForNomisId(any())).thenReturn(
-      MatchEntity(
-        nomisId = nomisId,
+      CheckMatchResponse(
         matchedUln = matchedUln,
         familyName = familyName,
         givenName = givenName,
         dateOfBirth = dateOfBirth,
         gender = gender,
+        status = CheckMatchStatus.Found,
       ),
     )
     val requestJson = JSONObject()