Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Jack

2021-12-01 2f0789c087589a053f6c80e3bfb17b0a4c2c4514

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

@@ -1,7 +1,10 @@
package com.pollex.pam.service;

import java.time.Instant;
import java.util.List;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,12 +19,13 @@
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
import com.pollex.pam.service.mapper.AppointmentDTOMapper;
import com.pollex.pam.service.mapper.AppointmentMapper;
import com.pollex.pam.web.rest.errors.AppointmentNotFoundException;

@Service
@Transactional
public class AppointmentService {

    private static final Logger log = LoggerFactory.getLogger(AppointmentService.class);

   @Autowired
   AppointmentRepository appointmentRepository;
@@ -37,23 +41,27 @@

   @Autowired
   AppointmentCustomerViewRepository appointmentCustomerViewRepository;
	
   @Autowired
   SatisfactionService satisfactionService;

   public void customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) {
      Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO);
      appointment.setCustomerId(SecurityUtils.getCustomerId());
      appointment.setCustomerId(SecurityUtils.getCustomerDBId());
      appointment.setCommunicateStatus(ContactStatusEnum.RESERVED);
      appointmentRepository.save(appointment);
		
   }

   public List<Appointment> findByAgentNo(String agentNo) {
      return appointmentRepository.findByAgentNo(agentNo);
   }

   public void markAsContacted(Long appointmentId) {
   public Appointment markAsContacted(Long appointmentId) {

      Appointment appointment = appointmentRepository.getById(appointmentId);
      Appointment appointment = appointmentRepository.findById(appointmentId).get();
      appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
      appointmentRepository.save(appointment);
      return appointmentRepository.save(appointment);
   }


@@ -67,4 +75,16 @@
    public List<Appointment> findByAgentNoAndCustomerId(String agentNo, Long customerId) {
        return appointmentRepository.findByAgentNoAndCustomerId(agentNo, customerId);
    }

    public void recordConsultantReadTime(Long appointmentId) {
        Appointment appointment = appointmentRepository.findById(appointmentId).get();

        if(appointment.getConsultantReadTime() == null) {
            appointment.setConsultantReadTime(Instant.now());
            appointmentRepository.save(appointment);
        }
        else {
            log.debug("this appointment was read, read time = {}", appointment.getConsultantReadTime());
        }
    }
}