Merge pull request #621 from JNU-econovation/fix/#620

fix/#620: 마스킹 해제, 로그 파일 90일동안 보존 되도록 수정
JNU-econovation · Jan 15, 2025 · aae41e8 · aae41e8
2 parents 785f25e + 42140c8
commit aae41e8
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 199 deletions.
diff --git a/src/main/java/com/gaebaljip/exceed/adapter/in/notify/EmitterController.java b/src/main/java/com/gaebaljip/exceed/adapter/in/notify/EmitterController.java
diff --git a/...ain/java/com/gaebaljip/exceed/adapter/out/scheduler/quartz/UpdateWeightEventListener.java b/...ain/java/com/gaebaljip/exceed/adapter/out/scheduler/quartz/UpdateWeightEventListener.java
diff --git a/...in/java/com/gaebaljip/exceed/adapter/out/scheduler/quartz/job/UpdateWeightEmitterJob.java b/...in/java/com/gaebaljip/exceed/adapter/out/scheduler/quartz/job/UpdateWeightEmitterJob.java
diff --git a/src/main/java/com/gaebaljip/exceed/application/service/member/UpdateWeightService.java b/src/main/java/com/gaebaljip/exceed/application/service/member/UpdateWeightService.java
@@ -1,7 +1,5 @@
 package com.gaebaljip.exceed.application.service.member;
 
-import java.time.LocalDateTime;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -12,9 +10,6 @@
 import com.gaebaljip.exceed.application.port.in.member.UpdateWeightUsecase;
 import com.gaebaljip.exceed.application.port.out.member.HistoryPort;
 import com.gaebaljip.exceed.application.port.out.member.MemberPort;
-import com.gaebaljip.exceed.common.annotation.EventPublisherStatus;
-import com.gaebaljip.exceed.common.event.Events;
-import com.gaebaljip.exceed.common.event.UpdateWeightEvent;
 
 import lombok.RequiredArgsConstructor;
 
@@ -26,7 +21,6 @@ public class UpdateWeightService implements UpdateWeightUsecase {
 
     @Override
     @Transactional
-    @EventPublisherStatus
     public UpdateWeightResponse execute(UpdateWeightCommand command) {
         MemberEntity memberEntity = memberPort.query(command.memberId());
         HistoryEntity history =
@@ -41,8 +35,6 @@ public UpdateWeightResponse execute(UpdateWeightCommand command) {
                         .build();
         historyPort.command(history);
         memberEntity.updateWeight(command.weight(), command.targetWeight());
-        Events.raise(
-                UpdateWeightEvent.from(command.memberId(), command.uri(), LocalDateTime.now()));
         return UpdateWeightResponse.of(memberEntity.getWeight(), memberEntity.getTargetWeight());
     }
 }
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -8,42 +8,26 @@
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="com.gaebaljip.exceed.common.log.MaskingPatternLayout">
-                <maskPattern>\"(?i).*email.*"\s*:\s*\"(.*?)\"</maskPattern>
                 <maskPattern>\"(?i).*password.*"\s*:\s*\"(.*?)\"</maskPattern>
-                <maskPattern>\"(?i).*height.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*weight.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*targetWeight.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*age.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*etc.*"\s*:\s*\"(.*?)\"</maskPattern>
-                <maskPattern>\"(?i).*activity.*"\s*:\s*\"(.*?)\"</maskPattern>
                 <pattern>${CONSOLE_LOG_PATTERN}</pattern>
             </layout>
         </encoder>
     </appender>
-
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="com.gaebaljip.exceed.common.log.MaskingPatternLayout">
-                <maskPattern>\"(?i).*email.*"\s*:\s*\"(.*?)\"</maskPattern>
                 <maskPattern>\"(?i).*password.*"\s*:\s*\"(.*?)\"</maskPattern>
-                <maskPattern>\"(?i).*height.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*weight.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*targetWeight.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*age.*"\s*:\s*(\d+)</maskPattern>
-                <maskPattern>\"(?i).*etc.*"\s*:\s*\"(.*?)\"</maskPattern>
-                <maskPattern>\"(?i).*activity.*"\s*:\s*\"(.*?)\"</maskPattern>
                 <pattern>${FILE_LOG_PATTERN}</pattern>
             </layout>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>./log/%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <maxFileSize>10MB</maxFileSize>
-            <maxHistory>30</maxHistory>
+            <maxHistory>90</maxHistory>
             <totalSizeCap>100MB</totalSizeCap>
         </rollingPolicy>
     </appender>
 
-
     <springProfile name="local">
         <logger name="com.gaebaljip.exceed" level="DEBUG" />
         <root level="INFO">
@@ -62,4 +46,4 @@
             <appender-ref ref="FILE" />
         </root>
     </springProfile>
-</configuration>
+</configuration>
diff --git a/src/test/java/com/gaebaljip/exceed/adapter/in/notify/EmitterControllerTest.java b/src/test/java/com/gaebaljip/exceed/adapter/in/notify/EmitterControllerTest.java
diff --git a/src/test/java/com/gaebaljip/exceed/common/ControllerTest.java b/src/test/java/com/gaebaljip/exceed/common/ControllerTest.java
@@ -25,7 +25,6 @@
 import com.gaebaljip.exceed.adapter.in.member.OnBoardingController;
 import com.gaebaljip.exceed.adapter.in.member.UpdateMemberController;
 import com.gaebaljip.exceed.adapter.in.member.UpdateWeightController;
-import com.gaebaljip.exceed.adapter.in.notify.EmitterController;
 import com.gaebaljip.exceed.adapter.in.nutritionist.GetAnalysisController;
 import com.gaebaljip.exceed.application.port.in.meal.*;
 import com.gaebaljip.exceed.application.port.in.member.*;
@@ -49,7 +48,6 @@
     UpdateMemberController.class,
     UpdateWeightController.class,
     GetAnalysisController.class,
-    EmitterController.class
 })
 @MockBeans({
     @MockBean(AuthService.class),