Skip to content

Commit

Permalink
feat : 알림 imageUrl Enum 구현 및 알림 이미지 경로 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
LHS-11 committed Jan 4, 2024
1 parent e8e6ce2 commit d9b8ef1
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
}

Expand Down Expand Up @@ -163,10 +161,4 @@ private void notifyUser(List<Policy> 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 반환
}

}
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

}

0 comments on commit d9b8ef1

Please sign in to comment.