Merge remote-tracking branch 'origin/develop' into release-test

joowojr · joowojr · commit 90bd260d6ca9 · 2025-02-10T10:01:38.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
@@ -1,5 +1,6 @@
 package clap.server.adapter.inbound.security.filter;
 
+import clap.server.application.port.inbound.auth.CheckAccountLockStatusUseCase;
 import clap.server.application.service.auth.LoginAttemptService;
 import clap.server.exception.AuthException;
 import jakarta.servlet.FilterChain;
@@ -25,7 +26,7 @@
 @Slf4j
 public class LoginAttemptFilter extends OncePerRequestFilter {
 
-    private final LoginAttemptService loginAttemptService;
+    private final CheckAccountLockStatusUseCase checkAccountLockStatusUseCase;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -34,7 +35,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
                 String clientIp = getClientIp(request);
 
-                loginAttemptService.checkAccountIsLocked(clientIp);
+                checkAccountLockStatusUseCase.checkAccountIsLocked(clientIp);
 
             }
         } catch (AuthException e) {
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java
@@ -9,8 +9,6 @@ public record UpdateMemberInfoRequest(
         String name,
         @NotNull @Schema(description = "이미지 수정이 있을 시에는 false을, 이미지를 삭제할 때에는 true을 보냅니다.")
         Boolean isProfileImageDeleted,
-        @Schema(description = "아지트 알림 수신 여부")
-        boolean agitNotification,
         @Schema(description = "이메일 알림 수신 여부")
         boolean emailNotification,
         @Schema(description = "카카오 워크 알림 수신 여부")
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java
@@ -23,8 +23,6 @@ public record MemberDetailInfoResponse(
         NotificationSettingInfoResponse notificationSettingInfo
 ) {
     public static record NotificationSettingInfoResponse(
-            @Schema(description = "아지트 알림 수신 여부")
-            boolean agit,
             @Schema(description = "이메일 알림 수신 여부")
             boolean email,
             @Schema(description = "카카오 워크 알림 수신 여부")
diff --git a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java
@@ -24,6 +24,7 @@ public class CommandCommentController {
     private final EditCommentUsecase editCommentUsecase;
     private final DeleteCommentUsecase deleteCommentUsecase;
 
+    @Deprecated
     @Operation(summary = "댓글 수정")
     @Parameter(name = "commentId", description = "수정할 댓글 고유 ID", required = true, in = ParameterIn.PATH)
     @PatchMapping("/{commentId}")
diff --git a/src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java b/src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java
@@ -23,7 +23,6 @@ public class ManagementNotificationController {
     private final UpdateNotificationUsecase updateNotificationUsecase;
     private final UpdateAllNotificationUsecase updateAllNotificationUsecase;
     private final EnableKakaoUsecase enableKakaoUsecase;
-    private final EnableAgitUsecase enableAgitUsecase;
     private final EnableEmailUsecase enableEmailUsecase;
 
     @Operation(summary = "알림 목록에서 한 개 눌렀을 때 읽음 처리")
@@ -40,18 +39,14 @@ public void updateAllNotificationIsRead(@AuthenticationPrincipal SecurityUserDet
         updateAllNotificationUsecase.updateAllNotification(userInfo.getUserId());
     }
 
+    @Deprecated
     @Operation(summary = "카카오 푸시 알림 활성화/비활성화 API", description = "알림 거부였을 시 -> 승인으로 변경, 알림 승인이였을 시 -> 거부로 변경")
     @PatchMapping("/kakao")
     public void enableKaKaoWork(@AuthenticationPrincipal SecurityUserDetails userInfo) {
         enableKakaoUsecase.enableKakao(userInfo.getUserId());
     }
 
-    @Operation(summary = "아지트 푸시 알림 활성화/비활성화 API", description = "알림 거부였을 시 -> 승인으로 변경, 알림 승인이였을 시 -> 거부로 변경")
-    @PatchMapping("/agit")
-    public void enableAgit(@AuthenticationPrincipal SecurityUserDetails userInfo) {
-        enableAgitUsecase.enableAgit(userInfo.getUserId());
-    }
-
+    @Deprecated
     @Operation(summary = "이메일 푸시 알림 활성화/비활성화 API", description = "알림 거부였을 시 -> 승인으로 변경, 알림 승인이였을 시 -> 거부로 변경")
     @PatchMapping("/email")
     public void enableEmail(@AuthenticationPrincipal SecurityUserDetails userInfo) {
diff --git a/src/main/java/clap/server/adapter/inbound/web/notification/SubscribeEmitterController.java b/src/main/java/clap/server/adapter/inbound/web/notification/SubscribeEmitterController.java
@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+@Deprecated
 @Tag(name = "SSE 관리 - 회원 등록(최초 접속시)")
 @WebAdapter
 @RequestMapping("/api/sse")
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
@@ -56,10 +56,6 @@ public class MemberEntity extends BaseTimeEntity {
     @Builder.Default
     private Boolean kakaoworkNotificationEnabled = Boolean.TRUE;;
 
-    @Column(name = "agit_notification_enabled")
-    @Builder.Default
-    private Boolean agitNotificationEnabled = Boolean.TRUE;;
-
     @Column(name = "email_notification_enabled")
     @Builder.Default
     private Boolean emailNotificationEnabled = Boolean.TRUE;;
diff --git a/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java b/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java
@@ -38,24 +38,11 @@ public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member)
 
     public static MemberDetailInfoResponse.NotificationSettingInfoResponse toNotificationSettingInfoResponse(Member member) {
         return new MemberDetailInfoResponse.NotificationSettingInfoResponse(
-                member.getAgitNotificationEnabled(),
                 member.getEmailNotificationEnabled(),
                 member.getKakaoworkNotificationEnabled()
         );
 
     }
-    public static Member toMember(MemberInfo memberInfo) {
-        return Member.builder()
-                .memberInfo(memberInfo)
-                .agitNotificationEnabled(null)
-                .emailNotificationEnabled(null)
-                .kakaoworkNotificationEnabled(null)
-                .admin(null)
-                .imageUrl(null)
-                .status(null)
-                .password(null)
-                .build();
-    }
 
     public static MemberDetailsResponse toMemberDetailsResponse(Member member) {
         return new MemberDetailsResponse(
diff --git a/src/main/java/clap/server/application/port/inbound/auth/CheckAccountLockStatusUseCase.java b/src/main/java/clap/server/application/port/inbound/auth/CheckAccountLockStatusUseCase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.auth;
+
+public interface CheckAccountLockStatusUseCase {
+    void checkAccountIsLocked(String clientIp);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java
@@ -2,7 +2,9 @@
 
 import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest;
 
+@Deprecated
 public interface EditCommentUsecase {
 
+    @Deprecated
     void editComment(Long memberId, Long commentId, EditCommentRequest request);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/notification/EnableAgitUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/EnableAgitUsecase.java
diff --git a/src/main/java/clap/server/application/port/inbound/notification/EnableEmailUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/EnableEmailUsecase.java
@@ -1,6 +1,8 @@
 package clap.server.application.port.inbound.notification;
 
+@Deprecated
 public interface EnableEmailUsecase {
 
+    @Deprecated
     void enableEmail(Long memberId);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/notification/EnableKakaoUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/EnableKakaoUsecase.java
@@ -1,6 +1,8 @@
 package clap.server.application.port.inbound.notification;
 
+@Deprecated
 public interface EnableKakaoUsecase {
 
+    @Deprecated
     void enableKakao(Long memberId);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/notification/SubscribeSseUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/SubscribeSseUsecase.java
@@ -2,7 +2,9 @@
 
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+@Deprecated
 public interface SubscribeSseUsecase {
 
+    @Deprecated
     SseEmitter subscribe(Long memberId);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/log/LoggingPort.java b/src/main/java/clap/server/application/port/outbound/log/LoggingPort.java
@@ -0,0 +1,10 @@
+package clap.server.application.port.outbound.log;
+
+import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
+import jakarta.servlet.http.HttpServletRequest;
+
+public interface LoggingPort {
+    void createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName);
+    void createMemberLog(HttpServletRequest request, int statusCode, String customCode,LogStatus logStatus, Object responseBody, String requestBody, Long memberId);
+    void createLoginFailedLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, String requestBody, String nickName);
+}
diff --git a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
@@ -1,21 +1,22 @@
 package clap.server.application.service.auth;
 
+import clap.server.application.port.inbound.auth.CheckAccountLockStatusUseCase;
 import clap.server.application.port.outbound.auth.loginLog.CommandLoginLogPort;
 import clap.server.application.port.outbound.auth.loginLog.LoadLoginLogPort;
 import clap.server.domain.model.auth.LoginLog;
 import clap.server.exception.AuthException;
 import clap.server.exception.code.AuthErrorCode;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
 @RequiredArgsConstructor
-@Component
+@Service
 @Transactional
-public class LoginAttemptService {
+public class LoginAttemptService implements CheckAccountLockStatusUseCase {
     private final LoadLoginLogPort loadLoginLogPort;
     private final CommandLoginLogPort commandLoginLogPort;
     private static final int MAX_FAILED_ATTEMPTS = 5;
@@ -36,6 +37,7 @@ public void recordFailedAttempt(String clientIp, String attemptNickname) {
         commandLoginLogPort.save(loginLog);
     }
 
+    @Override
     public void checkAccountIsLocked(String clientIp) {
         LoginLog loginLog = loadLoginLogPort.findByClientIp(clientIp).orElse(null);
         if (loginLog == null) {
diff --git a/src/main/java/clap/server/application/service/log/LogService.java b/src/main/java/clap/server/application/service/log/LogService.java
@@ -1,15 +1,15 @@
-package clap.server.application.port.inbound.domain;
+package clap.server.application.service.log;
 
 import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
+import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.auth.loginLog.LoadLoginLogPort;
 import clap.server.application.port.outbound.log.CommandLogPort;
+import clap.server.application.port.outbound.log.LoggingPort;
 import clap.server.common.utils.ClientIpParseUtil;
 import clap.server.domain.model.auth.LoginLog;
 import clap.server.domain.model.log.AnonymousLog;
 import clap.server.domain.model.log.MemberLog;
 import clap.server.domain.model.member.Member;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -18,11 +18,10 @@
 @Service
 @RequiredArgsConstructor
 @Transactional
-public class LogService {
+public class LogService implements LoggingPort {
     private final CommandLogPort commandLogPort;
     private final MemberService memberService;
     private final LoadLoginLogPort loadLoginLogPort;
-    private final ObjectMapper objectMapper;
 
     public void createAnonymousLog(HttpServletRequest request,  int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
         AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName);
@@ -35,7 +34,7 @@ public void createMemberLog(HttpServletRequest request, int statusCode, String c
         commandLogPort.saveMemberLog(memberLog);
     }
 
-    public void createLoginFailedLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, String requestBody, String nickName) throws JsonProcessingException {
+    public void createLoginFailedLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, String requestBody, String nickName) {
         LoginLog loginLog = loadLoginLogPort.findByClientIp(ClientIpParseUtil.getClientIp(request)).orElse(null);
         String responseBody = loginLog != null ? loginLog.toSummaryString() : null;
         AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName);
diff --git a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -30,7 +30,7 @@ public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, Mul
             String profileImageUrl = profileImage != null ? s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage) : member.getImageUrl();
             member.setImageUrl(profileImageUrl);
         }
-        member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
+        member.updateMemberInfo(request.name(), request.emailNotification(),
                 request.kakaoWorkNotification());
         commandMemberPort.save(member);
     }
diff --git a/src/main/java/clap/server/application/service/notification/UpdateNotificationService.java b/src/main/java/clap/server/application/service/notification/UpdateNotificationService.java
@@ -1,7 +1,6 @@
 package clap.server.application.service.notification;
 
 import clap.server.application.port.inbound.domain.MemberService;
-import clap.server.application.port.inbound.notification.EnableAgitUsecase;
 import clap.server.application.port.inbound.notification.EnableEmailUsecase;
 import clap.server.application.port.inbound.notification.EnableKakaoUsecase;
 import clap.server.application.port.outbound.member.CommandMemberPort;
@@ -11,26 +10,21 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-public class UpdateNotificationService implements EnableKakaoUsecase, EnableAgitUsecase, EnableEmailUsecase {
+public class UpdateNotificationService implements EnableKakaoUsecase, EnableEmailUsecase {
 
     private final MemberService memberService;
     private final CommandMemberPort commandMemberPort;
 
     @Override
-    public void enableAgit(Long memberId) {
-        Member member = memberService.findActiveMember(memberId);
-        member.updateAgitEnabled();
-        commandMemberPort.save(member);
-    }
-
-    @Override
+    @Deprecated
     public void enableEmail(Long memberId) {
         Member member = memberService.findActiveMember(memberId);
         member.updateEmailEnabled();
         commandMemberPort.save(member);
     }
 
     @Override
+    @Deprecated
     public void enableKakao(Long memberId) {
         Member member = memberService.findActiveMember(memberId);
         member.updateKaKaoEnabled();
diff --git a/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java b/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java
@@ -8,6 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+@Deprecated
 @ApplicationService
 @RequiredArgsConstructor
 public class SubscribeSseService implements SubscribeSseUsecase {
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.inbound.security.service.SecurityUserDetails;
 
 import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
-import clap.server.application.port.inbound.domain.LogService;
+import clap.server.application.port.outbound.log.LoggingPort;
 import clap.server.common.annotation.log.LogType;
 import clap.server.exception.BaseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -34,7 +34,7 @@
 @RequiredArgsConstructor
 public class LoggingAspect {
     private final ObjectMapper objectMapper;
-    private final LogService logService;
+    private final LoggingPort loggingPort;
 
     @Pointcut("execution(* clap.server.adapter.inbound.web..*Controller.*(..))")
     public void controllerMethods() {
@@ -77,7 +77,7 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
                     } else {
                         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
                         if (principal instanceof SecurityUserDetails userDetails) {
-                            logService.createMemberLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), userDetails.getUserId());
+                            loggingPort.createMemberLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), userDetails.getUserId());
                         }
                     }
                 }
@@ -88,9 +88,9 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
 
     private void handleLoginLog(int statusCode, HttpServletRequest request, String customCode, LogStatus logStatus, Object result) throws JsonProcessingException {
         if (statusCode == HttpStatus.SC_OK) {
-            logService.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
+            loggingPort.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
         } else {
-            logService.createLoginFailedLog(request, statusCode, customCode, logStatus, getRequestBody(request), getNicknameFromRequestBody(request));
+            loggingPort.createLoginFailedLog(request, statusCode, customCode, logStatus, getRequestBody(request), getNicknameFromRequestBody(request));
         }
     }
 
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
diff --git a/src/main/resources/db/migration/dev/V20250209339__Drop_Agit_Notification_Enabled_Column_From_Member.sql b/src/main/resources/db/migration/dev/V20250209339__Drop_Agit_Notification_Enabled_Column_From_Member.sql
diff --git a/src/test/java/clap/server/TestDataFactory.java b/src/test/java/clap/server/TestDataFactory.java
diff --git a/src/test/java/clap/server/application/service/admin/RegisterMemberCsvServiceTest.java b/src/test/java/clap/server/application/service/admin/RegisterMemberCsvServiceTest.java
diff --git a/src/test/java/clap/server/application/service/auth/AuthServiceTest.java b/src/test/java/clap/server/application/service/auth/AuthServiceTest.java
diff --git a/src/test/java/clap/server/application/service/auth/LoginAttemptServiceTest.java b/src/test/java/clap/server/application/service/auth/LoginAttemptServiceTest.java
diff --git a/src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java b/src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest;`
`4`	`4`
	`5`	`+@Deprecated`
`5`	`6`	`public interface EditCommentUsecase {`
`6`	`7`
	`8`	`+ @Deprecated`
`7`	`9`	`void editComment(Long memberId, Long commentId, EditCommentRequest request);`
`8`	`10`	`}`