diff --git a/src/main/java/co/orange/ddanzi/service/AlarmService.java b/src/main/java/co/orange/ddanzi/service/AlarmService.java index 098e00ba..0f71caf0 100644 --- a/src/main/java/co/orange/ddanzi/service/AlarmService.java +++ b/src/main/java/co/orange/ddanzi/service/AlarmService.java @@ -7,6 +7,7 @@ import co.orange.ddanzi.domain.user.Alarm; import co.orange.ddanzi.domain.user.User; import co.orange.ddanzi.domain.user.enums.FcmCase; +import co.orange.ddanzi.dto.alarm.AlarmResponseDto; import co.orange.ddanzi.dto.alarm.MyAlarm; import co.orange.ddanzi.global.jwt.AuthUtils; import co.orange.ddanzi.repository.AlarmRepository; @@ -49,8 +50,9 @@ public ApiResponse getAlarms(){ } else myAlarm.orderId(order.getId()); + myAlarmList.add(myAlarm.build()); } - return ApiResponse.onSuccess(Success.GET_ALARM_LIST_SUCCESS,myAlarmList); + return ApiResponse.onSuccess(Success.GET_ALARM_LIST_SUCCESS, AlarmResponseDto.builder().alarmList(myAlarmList).build()); } @Transactional @@ -76,4 +78,14 @@ private String createAlarmTime(LocalDateTime createdAt){ } } + public void createAlarm(User user, FcmCase alarmCase, Order order){ + log.info("Create Alarm Record"); + Alarm newAlarm = Alarm.builder() + .alarmCase(alarmCase) + .user(user) + .order(order) + .build(); + alarmRepository.save(newAlarm); + } + }