Skip to content

CIRC-2339 Fix borrower preferredFirstName fallback logic #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roman-barannyk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

CIRC-2339 Fix borrower preferredFirstName fallback logic #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7816582
CIRC-2339 preferredFirstName falls back to the firstName
roman-barannyk Nov 5, 2025
5ce1f6a
Merge branch 'master' into CIRC-2339
roman-barannyk Nov 5, 2025
6eca980
CIRC-2339 remove redundant extra line
roman-barannyk Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/folio/circulation/domain/LoanRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.folio.circulation.domain;

import static java.util.Objects.isNull;
import static org.apache.commons.lang3.StringUtils.firstNonBlank;
import static org.folio.circulation.domain.representations.LoanProperties.BORROWER;
import static org.folio.circulation.domain.representations.LoanProperties.LOAN_POLICY;
import static org.folio.circulation.domain.representations.LoanProperties.LOST_ITEM_POLICY;
Expand Down Expand Up @@ -177,7 +178,7 @@ private void additionalBorrowerProperties(JsonObject loanRepresentation, User bo
borrowerSummary.put("lastName", borrower.getLastName());
borrowerSummary.put("middleName", borrower.getMiddleName());
borrowerSummary.put("barcode", borrower.getBarcode());
borrowerSummary.put("preferredFirstName",borrower.getPreferredFirstName());
borrowerSummary.put("preferredFirstName", firstNonBlank(borrower.getPreferredFirstName(), borrower.getFirstName()));
borrowerSummary.put("patronGroup",borrower.getPatronGroupId());
loanRepresentation.put(BORROWER, borrowerSummary);
additionalPatronGroupProperties(loanRepresentation, borrower.getPatronGroup());
Expand Down
22 changes: 21 additions & 1 deletion src/test/java/api/loans/LoanAPITests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
import api.support.builders.AccountBuilder;
import api.support.builders.ItemBuilder;
import api.support.builders.LoanBuilder;
import api.support.builders.UserBuilder;
import api.support.fakes.FakePubSub;
import api.support.fixtures.ConfigurationExample;
import api.support.http.IndividualResource;
import api.support.http.ItemResource;
import api.support.http.UserResource;
Expand Down Expand Up @@ -280,6 +280,26 @@ void canGetLoansWithAdditionalFieldsRequiredForDueDateSlip() {
loan.getJsonObject("item").containsKey("seriesStatements"), is(true));
}

@Test
void borrowerPreferredFirstNameFallsBackToFirstNameWhenBlankOrNull() {
testPreferredFirstName("Jones", "Steven", "", "Steven", itemsFixture.basedUponSmallAngryPlanet());
testPreferredFirstName("Rodwell", "James", null, "James", itemsFixture.basedUponNod());
testPreferredFirstName("Kim", "Jam", "kimJ", "kimJ", itemsFixture.basedUponDunkirk());
}

private void testPreferredFirstName(String lastName, String firstName, String preferredFirstName,
String expectedFirstName, IndividualResource item) {

var user = usersFixture.from(new UserBuilder()
.withPreferredFirstName(lastName, firstName, preferredFirstName)
.withActive(true));
var loan = loansFixture.createLoan(item, user);
var loanJson = loansFixture.getLoanById(loan.getId()).getJson();
assertThat("Borrower preferredFirstName logic",
loanJson.getJsonObject("borrower").getString("preferredFirstName"),
is(expectedFirstName));
}

@Test
void canGetLoanWithoutOpenFeesFines() {
UUID id = UUID.randomUUID();
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/api/support/fixtures/UsersFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ public void defaultAdmin() {
.withId(APITestContext.getUserId()));
}

public UserResource from(UserBuilder userBuilder) {
return createIfAbsent(userBuilder
.inGroupFor(patronGroupsFixture.staff()));
}

private UserResource createIfAbsent(UserBuilder userBuilder) {
return new UserResource(userRecordCreator.createIfAbsent(userBuilder));
}
Expand Down