Merge branch '預約單更新與刪除'

wayne

2021-12-03 82e2a62e7c90cc191f9e2ebc569fe3a3663b68b0

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

@@ -2,7 +2,11 @@

import java.time.Instant;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import com.pollex.pam.enums.AppointmentStatusEnum;
import com.pollex.pam.service.dto.AppointmentDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +24,9 @@
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
import com.pollex.pam.service.mapper.AppointmentDTOMapper;
import com.pollex.pam.web.rest.errors.AppointmentNotFoundException;

import static com.pollex.pam.enums.AppointmentStatusEnum.AVAILABLE;
import static com.pollex.pam.enums.AppointmentStatusEnum.DELETED;

@Service
@Transactional
@@ -41,7 +48,7 @@

   @Autowired
   AppointmentCustomerViewRepository appointmentCustomerViewRepository;
	

   @Autowired
   SatisfactionService satisfactionService;

@@ -50,7 +57,7 @@
      appointment.setCustomerId(SecurityUtils.getCustomerDBId());
      appointment.setCommunicateStatus(ContactStatusEnum.RESERVED);
      appointmentRepository.save(appointment);
		

   }

   public List<Appointment> findByAgentNo(String agentNo) {
@@ -64,16 +71,17 @@
      return appointmentRepository.save(appointment);
   }


   public AppointmentCustomerViewDTO getAppointmentDetail(Long appointmentId) {
      AppointmentCustomerView appointment = appointmentCustomerViewRepository.findById(appointmentId)
            .orElseThrow(AppointmentNotFoundException::new);
      return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointment);
   }


    public List<Appointment> findByAgentNoAndCustomerId(String agentNo, Long customerId) {
        return appointmentRepository.findByAgentNoAndCustomerId(agentNo, customerId);
    public List<AppointmentCustomerView> findAvailableByAgentNoAndCustomerId(String agentNo, Long customerId) {
        return appointmentCustomerViewRepository.findByAgentNoAndCustomerId(agentNo, customerId)
            .stream()
            .filter(appointmentCustomerView -> appointmentCustomerView.getStatus() == AVAILABLE)
            .collect(Collectors.toList());
    }

    public void recordConsultantReadTime(Long appointmentId) {
@@ -87,4 +95,32 @@
            log.debug("this appointment was read, read time = {}", appointment.getConsultantReadTime());
        }
    }

    public void updateAppointment(AppointmentDTO appointmentDTO) {
        Appointment appointment = appointmentDTOMapper.toAppointment(appointmentDTO);
        appointmentRepository.save(appointment);
    }

    public void markAppointmentDeleted(Long appointmentId) {
        Appointment appointment = appointmentRepository.findById(appointmentId).get();
        appointment.setStatus(DELETED);
        appointmentRepository.save(appointment);
    }

    public void recordAllAppointmentsView(String agentNo) {
        List<Appointment> consultantNotViewAppointments = findByAgentNo(agentNo)
            .stream()
            .filter(appointment -> Objects.isNull(appointment.getConsultantViewTime()))
            .collect(Collectors.toList());

        consultantNotViewAppointments.forEach(appointment -> appointment.setConsultantViewTime(Instant.now()));
        appointmentRepository.saveAll(consultantNotViewAppointments);
    }

    public List<AppointmentCustomerViewDTO> getConsultantAppointments(String agentNo) {
        return appointmentCustomerViewRepository.findByAgentNo(agentNo).stream()
            .filter(appointment -> appointment.getStatus() != DELETED)
            .map(appointmentCustomerViewMapper::toAppointmentCustomerViewDTO)
            .collect(Collectors.toList());
    }
}