[update] [todo 131518] 更新填寫滿意度問卷的方法，改帶滿意度問卷的id做填寫

wayne

2022-02-10 35057ad6196505ab462d06aeb308f9d7e2a5211b

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

@@ -59,19 +59,23 @@

   public Satisfaction save(Satisfaction satisfaction) {
      satisfaction = satisfactionRepository.save(satisfaction);
      consultantService.setConsultantAvgScore(satisfaction);
        if(satisfaction.getType() == SatisfactionTypeEnum.APPOINTMENT) {
            consultantService.setConsultantAvgScore(satisfaction);
        }
      return satisfaction;
   }

   public Satisfaction scorefaction(SatisfactionCustomerScoreDTO scoreDTO) {
      Optional<Satisfaction> satisfactionOP = getByAppointmentIdAndType(scoreDTO.getAppointmentId(), SatisfactionTypeEnum.APPOINTMENT);
      Optional<Satisfaction> satisfactionOP = satisfactionRepository.findById(scoreDTO.getSatisfactionId());
      Satisfaction satisfaction = satisfactionOP.orElseThrow(SatisfactionNotFoundException::new);
      satisfaction.setScore(scoreDTO.getScore());
      satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
        satisfaction.setType(SatisfactionTypeEnum.APPOINTMENT);
      save(satisfaction);
      personalNotificationService.createScorefactionToConsultant(satisfaction);
      return satisfaction;

        if(satisfaction.getType() == SatisfactionTypeEnum.APPOINTMENT) {
            personalNotificationService.createScorefactionToConsultant(satisfaction);
        }
        return satisfaction;
   }

   public Satisfaction createAppointmentSatisfaction(Appointment appointment) {
@@ -128,15 +132,9 @@
        Optional<Satisfaction> systemSatisfactionOptional =
            satisfactionRepository.findOneByAppointmentIdAndType(scoreDTO.getAppointmentId(), SatisfactionTypeEnum.SYSTEM);

        if(systemSatisfactionOptional.isPresent()) {
            Satisfaction satisfaction = systemSatisfactionOptional.get();
            satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
            satisfaction.setScore(scoreDTO.getScore());
            return satisfactionRepository.save(satisfaction);
        }
        else {
            log.warn("not found the satisfaction record, so can't fill system satisfaction");
            return null;
        }
        Satisfaction satisfaction = systemSatisfactionOptional.orElseThrow(SatisfactionNotFoundException::new);
        satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
        satisfaction.setScore(scoreDTO.getScore());
        return satisfactionRepository.save(satisfaction);
    }
}