Merge branch 'Phase3' into pollex-dev

wayne

2022-02-17 34b08e1c461f5e08675fcff95525956d7c4bef11

 pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java

@@ -12,8 +12,8 @@
import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.config.Constants;
import com.pollex.pam.enums.SatisfactionTypeEnum;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.web.rest.errors.NotFoundExpiringAppointmentException;
import com.pollex.pam.web.rest.errors.SendEmailFailException;
import com.pollex.pam.web.rest.errors.SendSMSFailException;
import io.jsonwebtoken.lang.Assert;
@@ -159,7 +159,7 @@
    }

    public void setSatisfactionScore(AppointmentCustomerViewDTO dto, Long appointmentId) {
        satisfactionService.getByAppointmentId(appointmentId).ifPresent(satisfaction -> {
        satisfactionService.getByAppointmentIdAndType(appointmentId, SatisfactionTypeEnum.APPOINTMENT).ifPresent(satisfaction -> {
            dto.setSatisfactionScore(satisfaction.getScore());
        });
    }
@@ -200,7 +200,8 @@
    public void sendAppointmentNotify(Appointment appointment) {
        Assert.notNull(appointment, "appointment entity cannot be null");

        log.debug("is need send appointment notify msg? = {}", applicationProperties.isSendNotifyMsg());
        log.debug("is need send appointment notify msg? sms = {}, email = {}",
            applicationProperties.getSms().isSendNotifyMsg(), applicationProperties.getEmail().isSendNotifyMsg());

        log.debug("sending appointment notify, appointmentId = {}", appointment.getId());
        sendAppointmentNotifyBySMS(appointment);