Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into ...

HelenHuang

2022-01-20 f5831acafe510f9a79f8e2ecf6dee09026d67fc6

 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java

@@ -1,14 +1,22 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.service.SendMsgService;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import com.pollex.pam.service.dto.ClosedProcessDTO;
import com.pollex.pam.service.dto.DoneProcessDTO;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.service.dto.AppointmentCloseDTO;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;

@@ -24,6 +32,9 @@

    @Autowired
    SendMsgService sendMsgService;
    
    @Autowired
    AppointmentProcess abstractAppointmentProcess;

    @PutMapping("")
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
@@ -40,13 +51,14 @@
   @PostMapping("/customer/create")
   public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
        Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
        sendMsgService.sendAppointmentNotify(appointment);
        appointmentService.sendAppointmentNotify(appointment);
    }

   @PostMapping("/markAsContacted/{appointmentId}")
   public void markAsContacted(@PathVariable Long appointmentId) {
   public AppointmentCustomerViewDTO markAsContacted(@PathVariable Long appointmentId) {
      appointmentService.markAsContacted(appointmentId);
   }
       return appointmentService.getAppointmentDetail(appointmentId);
    }

   @GetMapping("/getDetail/{appointmentId}")
   public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
@@ -58,4 +70,28 @@
        appointmentService.recordConsultantReadTime(appointmentId);
        return ResponseEntity.noContent().build();
    }
	
   @PostMapping("/close")
    public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
      appointmentService.closeAppointment(closeDTO);
        return ResponseEntity.noContent().build();
    }
	
//   @PostMapping("/close/info/edit")
//    public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
//		
//      if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
//         DoneProcessDTO dto = new DoneProcessDTO();
//         BeanUtils.copyProperties(closeDTO, dto);
//         abstractAppointmentProcess.editClosedInfo(dto);
//      }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
//         ClosedProcessDTO dto = new ClosedProcessDTO();
//         BeanUtils.copyProperties(closeDTO, dto);
//         abstractAppointmentProcess.editClosedInfo(dto);
//      }else {
//         return ResponseEntity.notFound().build();
//      }
//		
//        return ResponseEntity.noContent().build();
//    }
}