refactor(message): additionalMessage 변수명 변경

kgu-clab · Nov 17, 2024 · 0345e73 · 0345e73
1 parent 060fa83
commit 0345e73
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 30 deletions.
diff --git a/.../java/page/clab/api/domain/auth/accountLockInfo/application/service/MemberBanService.java b/.../java/page/clab/api/domain/auth/accountLockInfo/application/service/MemberBanService.java
@@ -59,8 +59,8 @@ private AccountLockInfo createAccountLockInfo(String memberId) {
 
     private void sendSlackBanNotification(HttpServletRequest request, String memberId) {
         String memberName = externalRetrieveMemberUseCase.getMemberBasicInfoById(memberId).getMemberName();
-        String additionalMessage = "ID: " + memberId + ", Name: " + memberName;
+        String memberBannedMessage = "ID: " + memberId + ", Name: " + memberName;
         eventPublisher.publishEvent(
-                new NotificationEvent(this, SecurityAlertType.MEMBER_BANNED, request, additionalMessage));
+                new NotificationEvent(this, SecurityAlertType.MEMBER_BANNED, request, memberBannedMessage));
     }
 }
diff --git a/...ava/page/clab/api/domain/auth/accountLockInfo/application/service/MemberUnbanService.java b/...ava/page/clab/api/domain/auth/accountLockInfo/application/service/MemberUnbanService.java
@@ -56,8 +56,8 @@ private AccountLockInfo createAccountLockInfo(String memberId) {
 
     private void sendSlackUnbanNotification(HttpServletRequest request, String memberId) {
         String memberName = externalRetrieveMemberUseCase.getMemberBasicInfoById(memberId).getMemberName();
-        String additionalMessage = "ID: " + memberId + ", Name: " + memberName;
+        String memberUnbannedMessage = "ID: " + memberId + ", Name: " + memberName;
         eventPublisher.publishEvent(
-                new NotificationEvent(this, SecurityAlertType.MEMBER_UNBANNED, request, additionalMessage));
+                new NotificationEvent(this, SecurityAlertType.MEMBER_UNBANNED, request, memberUnbannedMessage));
     }
 }
diff --git a/...page/clab/api/domain/auth/blacklistIp/application/service/BlacklistIpRegisterService.java b/...page/clab/api/domain/auth/blacklistIp/application/service/BlacklistIpRegisterService.java
@@ -43,10 +43,10 @@ public String registerBlacklistIp(HttpServletRequest request, BlacklistIpRequest
                     BlacklistIp blacklistIp = mapper.fromDto(requestDto);
                     registerBlacklistIpPort.save(blacklistIp);
 
-                    String additionalMessage = "Added IP: " + ipAddress;
+                    String blacklistAddedMessage = "Added IP: " + ipAddress;
                     eventPublisher.publishEvent(
                             new NotificationEvent(this, SecurityAlertType.BLACKLISTED_IP_ADDED, request,
-                                    additionalMessage));
+                                    blacklistAddedMessage));
 
                     return ipAddress;
                 });

diff --git a/...a/page/clab/api/domain/auth/blacklistIp/application/service/BlacklistIpRemoveService.java b/...a/page/clab/api/domain/auth/blacklistIp/application/service/BlacklistIpRemoveService.java
@@ -36,9 +36,10 @@ public String removeBlacklistIp(HttpServletRequest request, String ipAddress) {
         BlacklistIp blacklistIp = retrieveBlacklistIpPort.getByIpAddress(ipAddress);
         removeBlacklistIpPort.delete(blacklistIp);
 
-        String additionalMessage = "Deleted IP: " + ipAddress;
+        String blacklistRemovedMessage = "Deleted IP: " + ipAddress;
         eventPublisher.publishEvent(
-                new NotificationEvent(this, SecurityAlertType.BLACKLISTED_IP_REMOVED, request, additionalMessage));
+                new NotificationEvent(this, SecurityAlertType.BLACKLISTED_IP_REMOVED, request,
+                        blacklistRemovedMessage));
 
         return blacklistIp.getIpAddress();
     }

diff --git a/...va/page/clab/api/domain/auth/blacklistIp/application/service/BlacklistIpResetService.java b/...va/page/clab/api/domain/auth/blacklistIp/application/service/BlacklistIpResetService.java
@@ -39,9 +39,10 @@ public List<String> resetBlacklistIps(HttpServletRequest request) {
                 .toList();
         removeBlacklistIpPort.deleteAll();
 
-        String additionalMessage = "Deleted IP: ALL";
+        String blacklistRemovedMessage = "Deleted IP: ALL";
         eventPublisher.publishEvent(
-                new NotificationEvent(this, SecurityAlertType.BLACKLISTED_IP_REMOVED, request, additionalMessage));
+                new NotificationEvent(this, SecurityAlertType.BLACKLISTED_IP_REMOVED, request,
+                        blacklistRemovedMessage));
 
         return blacklistedIps;
     }

diff --git a/...i/domain/auth/redisIpAccessMonitor/application/service/AbnormalAccessIpRemoveService.java b/...i/domain/auth/redisIpAccessMonitor/application/service/AbnormalAccessIpRemoveService.java
@@ -21,9 +21,10 @@ public class AbnormalAccessIpRemoveService implements RemoveAbnormalAccessIpUseC
     @Transactional
     public String removeAbnormalAccessIp(HttpServletRequest request, String ipAddress) {
         removeIpAccessMonitorPort.deleteById(ipAddress);
-        String additionalMessage = "Deleted IP: " + ipAddress;
+        String abnormalAccessIpDeletedMessage = "Deleted IP: " + ipAddress;
         eventPublisher.publishEvent(
-                new NotificationEvent(this, SecurityAlertType.ABNORMAL_ACCESS_IP_DELETED, request, additionalMessage));
+                new NotificationEvent(this, SecurityAlertType.ABNORMAL_ACCESS_IP_DELETED, request,
+                        abnormalAccessIpDeletedMessage));
         return ipAddress;
     }
 }
diff --git a/...i/domain/auth/redisIpAccessMonitor/application/service/AbnormalAccessIpsClearService.java b/...i/domain/auth/redisIpAccessMonitor/application/service/AbnormalAccessIpsClearService.java
@@ -27,9 +27,10 @@ public List<RedisIpAccessMonitor> clearAbnormalAccessIps(HttpServletRequest requ
         List<RedisIpAccessMonitor> ipAccessMonitors = retrieveIpAccessMonitorPort.findAll();
         clearIpAccessMonitorPort.deleteAll();
 
-        String additionalMessage = "Deleted IP: ALL";
+        String abnormalAccessIpClearedMessage = "Deleted IP: ALL";
         eventPublisher.publishEvent(
-                new NotificationEvent(this, SecurityAlertType.ABNORMAL_ACCESS_IP_DELETED, request, additionalMessage));
+                new NotificationEvent(this, SecurityAlertType.ABNORMAL_ACCESS_IP_DELETED, request,
+                        abnormalAccessIpClearedMessage));
 
         return ipAccessMonitors;
     }

diff --git a/...b/api/domain/memberManagement/member/application/service/MemberRoleManagementService.java b/...b/api/domain/memberManagement/member/application/service/MemberRoleManagementService.java
@@ -37,11 +37,11 @@ public String changeMemberRole(HttpServletRequest httpServletRequest, String mem
 
         updateMemberPort.update(member);
 
-        String additionalMessage = String.format("[%s] %s: %s -> %s", member.getId(), member.getName(), oldRole,
+        String memberRoleChangedMessage = String.format("[%s] %s: %s -> %s", member.getId(), member.getName(), oldRole,
                 newRole);
         eventPublisher.publishEvent(
                 new NotificationEvent(this, SecurityAlertType.MEMBER_ROLE_CHANGED, httpServletRequest,
-                        additionalMessage));
+                        memberRoleChangedMessage));
 
         return memberId;
     }

diff --git a/...age/clab/api/external/auth/accountLockInfo/port/ExternalAccountLockManagementService.java b/...age/clab/api/external/auth/accountLockInfo/port/ExternalAccountLockManagementService.java
@@ -100,9 +100,10 @@ private void sendSlackLoginFailureNotification(HttpServletRequest request, Strin
         String memberName = memberInfo.getMemberName();
         if (memberInfo.isAdminRole()) {
             request.setAttribute("member", memberId + " " + memberName);
-            String additionalMessage = "로그인 실패 횟수 초과로 계정이 잠겼습니다.";
+            String repeatedLoginFailuresMessage = "로그인 실패 횟수 초과로 계정이 잠겼습니다.";
             eventPublisher.publishEvent(
-                    new NotificationEvent(this, SecurityAlertType.REPEATED_LOGIN_FAILURES, request, additionalMessage));
+                    new NotificationEvent(this, SecurityAlertType.REPEATED_LOGIN_FAILURES, request,
+                            repeatedLoginFailuresMessage));
         }
     }
 }
diff --git a/...auth/redisIpAccessMonitor/application/service/ExternalIpAccessMonitorRegisterService.java b/...auth/redisIpAccessMonitor/application/service/ExternalIpAccessMonitorRegisterService.java
@@ -30,10 +30,10 @@ public class ExternalIpAccessMonitorRegisterService implements ExternalRegisterI
     public void registerIpAccessMonitor(HttpServletRequest request, String ipAddress) {
         RedisIpAccessMonitor redisIpAccessMonitor = getOrCreateRedisIpAccessMonitor(ipAddress);
         if (redisIpAccessMonitor.isBlocked()) {
-            String additionalMessage = "Blocked IP: " + ipAddress;
+            String abnormalAccessIpBlockedMessage = "Blocked IP: " + ipAddress;
             eventPublisher.publishEvent(
                     new NotificationEvent(this, SecurityAlertType.ABNORMAL_ACCESS_IP_BLOCKED, request,
-                            additionalMessage));
+                            abnormalAccessIpBlockedMessage));
         }
         registerIpAccessMonitorPort.save(redisIpAccessMonitor);
     }

diff --git a/src/main/java/page/clab/api/global/auth/filter/CustomBasicAuthenticationFilter.java b/src/main/java/page/clab/api/global/auth/filter/CustomBasicAuthenticationFilter.java
@@ -132,26 +132,26 @@ private boolean verifyIpAddressAccess(HttpServletResponse response) throws IOExc
     private void sendAuthenticationSuccessAlertSlackMessage(HttpServletRequest request) {
         String path = request.getRequestURI();
         if (WhitelistPathMatcher.isSwaggerIndexEndpoint(path)) {
-            String additionalMessage = "API 문서에 대한 접근이 허가되었습니다.";
+            String apiDocsAccessMessage = "API 문서에 대한 접근이 허가되었습니다.";
             eventPublisher.publishEvent(
-                    new NotificationEvent(this, SecurityAlertType.API_DOCS_ACCESS, request, additionalMessage));
+                    new NotificationEvent(this, SecurityAlertType.API_DOCS_ACCESS, request, apiDocsAccessMessage));
         } else if (WhitelistPathMatcher.isActuatorRequest(path)) {
-            String additionalMessage = "Actuator에 대한 접근이 허가되었습니다.";
+            String actuatorAccessMessage = "Actuator에 대한 접근이 허가되었습니다.";
             eventPublisher.publishEvent(
-                    new NotificationEvent(this, SecurityAlertType.ACTUATOR_ACCESS, request, additionalMessage));
+                    new NotificationEvent(this, SecurityAlertType.ACTUATOR_ACCESS, request, actuatorAccessMessage));
         }
     }
 
     private void sendAuthenticationFailureAlertSlackMessage(HttpServletRequest request) {
         String path = request.getRequestURI();
         if (WhitelistPathMatcher.isSwaggerIndexEndpoint(path)) {
-            String additionalMessage = "API 문서에 대한 접근이 거부되었습니다.";
+            String apiDocsAccessMessage = "API 문서에 대한 접근이 거부되었습니다.";
             eventPublisher.publishEvent(
-                    new NotificationEvent(this, SecurityAlertType.API_DOCS_ACCESS, request, additionalMessage));
+                    new NotificationEvent(this, SecurityAlertType.API_DOCS_ACCESS, request, apiDocsAccessMessage));
         } else if (WhitelistPathMatcher.isActuatorRequest(path)) {
-            String additionalMessage = "Actuator에 대한 접근이 거부되었습니다.";
+            String actuatorAccessMessage = "Actuator에 대한 접근이 거부되었습니다.";
             eventPublisher.publishEvent(
-                    new NotificationEvent(this, SecurityAlertType.ACTUATOR_ACCESS, request, additionalMessage));
+                    new NotificationEvent(this, SecurityAlertType.ACTUATOR_ACCESS, request, actuatorAccessMessage));
         }
     }
 }
diff --git a/src/main/java/page/clab/api/global/auth/filter/JwtAuthenticationFilter.java b/src/main/java/page/clab/api/global/auth/filter/JwtAuthenticationFilter.java
@@ -113,9 +113,9 @@ private boolean authenticateToken(HttpServletRequest request, HttpServletRespons
     private void sendSecurityAlertSlackMessage(HttpServletRequest request, RedisToken redisToken) {
         if (redisToken.isAdminToken()) {
             request.setAttribute("member", redisToken.getId());
-            String additionalMessage = "토큰 발급 IP와 다른 IP에서 접속하여 토큰을 삭제하였습니다.";
+            String duplicateLoginMessage = "토큰 발급 IP와 다른 IP에서 접속하여 토큰을 삭제하였습니다.";
             eventPublisher.publishEvent(
-                    new NotificationEvent(this, SecurityAlertType.DUPLICATE_LOGIN, request, additionalMessage));
+                    new NotificationEvent(this, SecurityAlertType.DUPLICATE_LOGIN, request, duplicateLoginMessage));
         }
     }
 }