Skip to content

Commit 7b034bb

Browse files
Ewan-DonovanEwan Donovan
and
Ewan Donovan
authored
Make Mismatch Logic Case Insensitive (#70)
* Lowercase checks * trim --------- Co-authored-by: Ewan Donovan <ewan.donovan@digital.justice.com>
1 parent 413b430 commit 7b034bb

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/LearnersService.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ class LearnersService(
7171
sharedFieldNames.forEach { fieldName ->
7272
val requestValue = requestFieldNames[fieldName]?.call(request)?.toString()
7373
val learnerValue = learnerFieldNames[fieldName]?.call(learner)?.toString()
74-
75-
if (requestValue != learnerValue && learnerValue != null && requestValue != null) {
74+
val neitherAreNull = (learnerValue != null && requestValue != null)
75+
if (requestValue.orEmpty().trim().lowercase() != learnerValue.orEmpty().trim().lowercase() && neitherAreNull) {
7676
mismatchedFields.computeIfAbsent(fieldName) { mutableListOf() }
77-
.add(learnerValue)
77+
.add(learnerValue.orEmpty())
7878
}
7979
}
8080
}

src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnersResourceIntTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ class LearnersResourceIntTest : IntegrationTestBase() {
202202
responseType = LRSResponseType.POSSIBLE_MATCH,
203203
mismatchedFields = mutableMapOf(
204204
("dateOfBirth" to mutableListOf("1995-06-28", "1995-06-28")),
205-
// ("gender" to mutableListOf("2", "2")),
206205
("lastKnownPostCode" to mutableListOf("SO40 4JX")),
207206
),
208207
matchedLearners = expectedPossibleMatchLearners,

src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/LearnersServiceTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ class LearnersServiceTest {
160160
dateOfBirth = LocalDate.of(1980, 1, 1),
161161
gender = Gender.MALE,
162162
lastKnownPostCode = "ABCDEF",
163-
previousFamilyName = "Test",
164-
schoolAtAge16 = "Test High School",
165-
placeOfBirth = "Some place",
163+
previousFamilyName = "TeSt",
164+
schoolAtAge16 = "Test High SchOol",
165+
placeOfBirth = "Some plAce",
166166
emailAddress = "test_email@test.com",
167167
)
168168

0 commit comments

Comments
 (0)