Merge branch 'pollex-dev' into sit

wayne

2022-03-11 242fad1691917c4fd82c7f04b6190a7113628e93

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

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

import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SendMsgService;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.appointment.process.AppointmentProcess;
import com.pollex.pam.business.domain.Appointment;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.SendMsgService;

import com.pollex.pam.business.service.dto.*;
import com.pollex.pam.business.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
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;
import com.pollex.pam.business.service.AppointmentService;
import com.pollex.pam.business.service.PersonalNotificationService;
import com.pollex.pam.business.service.SatisfactionService;

import java.util.Objects;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.*;

@RestController
@RequestMapping("/api/appointment")
@@ -26,6 +26,9 @@

   @Autowired
   AppointmentService appointmentService;

    @Autowired
    AppointmentMapper appointmentMapper;

   @Autowired
   SatisfactionService satisfactionService;
@@ -39,6 +42,7 @@
    @Autowired
    PersonalNotificationService personalNotificationService;

    @AuditLoggingInject(type = CUSTOMER_EDIT_APPOINTMENT)
    @PutMapping("")
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO dto) {
       Appointment appointment = appointmentService.updateAppointment(dto);
@@ -46,16 +50,21 @@
        return ResponseEntity.noContent().build();
    }

    @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CANCEL_APPOINTMENT)
    @DeleteMapping("/{appointmentId}")
    public ResponseEntity<Void> markAppointmentDeleted(@PathVariable Long appointmentId) {
        appointmentService.markAppointmentDeleted(appointmentId);
        return ResponseEntity.noContent().build();
    }

    @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CREATE_APPOINTMENT)
   @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}")
@@ -64,17 +73,20 @@
       return appointmentService.getAppointmentDetail(appointmentId);
    }

    @AuditLoggingInject(type = CHECK_APPOINTMENT)
   @GetMapping("/getDetail/{appointmentId}")
   public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
      return appointmentService.getAppointmentDetail(appointmentId);
   }

    @AuditLoggingInject(type = CONSULTANT_READ_APPOINTMENT)
   @PostMapping("/recordRead/{appointmentId}")
    public ResponseEntity<Void> recordConsultantReadAppointment(@PathVariable Long appointmentId) {
        appointmentService.recordConsultantReadTime(appointmentId);
        return ResponseEntity.noContent().build();
    }

    @AuditLoggingInject(type = APPOINTMENT_CLOSE)
   @PostMapping("/close")
    public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
      appointmentService.closeAppointment(closeDTO);