Merge branch 'sit' into uat

wayne

2022-02-17 a3716f72066d25d745f4d5103ff23a553c3e102b

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

@@ -2,24 +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")
@@ -28,15 +23,18 @@
   @Autowired
   AppointmentService appointmentService;

    @Autowired
    AppointmentMapper appointmentMapper;

   @Autowired
   SatisfactionService satisfactionService;

    @Autowired
    SendMsgService sendMsgService;
    

    @Autowired
    AppointmentProcess abstractAppointmentProcess;
    

    @Autowired
    PersonalNotificationService personalNotificationService;

@@ -54,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}")
@@ -75,16 +76,30 @@
        appointmentService.recordConsultantReadTime(appointmentId);
        return ResponseEntity.noContent().build();
    }
	

   @PostMapping("/close")
    public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
      appointmentService.closeAppointment(closeDTO);
        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);
@@ -96,7 +111,7 @@
//      }else {
//         return ResponseEntity.notFound().build();
//      }
//		
//
//        return ResponseEntity.noContent().build();
//    }
}