Merge branch 'Phase3' into pollex-dev

wayne

2022-02-17 34b08e1c461f5e08675fcff95525956d7c4bef11

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

@@ -4,8 +4,9 @@
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.service.dto.*;

import com.pollex.pam.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -14,11 +15,6 @@
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 java.util.Objects;

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

   @Autowired
   AppointmentService appointmentService;

    @Autowired
    AppointmentMapper appointmentMapper;

   @Autowired
   SatisfactionService satisfactionService;
@@ -53,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}")