Skip to content

Fix #968: validate Last Name mandatory field in CSV bulk upload #969

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
areychana wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #968: validate Last Name mandatory field in CSV bulk upload #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6cb1e7
Fix #968: validate Last Name mandatory field in CSV bulk upload
areychana Mar 11, 2026
b9307d9
Fix indentation in setLastName method
areychana Mar 11, 2026
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
11 changes: 10 additions & 1 deletion avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/SubjectWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ private void write(Row row, String type, String locationHierarchy) throws Except
setFirstName(row, individual, allErrorMsgs);
if (subjectType.isAllowMiddleName())
individual.setMiddleName(row.get(SubjectHeadersCreator.middleName));
individual.setLastName(row.get(SubjectHeadersCreator.lastName));
if (subjectType.isPerson())
setLastName(row, individual, allErrorMsgs);
setProfilePicture(subjectType, individual, row, allErrorMsgs);
if (subjectType.isPerson())
setDateOfBirth(individual, row, allErrorMsgs);
Expand Down Expand Up @@ -208,4 +209,12 @@ private void setGender(Individual individual, Row row, List<String> allErrorMsgs
}
individual.setGender(gender);
}
private static void setLastName(Row row, Individual individual, List<String> allErrorMsgs) {
String lastName = row.get(SubjectHeadersCreator.lastName);
if (!StringUtils.hasText(lastName)) {
allErrorMsgs.add(String.format("Value required for mandatory field: '%s'", SubjectHeadersCreator.lastName));
return;
}
individual.setLastName(lastName);
}
}
30 changes: 29 additions & 1 deletion ...src/test/java/org/avni/server/importer/batch/csv/writer/SubjectWriterIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,35 @@ public void missingMandatoryCoreValues() {
"qg text",
"456",
"789");
failure(validHeader(), dataRow, "None of the expected address levels provided. Expected one of: [District], value required for mandatory field: 'date of birth', value required for mandatory field: 'date of registration', value required for mandatory field: 'first name', value required for mandatory field: 'gender'");
failure(validHeader(), dataRow, "None of the expected address levels provided. Expected one of: [District], value required for mandatory field: 'date of birth', value required for mandatory field: 'date of registration', value required for mandatory field: 'first name', value required for mandatory field: 'gender', value required for mandatory field: 'last name'");
}

@Test
public void missingLastName() {
organisationConfigService.saveRegistrationLocation(district, subjectType);
String[] dataRow = dataRow("ABCD",
"SubjectType1",
"2020-01-01",
"21.5135243,85.6731848",
"John",
"",
"1990-01-01",
"true",
"Male",
"",
"Bihar",
"District1",
"SSC Answer 1",
"\"MSC Answer 1\", \"MSC Answer 2\"",
"2020-01-01",
"text",
"123",
"some notes",
"\"MSDC Answer 1\", \"MSDC Answer 2\"",
"qg text",
"456",
"789");
failure(validHeader(), dataRow, "value required for mandatory field: 'Last Name'");
}

@Test
Expand Down