Skip to content

Commit

Permalink
fix: set email validated to true to prevent mail send try of new rock…
Browse files Browse the repository at this point in the history
…etchat
  • Loading branch information
Markus Eberl committed Dec 19, 2022
1 parent 69f9a27 commit f95e9ba
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private UserDTO buildValidatedUserDTO(
private UserUpdateRequestDTO buildUserUpdateRequestDTO(
String rcUserId, UpdateAdminConsultantDTO updateConsultantDTO) {
UserUpdateDataDTO userUpdateDataDTO =
new UserUpdateDataDTO(updateConsultantDTO.getEmail(), false);
new UserUpdateDataDTO(updateConsultantDTO.getEmail(), true);
return new UserUpdateRequestDTO(rcUserId, userUpdateDataDTO);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void changeUserAccountEmailAddress(Optional<String> optionalEmail) {
}

private void updateConsultantEmail(Consultant consultant, String email) {
UserUpdateDataDTO userUpdateDataDTO = new UserUpdateDataDTO(email, false);
UserUpdateDataDTO userUpdateDataDTO = new UserUpdateDataDTO(email, true);
UserUpdateRequestDTO requestDTO =
new UserUpdateRequestDTO(consultant.getRocketChatId(), userUpdateDataDTO);
this.rocketChatService.updateUser(requestDTO);
Expand All @@ -119,7 +119,7 @@ private void updateConsultantEmail(Consultant consultant, String email) {
}

private void updateUserEmail(User user, String email) {
UserUpdateDataDTO userUpdateDataDTO = new UserUpdateDataDTO(email, false);
UserUpdateDataDTO userUpdateDataDTO = new UserUpdateDataDTO(email, true);
UserUpdateRequestDTO requestDTO =
new UserUpdateRequestDTO(user.getRcUserId(), userUpdateDataDTO);
this.rocketChatService.updateUser(requestDTO);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void retrieveValidatedConsultant_Should_ReturnConsultant_When_ConsultantI
verify(this.rocketChatService, times(1))
.updateUser(
new UserUpdateRequestDTO(
consultant.getRocketChatId(), new UserUpdateDataDTO("newMail", false)));
consultant.getRocketChatId(), new UserUpdateDataDTO("newMail", true)));
consultant.setEmail("newMail");
verify(this.consultantService, times(1)).saveConsultant(consultant);
verifyNoMoreInteractions(this.rocketChatService);
Expand All @@ -144,7 +144,7 @@ public void retrieveValidatedConsultant_Should_ReturnConsultant_When_ConsultantI
verify(keycloakService).changeEmailAddress(newMail);
verify(this.rocketChatService, times(1))
.updateUser(
new UserUpdateRequestDTO(user.getRcUserId(), new UserUpdateDataDTO(newMail, false)));
new UserUpdateRequestDTO(user.getRcUserId(), new UserUpdateDataDTO(newMail, true)));
verify(this.appointmentService, times(1)).updateAskerEmail(user.getUserId(), newMail);
user.setEmail(newMail);
verify(this.userService, times(1)).saveUser(user);
Expand All @@ -171,7 +171,7 @@ public void retrieveValidatedConsultant_Should_ReturnConsultant_When_ConsultantI
verify(rocketChatService)
.updateUser(
new UserUpdateRequestDTO(
consultant.getRocketChatId(), new UserUpdateDataDTO(dummyEmail, false)));
consultant.getRocketChatId(), new UserUpdateDataDTO(dummyEmail, true)));
consultant.setEmail(dummyEmail);
verify(consultantService).saveConsultant(consultant);
verifyNoMoreInteractions(rocketChatService);
Expand All @@ -195,7 +195,7 @@ public void retrieveValidatedConsultant_Should_ReturnConsultant_When_ConsultantI
verify(keycloakService, never()).changeEmailAddress(anyString());
verify(rocketChatService)
.updateUser(
new UserUpdateRequestDTO(user.getRcUserId(), new UserUpdateDataDTO(dummyEmail, false)));
new UserUpdateRequestDTO(user.getRcUserId(), new UserUpdateDataDTO(dummyEmail, true)));
verify(this.appointmentService, times(1)).updateAskerEmail(user.getUserId(), dummyEmail);
user.setEmail(dummyEmail);
verify(userService).saveUser(user);
Expand Down

0 comments on commit f95e9ba

Please sign in to comment.