From f1690ccbf97233f1d0011aad3e8d8af559a85bc3 Mon Sep 17 00:00:00 2001
From: catnap421 <wlq7410@naver.com>
Date: Thu, 24 Jun 2021 19:30:21 +0900
Subject: [PATCH] Fix: mapper error

---
 .../main/java/net/mureng/api/reply/component/ReplyMapper.java   | 2 ++
 mureng-api/src/main/java/net/mureng/api/reply/dto/ReplyDto.java | 2 ++
 .../api/todayexpression/component/TodayExpressionMapper.java    | 1 +
 .../net/mureng/api/todayexpression/dto/TodayExpressionDto.java  | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/mureng-api/src/main/java/net/mureng/api/reply/component/ReplyMapper.java b/mureng-api/src/main/java/net/mureng/api/reply/component/ReplyMapper.java
index 29b608dd..b985ab6a 100644
--- a/mureng-api/src/main/java/net/mureng/api/reply/component/ReplyMapper.java
+++ b/mureng-api/src/main/java/net/mureng/api/reply/component/ReplyMapper.java
@@ -17,6 +17,7 @@ public interface ReplyMapper extends EntityMapper<Reply, ReplyDto> {
     @Mapping(target = "questionId", expression = "java(reply.getQuestion().getQuestionId())")
     @Mapping(target = "requestedByAuthor", ignore = true)
     @Mapping(target = "likedByRequester", ignore = true)
+    @Mapping(target = "accomplishedBadge", ignore = true)
     ReplyDto.ReadOnly toDto(Reply reply);
 
     @Mapping(target = "image", source = "reply.image")
@@ -25,6 +26,7 @@ public interface ReplyMapper extends EntityMapper<Reply, ReplyDto> {
     @Mapping(target = "questionId", expression = "java(reply.getQuestion().getQuestionId())")
     @Mapping(target = "requestedByAuthor", expression = "java(reply.isAuthor(loggedInMember))")
     @Mapping(target = "likedByRequester", expression = "java(reply.likedByRequester(loggedInMember))")
+    @Mapping(target = "accomplishedBadge", ignore = true)
     ReplyDto.ReadOnly toDto(Reply reply, Member loggedInMember);
 
     @Mapping(target = "image", source = "reply.image")
diff --git a/mureng-api/src/main/java/net/mureng/api/reply/dto/ReplyDto.java b/mureng-api/src/main/java/net/mureng/api/reply/dto/ReplyDto.java
index bfd2d15c..fc6425a0 100644
--- a/mureng-api/src/main/java/net/mureng/api/reply/dto/ReplyDto.java
+++ b/mureng-api/src/main/java/net/mureng/api/reply/dto/ReplyDto.java
@@ -1,5 +1,6 @@
 package net.mureng.api.reply.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -74,6 +75,7 @@ public static class ReadOnly extends ReplyDto {
         @JsonProperty(index = PropertyDisplayOrder.LIKED_BY_MEMBER)
         private Boolean likedByRequester;
 
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
         @ApiModelProperty(value = "사용자가 획득한 뱃지 번호",
                 accessMode = ApiModelProperty.AccessMode.READ_ONLY, position = PropertyDisplayOrder.ACCOMPLISHED_BADGE)
         @JsonProperty(index = PropertyDisplayOrder.ACCOMPLISHED_BADGE)
diff --git a/mureng-api/src/main/java/net/mureng/api/todayexpression/component/TodayExpressionMapper.java b/mureng-api/src/main/java/net/mureng/api/todayexpression/component/TodayExpressionMapper.java
index fd8ea29b..e1100de5 100644
--- a/mureng-api/src/main/java/net/mureng/api/todayexpression/component/TodayExpressionMapper.java
+++ b/mureng-api/src/main/java/net/mureng/api/todayexpression/component/TodayExpressionMapper.java
@@ -11,6 +11,7 @@
 public interface TodayExpressionMapper {
 
     @Mapping(target = "scrappedByRequester", expression = "java(todayExpression.scrappedByRequester(loggedInMember))")
+    @Mapping(target = "accomplishedBadge", ignore = true)
     TodayExpressionDto toDto(TodayExpression todayExpression, @Context Member loggedInMember);
 
     @Mapping(target = "scrappedByRequester", expression = "java(todayExpression.scrappedByRequester(loggedInMember))")
diff --git a/mureng-api/src/main/java/net/mureng/api/todayexpression/dto/TodayExpressionDto.java b/mureng-api/src/main/java/net/mureng/api/todayexpression/dto/TodayExpressionDto.java
index 89629250..984c071f 100644
--- a/mureng-api/src/main/java/net/mureng/api/todayexpression/dto/TodayExpressionDto.java
+++ b/mureng-api/src/main/java/net/mureng/api/todayexpression/dto/TodayExpressionDto.java
@@ -1,5 +1,6 @@
 package net.mureng.api.todayexpression.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,6 +39,7 @@ public class TodayExpressionDto {
     @ApiModelProperty(value = "요청자의 스크랩 여부", position = PropertyDisplayOrder.SCRAPPED_BY_REQUESTER)
     private boolean scrappedByRequester;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @ApiModelProperty(value = "사용자가 획득한 뱃지 번호", position = PropertyDisplayOrder.ACCOMPLISHED_BADGE)
     private Long accomplishedBadge;