Skip to content

AYS-375 | applicantFirstName, applicantLastName and applicantPhoneNumber Fields Have Been Added to Emergency Evacuation Application List Response #370

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

Merged
merged 2 commits into from
Aug 25, 2024
Merged

AYS-375 | applicantFirstName, applicantLastName and applicantPhoneNumber Fields Have Been Added to Emergency Evacuation Application List Response #370

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
b22b0d5
AYS-375 | `applicantFirstName`, `applicantLastName` and `applicantPho…
agitrubard Aug 23, 2024
1068a92
AYS-375 | `applicantFirstName`, `applicantLastName` and `applicantPho…
agitrubard Aug 23, 2024
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: 3 additions & 0 deletions ...org/ays/emergency_application/model/response/EmergencyEvacuationApplicationsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ public class EmergencyEvacuationApplicationsResponse {
private String firstName;
private String lastName;
private AysPhoneNumber phoneNumber;
private String applicantFirstName;
private String applicantLastName;
private AysPhoneNumber applicantPhoneNumber;
private Integer seatingCount;
private EmergencyEvacuationApplicationStatus status;
private Boolean isInPerson;
Expand Down
38 changes: 27 additions & 11 deletions .../org/ays/emergency_application/controller/EmergencyEvacuationApplicationEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class EmergencyEvacuationApplicationEndToEndTest extends AysEndToEndTest {
private final EmergencyEvacuationApplicationToApplicationResponseMapper emergencyEvacuationApplicationToApplicationResponseMapper = EmergencyEvacuationApplicationToApplicationResponseMapper.initialize();


private final String BASE_PATH = "/api/v1";
private static final String BASE_PATH = "/api/v1";

@Test
void givenValidEmergencyEvacuationApplicationListRequest_whenEmergencyEvacuationApplicationsFound_thenReturnAysPageResponseOfEmergencyEvacuationApplicationsResponse() throws Exception {
Expand Down Expand Up @@ -116,6 +116,14 @@ void givenValidEmergencyEvacuationApplicationListRequest_whenEmergencyEvacuation
.isNotEmpty())
.andExpect(AysMockResultMatchersBuilders.contents("phoneNumber.lineNumber")
.isNotEmpty())
.andExpect(AysMockResultMatchersBuilders.contents("applicantFirstName")
.exists())
.andExpect(AysMockResultMatchersBuilders.contents("applicantLastName")
.exists())
.andExpect(AysMockResultMatchersBuilders.contents("applicantPhoneNumber.countryCode")
.exists())
.andExpect(AysMockResultMatchersBuilders.contents("applicantPhoneNumber.lineNumber")
.exists())
.andExpect(AysMockResultMatchersBuilders.contents("seatingCount")
.isNotEmpty())
.andExpect(AysMockResultMatchersBuilders.contents("status")
Expand Down Expand Up @@ -174,25 +182,33 @@ void givenValidEmergencyEvacuationApplicationListRequest_whenEmergencyEvacuation
.isNotEmpty())
.andExpect(AysMockResultMatchersBuilders.contentSize()
.value(0))
.andExpect(AysMockResultMatchersBuilders.firstContent("id")
.andExpect(AysMockResultMatchersBuilders.contents("id")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.contents("referenceNumber")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.contents("firstName")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.contents("lastName")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("referenceNumber")
.andExpect(AysMockResultMatchersBuilders.contents("phoneNumber.countryCode")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("firstName")
.andExpect(AysMockResultMatchersBuilders.contents("phoneNumber.lineNumber")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("lastName")
.andExpect(AysMockResultMatchersBuilders.contents("applicantFirstName")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("phoneNumber.countryCode")
.andExpect(AysMockResultMatchersBuilders.contents("applicantLastName")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("phoneNumber.lineNumber")
.andExpect(AysMockResultMatchersBuilders.contents("applicantPhoneNumber.countryCode")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("seatingCount")
.andExpect(AysMockResultMatchersBuilders.contents("applicantPhoneNumber.lineNumber")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("status")
.andExpect(AysMockResultMatchersBuilders.contents("seatingCount")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("isInPerson")
.andExpect(AysMockResultMatchersBuilders.contents("status")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.firstContent("createdAt")
.andExpect(AysMockResultMatchersBuilders.contents("isInPerson")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.contents("createdAt")
.doesNotExist())
.andExpect(AysMockResultMatchersBuilders.response("pageNumber")
.value(1))
Expand Down
Loading