From 6ed4664d6b1fe9c43dd8f1de3f938f391cd58d02 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 13 Feb 2025 00:19:25 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-411=20Fix=20:=20=EB=AF=B8=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EC=95=8C=EB=A6=BC=20=EA=B0=9C=EC=88=98=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistense/NotificationPersistenceAdapter.java | 2 +- .../repository/notification/NotificationRepository.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java index 1d215d31..e0d05331 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java @@ -51,7 +51,7 @@ public List findNotificationsByTaskId(Long taskId) { @Override public Integer countNotification(final Long memberId) { - return notificationRepository.countByIsReadFalseAndReceiver_MemberId(memberId); + return notificationRepository.countUnreadByMemberId(memberId); } @Override diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java index 9a364a83..dac62ae9 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java @@ -29,5 +29,9 @@ Slice findAllByReceiver_MemberIdOrderByCreatedAtDesc( List findByTask_TaskId(Long taskId); - Integer countByIsReadFalseAndReceiver_MemberId(Long memberId); + @Query("SELECT COUNT(n) FROM NotificationEntity n " + + "WHERE n.isRead = false " + + "AND n.receiver.memberId = :memberId " + + "AND n.task.isDeleted = false") + Integer countUnreadByMemberId(@Param("memberId") Long memberId); } \ No newline at end of file From f126b017365547974f366b915579e86d98c03203 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 13 Feb 2025 09:43:32 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-411=20Fix=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=EA=B0=80=20=EC=B7=A8=EC=86=8C=ED=95=9C=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=EB=93=A4=20=ED=95=84=ED=84=B0=EB=A7=81=ED=95=98?= =?UTF-8?q?=EB=8A=94=20query=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/notification/NotificationRepository.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java index dac62ae9..eeffa700 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java @@ -17,21 +17,18 @@ public interface NotificationRepository extends JpaRepository findAllByReceiver_MemberIdOrderByCreatedAtDesc( @Param("receiverId") Long receiverId, Pageable pageable); @Query("SELECT n FROM NotificationEntity n " + - "WHERE n.receiver.memberId = :receiverId " + - "AND n.task.isDeleted = false") + "WHERE n.receiver.memberId = :receiverId") List findAllByReceiver_MemberId(Long receiverId); List findByTask_TaskId(Long taskId); @Query("SELECT COUNT(n) FROM NotificationEntity n " + "WHERE n.isRead = false " + - "AND n.receiver.memberId = :memberId " + - "AND n.task.isDeleted = false") + "AND n.receiver.memberId = :memberId") Integer countUnreadByMemberId(@Param("memberId") Long memberId); } \ No newline at end of file From a453638b2779444790e53e142d8964ba0c67c0d7 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 13 Feb 2025 09:49:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-411=20Fix=20:=20=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20redirect=20url=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/adapter/outbound/api/email/EmailTemplateBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java index 8239845f..ded65266 100644 --- a/src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java @@ -100,7 +100,7 @@ public EmailTemplate createNewPasswordTemplate(String receiver, String receiverN Context context = new Context(); String templateName = "new-password"; String subject = "[TaskFlow] 비밀번호 재설정"; - context.setVariable("loginLink", "http://localhost:5173/login"); + context.setVariable("loginLink", REDIRECT_URL_LOGIN); context.setVariable("newPassword", newPassword); context.setVariable("receiverName", receiverName); String body = templateEngine.process(templateName, context);