Skip to content

Commit

Permalink
feat/VIC-1745_Calcom_Email_Sync
Browse files Browse the repository at this point in the history
  • Loading branch information
adnanalicic committed Oct 11, 2022
1 parent 19f3185 commit 73145e1
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import de.caritas.cob.userservice.api.model.Language;
import de.caritas.cob.userservice.api.port.out.IdentityClient;
import de.caritas.cob.userservice.api.service.ConsultantService;
import de.caritas.cob.userservice.api.service.appointment.AppointmentService;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.NonNull;
Expand All @@ -31,6 +32,7 @@ public class ConsultantUpdateService {
private final @NonNull ConsultantService consultantService;
private final @NonNull UserAccountInputValidator userAccountInputValidator;
private final @NonNull RocketChatService rocketChatService;
private final @NonNull AppointmentService appointmentService;

/**
* Updates the basic data of consultant with given id.
Expand Down Expand Up @@ -62,7 +64,9 @@ public Consultant updateConsultant(
this.rocketChatService.updateUser(
buildUserUpdateRequestDTO(consultant.getRocketChatId(), updateConsultantDTO));

return updateDatabaseConsultant(updateConsultantDTO, consultant);
var updatedConsultant = updateDatabaseConsultant(updateConsultantDTO, consultant);
appointmentService.updateConsultant(updatedConsultant);
return updatedConsultant;
}

private UserDTO buildValidatedUserDTO(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.caritas.cob.userservice.api.adapters.web.dto.ConsultantAdminResponseDTO;
import de.caritas.cob.userservice.api.adapters.web.dto.ConsultantDTO;
import de.caritas.cob.userservice.api.adapters.web.dto.CreateConsultantAgencyDTO;
import de.caritas.cob.userservice.api.config.apiclient.AppointmentAgencyServiceApiControllerFactory;
import de.caritas.cob.userservice.api.config.apiclient.AppointmentConsultantServiceApiControllerFactory;
import de.caritas.cob.userservice.api.model.Consultant;
import de.caritas.cob.userservice.api.port.out.IdentityClient;
import de.caritas.cob.userservice.api.service.httpheader.SecurityHeaderSupplier;
import de.caritas.cob.userservice.api.service.httpheader.TenantHeaderSupplier;
Expand Down Expand Up @@ -71,6 +73,17 @@ public void createConsultant(ConsultantAdminResponseDTO consultantAdminResponseD
}
}

public void updateConsultant(Consultant consultant) {
ConsultantAdminResponseDTO ConsultantAdminResponseDTO = new ConsultantAdminResponseDTO();
ConsultantDTO consultantEmbeded = new ConsultantDTO();
consultantEmbeded.setFirstname(consultant.getFirstName());
consultantEmbeded.setLastname(consultant.getLastName());
consultantEmbeded.setEmail(consultant.getEmail());
consultantEmbeded.setAbsent(consultant.isAbsent());
ConsultantAdminResponseDTO.setEmbedded(consultantEmbeded);
updateConsultant(ConsultantAdminResponseDTO);
}

public void updateConsultant(ConsultantAdminResponseDTO consultantAdminResponseDTO) {
if (!appointmentFeatureEnabled) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import de.caritas.cob.userservice.api.exception.httpresponses.BadRequestException;
import de.caritas.cob.userservice.api.model.Consultant;
import de.caritas.cob.userservice.api.service.ConsultantService;
import de.caritas.cob.userservice.api.service.appointment.AppointmentService;
import java.util.Optional;
import org.jeasy.random.EasyRandom;
import org.junit.Test;
Expand All @@ -36,6 +37,8 @@ public class ConsultantUpdateServiceTest {

@Mock private RocketChatService rocketChatService;

@Mock private AppointmentService appointmentService;

@Test(expected = BadRequestException.class)
public void
updateConsultant_Should_throwBadRequestException_When_givenConsultantIdDoesNotExist() {
Expand Down

0 comments on commit 73145e1

Please sign in to comment.