[update] 更新預約單API調整

wayne

2021-12-03 d7bcd8a8f81d85fe1524c4d785aaed58cd217586

[update] 更新預約單API調整

 pamapi/src/doc/¹w¬ù³æ/§ó·s¹w¬ù³æ©ú²ÓAPI.txt

@@ -11,15 +11,8 @@
    "age": "under_20",
    "job": "內勤",
    "requirement": "健康與保障,子女教育,資產規劃",
    "communicateStatus": "reserved",
    "hopeContactTime": "'禮拜一,禮拜二,禮拜三,禮拜四,禮拜五,禮拜六,禮拜日、9:00~12:00,12:00~14:00,14:00~18:00,18:00~21:00'",
    "otherRequirement": null,
    "appointmentDate": "2021-12-01T04:27:20.154Z",
    "lastModifiedDate": "2021-12-01T04:27:20.154Z",
    "agentNo": "J149388015",
    "customerId": 76,
    "consultantViewTime": null,
    "consultantReadTime": null
    "otherRequirement": null
}

http response status: 204

 pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java

@@ -5,8 +5,7 @@
import java.util.Objects;
import java.util.stream.Collectors;

import com.pollex.pam.enums.AppointmentStatusEnum;
import com.pollex.pam.service.dto.AppointmentDTO;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,9 +59,19 @@
        appointmentRepository.save(appointment);
    }

    public void updateAppointment(AppointmentDTO appointmentDTO) {
        Appointment appointment = appointmentDTOMapper.toAppointment(appointmentDTO);
        appointment.setStatus(AVAILABLE);
    public void updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
        Appointment appointment = appointmentRepository.findById(updateAppointmentDTO.getId()).get();

        appointment.setPhone(updateAppointmentDTO.getPhone());
        appointment.setEmail(updateAppointmentDTO.getEmail());
        appointment.setContactType(updateAppointmentDTO.getContactType());
        appointment.setGender(updateAppointmentDTO.getGender());
        appointment.setAge(updateAppointmentDTO.getAge());
        appointment.setJob(updateAppointmentDTO.getJob());
        appointment.setRequirement(updateAppointmentDTO.getRequirement());
        appointment.setHopeContactTime(updateAppointmentDTO.getHopeContactTime());
        appointment.setOtherRequirement(updateAppointmentDTO.getOtherRequirement());

        appointmentRepository.save(appointment);
    }


 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentUpdateDTO.java

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,94 @@
package com.pollex.pam.service.dto;

public class AppointmentUpdateDTO {
    private Long id;
    private String phone;
    private String email;
    private String contactType;
    private String gender;
    private String age;
    private String job;
    private String requirement;
    private String hopeContactTime;
    private String otherRequirement;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getPhone() {
        return phone;
    }

    public void setPhone(String phone) {
        this.phone = phone;
    }

    public String getEmail() {
        return email;
    }

    public void setEmail(String email) {
        this.email = email;
    }

    public String getContactType() {
        return contactType;
    }

    public void setContactType(String contactType) {
        this.contactType = contactType;
    }

    public String getGender() {
        return gender;
    }

    public void setGender(String gender) {
        this.gender = gender;
    }

    public String getAge() {
        return age;
    }

    public void setAge(String age) {
        this.age = age;
    }

    public String getJob() {
        return job;
    }

    public void setJob(String job) {
        this.job = job;
    }

    public String getRequirement() {
        return requirement;
    }

    public void setRequirement(String requirement) {
        this.requirement = requirement;
    }

    public String getHopeContactTime() {
        return hopeContactTime;
    }

    public void setHopeContactTime(String hopeContactTime) {
        this.hopeContactTime = hopeContactTime;
    }

    public String getOtherRequirement() {
        return otherRequirement;
    }

    public void setOtherRequirement(String otherRequirement) {
        this.otherRequirement = otherRequirement;
    }
}

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

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

import com.pollex.pam.service.dto.AppointmentDTO;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@
    SatisfactionService satisfactionService;

    @PutMapping("")
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentDTO appointment) {
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
        appointmentService.updateAppointment(appointment);
        return ResponseEntity.noContent().build();
    }

 pamapi/src/main/resources/config/application-dev.yml

@@ -33,6 +33,7 @@
  datasource:
    type: com.zaxxer.hikari.HikariDataSource
    url: jdbc:postgresql://dev.pollex.com.tw:5433/pam
    #url: jdbc:postgresql://localhost:5432/omo?currentSchema=omo
    username: pamadmin
    password: pamadmin
    hikari: