DTSRD-2134.Delete User from Professional #1589
Conversation
src/main/java/uk/gov/hmcts/reform/professionalapi/service/impl/OrganisationServiceImpl.java
Show resolved
Hide resolved
src/main/java/uk/gov/hmcts/reform/professionalapi/service/impl/OrganisationServiceImpl.java
Outdated
Show resolved
Hide resolved
|
|
||
| JsonPath response = professionalApiClient.deleteUserFromOrganisation(userDeletionRequest,OK); | ||
|
|
||
| assertThat(response).isNotNull(); |
There was a problem hiding this comment.
- Add find call and assert user not found after deletion
- Add scenario for deletion failed email addresses from PRD
- Add scenario for deletion failed email addresses from UP
| public DeleteUserResponse deleteUserForOrganisation(List<String> emails) { | ||
| var deleteOrganisationResponse = new DeleteOrganisationResponse(); | ||
| if (emails.isEmpty()) { | ||
| throw new InvalidRequest("Please provide both email addresses"); |
There was a problem hiding this comment.
dont understand this message why both email addresses ?
| Set<String> userIds = new HashSet<>(); | ||
| Optional.ofNullable(professionalUserRepository | ||
| .findByEmailAddress(RefDataUtil.removeAllSpaces(email))) | ||
| .ifPresentOrElse(professionalUser -> { |
There was a problem hiding this comment.
Delete users only when not ADMIN
| .findByEmailAddress(RefDataUtil.removeAllSpaces(email))) | ||
| .ifPresentOrElse(professionalUser -> { | ||
| userIds.add(professionalUser.getUserIdentifier()); | ||
| userAttributeRepository.deleteByProfessionalUserId(professionalUser.getId()); |
There was a problem hiding this comment.
cascade delete should take care of it
you also need to delete user from user account map table explicitly as its not present in professional user class
|
|
||
| Set<String> userIdsToBeDeleted = emails.stream().map( | ||
| email -> { | ||
| Set<String> userIds = new HashSet<>(); |
There was a problem hiding this comment.
you dont need this set object, return it from stream itself
| Collectors.toSet())); | ||
| deleteOrganisationResponse = RefDataUtil | ||
| .deleteUserProfilesFromUp(deleteUserProfileRequest, userProfileFeignClient); | ||
| if (deleteOrganisationResponse == null) { |
There was a problem hiding this comment.
this line is not required, response will contain either success or error status or it wont come back if any FeignException
| @Test | ||
| void testDeleteProfessionalUserFromOrganisation() { | ||
| DeleteUserResponse deleteUserResponse = | ||
| new DeleteUserResponse(STATUS_CODE_204, "The organisation has deleted successfully"); |
There was a problem hiding this comment.
wrong message you are trying delete user : The organisation has deleted successfully
|
|
||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
1)Add scenario for deletion failed email addresses from PRD
2)Add scenario for deletion failed email addresses from UP
| import org.springframework.stereotype.Repository; | ||
| import uk.gov.hmcts.reform.professionalapi.domain.UserAttribute; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| @Repository | ||
| public interface UserAttributeRepository extends JpaRepository<UserAttribute, UUID> { | ||
|
|
||
| @Modifying | ||
| @Query(value = "delete from dbrefdata.user_attribute ua where ua.professional_user_id=:profUserId", |
There was a problem hiding this comment.
do you need this native query, cascade delete should take care of it
| verify(userProfileFeignClient, times(0)).deleteUserProfile(any()); | ||
|
|
||
| DeleteUserResponse deleteUserResponse = | ||
| new DeleteUserResponse(204, "The organisation has deleted successfully"); |
There was a problem hiding this comment.
wrong message you are trying delete user : The organisation has deleted successfully
Jira link (if applicable)
Change description
Checklist