Skip to content

Commit

Permalink
Merge pull request #269 from Hous-Release/fix/#268
Browse files Browse the repository at this point in the history
#268 [fix] 자기소개 빈 값으로 변경할 경우, null 반영
  • Loading branch information
hyejungg committed Dec 16, 2022
2 parents 507b1a1 + e6f1da3 commit 744836f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/main/java/hous/server/domain/user/Onboarding.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public void updateUserInfo(UpdateUserInfoRequestDto request) {
this.birthday = request.getBirthday();
this.mbti = request.getMbti();
this.job = request.getJob();
this.introduction = request.getIntroduction();
if (request.getIntroduction() != null) {
this.introduction = request.getIntroduction().replaceAll("(\r\n|\r|\n|\n\r)", " ");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public class SlackServiceUtils {
private static final String PROD_ERROR_MESSAGE = "*Error Message:*\n";
private static final String PROD_ERROR_STACK = "*Error Stack:*\n";
private static final String FILTER_STRING = "hous.server";
private static final String PROD_USER_DELETE_TOTAL_COUNT_MESSAGE = "*총 탈퇴 인원:* ";
private static final String PROD_USER_DELETE_MESSAGE = "*유형별 탈퇴 인원:*\n";
private static final String PROD_USER_DELETE_TOTAL_COUNT_MESSAGE = "*피드백을 남긴 총 탈퇴 인원:* ";
private static final String PROD_USER_DELETE_MESSAGE = "*피드백 유형별 탈퇴 인원:*\n";

public static List<Attachment> createAttachments(String color, List<LayoutBlock> data) {
List<Attachment> attachments = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
value="[%d{yyyy-MM-dd HH:mm:ss}:%-4relative] %green([%thread]) %highlight(%-5level) %boldWhite([%C.%M:%yellow(%L)]) - %msg%n"/>

<!-- prod 환경이 아닌 경우, ConsoleAppender 사용하여 콘솔창에 보임 -->
<springProfile name="!prod">
<springProfile name="local">
<include resource="console-appender.xml"/>

<root level="INFO">
Expand All @@ -13,7 +13,7 @@
</springProfile>

<!-- [Log Level] TRACE < DEBUG < INFO < WARN < ERROR 대소문자 구분 안함 -->
<springProfile name="prod">
<springProfile name="!local">
<include resource="file-info-appender.xml"/>
<include resource="file-warn-appender.xml"/>
<include resource="file-error-appender.xml"/>
Expand Down

0 comments on commit 744836f

Please sign in to comment.