From 073f149c57f79d61bf605c9d38e332259b49d96d Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期六, 22 一月 2022 14:56:05 +0800
Subject: [PATCH] Merge branch '未處理預約單API' into Phase3

---
 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java |   89 +++++++++++++++++++++++++-------------------
 1 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
index dd2fc14..ac19b72 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
@@ -2,23 +2,23 @@
 
 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 org.springframework.beans.BeanUtils;
 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;
+
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/api/appointment")
@@ -32,13 +32,17 @@
 
     @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();
     }
 
@@ -70,40 +74,47 @@
         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);
+
+        if(Objects.nonNull(customerNewestExpiringAppointment)) {
+            return new ResponseEntity<>(customerNewestExpiringAppointment, HttpStatus.OK);
+        }
+        else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
     }
+
+    @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();
+//    }
 }

--
Gitblit v1.8.0