From d9b8ef1f8b579487067353f31aee792c17ca1280 Mon Sep 17 00:00:00 2001 From: LHS-11 Date: Fri, 5 Jan 2024 01:25:32 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EC=95=8C=EB=A6=BC=20imageUrl=20Enum?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84=20=EB=B0=8F=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/security/SecurityConfig.java | 4 ++-- .../api/NotificationController.java | 1 - .../application/NotificationScheduler.java | 20 ++++++------------ .../domain/NotificationImage.java | 13 ++++++++++++ .../notification/domain/NotificationType.java | 17 +++++++++------ .../static/image/{ => alarm}/END_DATE.png | Bin .../static/image/{ => alarm}/STT_DATE.png | Bin 7 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationImage.java rename src/main/resources/static/image/{ => alarm}/END_DATE.png (100%) rename src/main/resources/static/image/{ => alarm}/STT_DATE.png (100%) diff --git a/src/main/java/com/cmc/zenefitserver/global/config/security/SecurityConfig.java b/src/main/java/com/cmc/zenefitserver/global/config/security/SecurityConfig.java index 61c3dbe..75cdd9b 100644 --- a/src/main/java/com/cmc/zenefitserver/global/config/security/SecurityConfig.java +++ b/src/main/java/com/cmc/zenefitserver/global/config/security/SecurityConfig.java @@ -69,8 +69,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .antMatchers("/auth/**").permitAll() .antMatchers("/auth/login").permitAll() .antMatchers("/notify/test").permitAll() - .antMatchers("/image/STT_DATE.png").permitAll() - .antMatchers("/image/END_DATE.png").permitAll() + .antMatchers("/image/alarm/STT_DATE.png").permitAll() + .antMatchers("/image/alarm/END_DATE.png").permitAll() // .antMatchers("/gpt").permitAll() .anyRequest().authenticated() .and() diff --git a/src/main/java/com/cmc/zenefitserver/global/infra/notification/api/NotificationController.java b/src/main/java/com/cmc/zenefitserver/global/infra/notification/api/NotificationController.java index ae9f0ff..6d8ba7b 100644 --- a/src/main/java/com/cmc/zenefitserver/global/infra/notification/api/NotificationController.java +++ b/src/main/java/com/cmc/zenefitserver/global/infra/notification/api/NotificationController.java @@ -3,7 +3,6 @@ import com.cmc.zenefitserver.domain.user.domain.User; import com.cmc.zenefitserver.global.annotation.AuthUser; import com.cmc.zenefitserver.global.common.CommonResponse; -import com.cmc.zenefitserver.global.infra.fcm.FCMService; import com.cmc.zenefitserver.global.infra.notification.application.NotificationService; import com.cmc.zenefitserver.global.infra.notification.dto.NotificationListInfoResponseDto; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/cmc/zenefitserver/global/infra/notification/application/NotificationScheduler.java b/src/main/java/com/cmc/zenefitserver/global/infra/notification/application/NotificationScheduler.java index f9b989f..92acc48 100644 --- a/src/main/java/com/cmc/zenefitserver/global/infra/notification/application/NotificationScheduler.java +++ b/src/main/java/com/cmc/zenefitserver/global/infra/notification/application/NotificationScheduler.java @@ -42,53 +42,51 @@ public void notifyUser() { public void notifyUserByEndDate(LocalDate now) { - String imageUrl = getImageUrl(SearchDateType.END_DATE); // D-1 notifyUser( policyRepository.findAllByApplyEndDate(now.plusDays(1)), NotificationType.APPLY_END_DATE_D_DAY_ONE.getTitle(), NotificationType.APPLY_END_DATE_D_DAY_ONE.getContent(), - imageUrl + NotificationType.APPLY_END_DATE_D_DAY_ONE.getImageUrl() ); // D-3 notifyUser( policyRepository.findAllByApplyEndDate(now.plusDays(3)), NotificationType.APPLY_END_DATE_D_DAY_THREE.getTitle(), NotificationType.APPLY_END_DATE_D_DAY_THREE.getContent(), - imageUrl + NotificationType.APPLY_END_DATE_D_DAY_THREE.getImageUrl() ); // D-7 notifyUser( policyRepository.findAllByApplyEndDate(now.plusDays(7)), NotificationType.APPLY_END_DATE_D_DAY_SEVEN.getTitle(), NotificationType.APPLY_END_DATE_D_DAY_SEVEN.getContent(), - imageUrl + NotificationType.APPLY_END_DATE_D_DAY_SEVEN.getImageUrl() ); } public void notifyUserBySttDate(LocalDate now) { - String imageUrl = getImageUrl(SearchDateType.STT_DATE); // D-1 notifyUser( policyRepository.findAllByApplySttDate(now.plusDays(1)), NotificationType.APPLY_STT_DATE_D_DAY_ONE.getTitle(), NotificationType.APPLY_STT_DATE_D_DAY_ONE.getContent(), - imageUrl + NotificationType.APPLY_STT_DATE_D_DAY_ONE.getImageUrl() ); // D-3 notifyUser( policyRepository.findAllByApplySttDate(now.plusDays(3)), NotificationType.APPLY_STT_DATE_D_DAY_THREE.getTitle(), NotificationType.APPLY_STT_DATE_D_DAY_THREE.getContent(), - imageUrl + NotificationType.APPLY_STT_DATE_D_DAY_THREE.getImageUrl() ); // D-7 notifyUser( policyRepository.findAllByApplySttDate(now.plusDays(7)), NotificationType.APPLY_STT_DATE_D_DAY_SEVEN.getTitle(), NotificationType.APPLY_END_DATE_D_DAY_SEVEN.getContent(), - imageUrl + NotificationType.APPLY_END_DATE_D_DAY_SEVEN.getImageUrl() ); } @@ -163,10 +161,4 @@ private void notifyUser(List policies, String titlePrefix, String conten // return url.toString(); // 이미지 URL 반환 // } - public String getImageUrl(SearchDateType searchDateType) { - String baseUrl = "https://giftyyy.shop"; - String imageName = searchDateType.name() + ".png"; // 'STT_DATE.png' 또는 'END_DATE.png' - return baseUrl + "/image/" + imageName; // 정적 이미지 URL 반환 - } - } diff --git a/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationImage.java b/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationImage.java new file mode 100644 index 0000000..7522c8a --- /dev/null +++ b/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationImage.java @@ -0,0 +1,13 @@ +package com.cmc.zenefitserver.global.infra.notification.domain; + +public enum NotificationImage { + + STT_DATE("https://giftyyy.shop/image/alarm/STT_DATE.png"), + END_DATE("https://giftyyy.shop/image/alarm/END_DATE.png"); + + final String imageUrl; + + NotificationImage(String imageUrl) { + this.imageUrl = imageUrl; + } +} diff --git a/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationType.java b/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationType.java index 64b4259..02b0fa4 100644 --- a/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationType.java +++ b/src/main/java/com/cmc/zenefitserver/global/infra/notification/domain/NotificationType.java @@ -6,20 +6,23 @@ @Getter public enum NotificationType { - APPLY_END_DATE_D_DAY_ONE("신청마감일 D-1", "내일이 신청 마감일이에요.\n서둘러 신청하세요!", SearchDateType.END_DATE), - APPLY_END_DATE_D_DAY_THREE("신청마감일 D-3", "신청일이 얼마 남지 않았어요.\n서둘러 신청하세요!", SearchDateType.END_DATE), - APPLY_END_DATE_D_DAY_SEVEN("신청마감일 D-7", "일주일 뒤 신청이 마감돼요.", SearchDateType.END_DATE), - APPLY_STT_DATE_D_DAY_ONE("신청시작일 D-1", "내일부터 신청이 시작돼요!", SearchDateType.STT_DATE), - APPLY_STT_DATE_D_DAY_THREE("신청시작일 D-3", "신청시작일이 얼마 남지 않았어요.", SearchDateType.STT_DATE), - APPLY_STT_DATE_D_DAY_SEVEN("신청시작일 D-7", "일주일 뒤 신청이 시작돼요.", SearchDateType.STT_DATE); + APPLY_END_DATE_D_DAY_ONE("신청마감일 D-1", "내일이 신청 마감일이에요.\n서둘러 신청하세요!", SearchDateType.END_DATE, NotificationImage.END_DATE.imageUrl), + APPLY_END_DATE_D_DAY_THREE("신청마감일 D-3", "신청일이 얼마 남지 않았어요.\n서둘러 신청하세요!", SearchDateType.END_DATE, NotificationImage.END_DATE.imageUrl), + APPLY_END_DATE_D_DAY_SEVEN("신청마감일 D-7", "일주일 뒤 신청이 마감돼요.", SearchDateType.END_DATE, NotificationImage.END_DATE.imageUrl), + APPLY_STT_DATE_D_DAY_ONE("신청시작일 D-1", "내일부터 신청이 시작돼요!", SearchDateType.STT_DATE, NotificationImage.STT_DATE.imageUrl), + APPLY_STT_DATE_D_DAY_THREE("신청시작일 D-3", "신청시작일이 얼마 남지 않았어요.", SearchDateType.STT_DATE, NotificationImage.STT_DATE.imageUrl), + APPLY_STT_DATE_D_DAY_SEVEN("신청시작일 D-7", "일주일 뒤 신청이 시작돼요.", SearchDateType.STT_DATE, NotificationImage.STT_DATE.imageUrl); final String title; final String content; final SearchDateType searchDateType; + final String imageUrl; - NotificationType(String title, String content, SearchDateType searchDateType) { + NotificationType(String title, String content, SearchDateType searchDateType, String imageUrl) { this.title = title; this.content = content; this.searchDateType = searchDateType; + this.imageUrl = imageUrl; } + } diff --git a/src/main/resources/static/image/END_DATE.png b/src/main/resources/static/image/alarm/END_DATE.png similarity index 100% rename from src/main/resources/static/image/END_DATE.png rename to src/main/resources/static/image/alarm/END_DATE.png diff --git a/src/main/resources/static/image/STT_DATE.png b/src/main/resources/static/image/alarm/STT_DATE.png similarity index 100% rename from src/main/resources/static/image/STT_DATE.png rename to src/main/resources/static/image/alarm/STT_DATE.png