Merge pull request #148 from studio-recoding/dev

[⚠️!HOTFIX] 29차 배포
studio-recoding · Jul 18, 2024 · 873af19 · 873af19
2 parents 6040761 + 20c143f
commit 873af19
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/Ness/Backend/domain/profile/ProfileService.java b/src/main/java/Ness/Backend/domain/profile/ProfileService.java
@@ -56,6 +56,7 @@ public GetProfileDto getProfile(Long memberId, String email) {
         GetProfileDto getProfileDto = GetProfileDto.builder()
                 .id(profile.getId())
                 .pictureUrl(createPictureUrl(memberId, profile))
+                .pictureKey(profile.getPictureKey())
                 .nickname(profile.getNickname())
                 .name(profile.getName())
                 .isEmailActive(profile.getIsEmailActive())

diff --git a/src/main/java/Ness/Backend/domain/profile/dto/response/GetProfileDto.java b/src/main/java/Ness/Backend/domain/profile/dto/response/GetProfileDto.java
@@ -19,6 +19,9 @@ public class GetProfileDto {
     @Schema(description = "사용자의 공유 프로필 URL", example = "https://lh3.googleusercontent.com/...")
     private String pictureUrl;
 
+    @Schema(description = "사용자의 S3 프로필 사진 경로", example = "/profile/1/...")
+    private String pictureKey;
+
     @Schema(description = "사용자의 닉네임", example = "DongDong")
     private String nickname;
 
@@ -42,10 +45,11 @@ public class GetProfileDto {
     private boolean onBoarding;
 
     @Builder
-    public GetProfileDto(Long id, String pictureUrl, String nickname, String name,
+    public GetProfileDto(Long id, String pictureUrl, String pictureKey, String nickname, String name,
                          PersonaType persona, boolean isEmailActive, String email, boolean onBoarding){
         this.id = id;
         this.pictureUrl = pictureUrl;
+        this.pictureKey = pictureKey;
         this.nickname = nickname;
         this.name = name;
         this.persona = persona;

diff --git a/src/main/java/Ness/Backend/domain/profile/email/EmailService.java b/src/main/java/Ness/Backend/domain/profile/email/EmailService.java
@@ -30,7 +30,7 @@ public void setEmail(Long memberId, Boolean isActive){
     }
 
     // 매일 오전 자정에 스케쥴링(서버 시간 서울)
-    @Scheduled(cron = "0 0 12 * * *")
+    @Scheduled(cron = "0 0 12 * * *", zone = "Asia/Seoul")
     public void scheduleEmailCron(){
         log.info("스케쥴링 활성화");
         List<Member> activeMembers = memberRepository.findMembersByProfileIsEmailActive(true);

diff --git a/src/main/java/Ness/Backend/infra/discord/DiscordMessageGenerator.java b/src/main/java/Ness/Backend/infra/discord/DiscordMessageGenerator.java
@@ -65,7 +65,7 @@ private String getRemoteIp(HttpServletRequest httpServletRequest){
     /* 인포 메세지 생성 */
     public DiscordMessageDto createInfoMessage(Long memberId, String name) {
         return DiscordMessageDto.builder()
-                .content("##🚀 새로운 유저 가입 🚀")
+                .content("## 🚀 새로운 유저 가입 🚀")
                 .embeds(List.of(DiscordEmbedDto.builder()
                                 .title("ℹ️ 유저 정보")
                                 .description("### 🕖 유저 가입 시간\n"