Merge branch 'pollex-dev' into sit

wayne

2022-02-17 4394e4248455637ab7836756058ac872fdf4af10

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

@@ -2,23 +2,19 @@

import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.security.SecurityUtils;
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 com.pollex.pam.service.dto.*;

import org.springframework.beans.BeanUtils;
import com.pollex.pam.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
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.PersonalNotificationService;
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;

@RestController
@RequestMapping("/api/appointment")
@@ -27,18 +23,25 @@
   @Autowired
   AppointmentService appointmentService;

    @Autowired
    AppointmentMapper appointmentMapper;

   @Autowired
   SatisfactionService satisfactionService;

    @Autowired
    SendMsgService sendMsgService;
    

    @Autowired
    AppointmentProcess abstractAppointmentProcess;

    @Autowired
    PersonalNotificationService personalNotificationService;

    @PutMapping("")
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
        appointmentService.updateAppointment(appointment);
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO dto) {
       Appointment appointment = appointmentService.updateAppointment(dto);
        personalNotificationService.createUpdateAppointmentToConsultant(appointment);
        return ResponseEntity.noContent().build();
    }

@@ -49,9 +52,12 @@
    }

   @PostMapping("/customer/create")
   public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
   public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
        Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
        appointmentService.sendAppointmentNotify(appointment);
        satisfactionService.createUnfilledSystemSatisfaction(appointment);

        return appointmentMapper.toAppointmentDTO(appointment);
    }

   @PostMapping("/markAsContacted/{appointmentId}")
@@ -70,40 +76,42 @@
        appointmentService.recordConsultantReadTime(appointmentId);
        return ResponseEntity.noContent().build();
    }
	

   @PostMapping("/close")
    public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
		
      if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
         DoneProcessDTO dto = new DoneProcessDTO();
         BeanUtils.copyProperties(closeDTO, dto);
         abstractAppointmentProcess.process(dto);
      }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
         ClosedProcessDTO dto = new ClosedProcessDTO();
         BeanUtils.copyProperties(closeDTO, dto);
         abstractAppointmentProcess.process(dto);
      }else {
         return ResponseEntity.notFound().build();
      }
		
      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();

    @GetMapping("/customer/expiring/newest")
    public ResponseEntity<AppointmentCustomerViewDTO> getNewestExpiringAppointment() {
        Long customerId = SecurityUtils.getCustomerDBId();
        AppointmentCustomerViewDTO customerNewestExpiringAppointment = appointmentService.getCustomerNewestExpiringAppointment(customerId);

        return new ResponseEntity<>(customerNewestExpiringAppointment, HttpStatus.OK);
    }

    @GetMapping("/consultant/pending/sum")
    public ResponseEntity<Long> getConsultantPendingAppointmentSum() {
        String agentNo = SecurityUtils.getAgentNo();
        return new ResponseEntity<>(appointmentService.getConsultantPendingAppointmentSum(agentNo), HttpStatus.OK);
    }

//   @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();
//    }
}