Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/#620: 마스킹 해제, 로그 파일 90일동안 보존 되도록 수정 #621

Merged
merged 4 commits into from
Jan 15, 2025
Merged

fix/#620: 마스킹 해제, 로그 파일 90일동안 보존 되도록 수정 #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac7707b
fix/#620: 마스킹 해제, 로그 파일 90일동안 보존 되도록 수정
LJH098 Jan 9, 2025
b2fcfbb
fix/#620: 비밀번호만 마스킹 적용
LJH098 Jan 11, 2025
1cdf4fe
fix/#620: 사용 하지 않는 코드 삭제
LJH098 Jan 11, 2025
42140c8
fix/#620: spotless 적용
LJH098 Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions src/main/java/com/gaebaljip/exceed/adapter/in/notify/EmitterController.java
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...ain/java/com/gaebaljip/exceed/adapter/out/scheduler/quartz/UpdateWeightEventListener.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...in/java/com/gaebaljip/exceed/adapter/out/scheduler/quartz/job/UpdateWeightEmitterJob.java
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/main/java/com/gaebaljip/exceed/application/service/member/UpdateWeightService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;

Expand All @@ -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 =
Expand All @@ -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());
}
}
20 changes: 2 additions & 18 deletions src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -62,4 +46,4 @@
<appender-ref ref="FILE" />
</root>
</springProfile>
</configuration>
</configuration>
31 changes: 0 additions & 31 deletions src/test/java/com/gaebaljip/exceed/adapter/in/notify/EmitterControllerTest.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/test/java/com/gaebaljip/exceed/common/ControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand All @@ -49,7 +48,6 @@
UpdateMemberController.class,
UpdateWeightController.class,
GetAnalysisController.class,
EmitterController.class
})
@MockBeans({
@MockBean(AuthService.class),
Expand Down