From 8465745078d717a705ec6be73a75f58274a2f31c Mon Sep 17 00:00:00 2001 From: hyeonejeongs Date: Wed, 12 Jul 2023 16:45:56 +0900 Subject: [PATCH] =?UTF-8?q?YEL-40=20[fix]=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/question/dto/response/YelloFriend.java | 8 +------- .../domain/question/dto/response/YelloKeyword.java | 7 ++----- .../domain/question/dto/response/YelloQuestion.java | 12 +++--------- .../question/dto/response/YelloStartResponse.java | 11 ++--------- .../question/dto/response/YelloVoteResponse.java | 10 ++-------- 5 files changed, 10 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/yello/server/domain/question/dto/response/YelloFriend.java b/src/main/java/com/yello/server/domain/question/dto/response/YelloFriend.java index 3b3c9b0d..9be66933 100644 --- a/src/main/java/com/yello/server/domain/question/dto/response/YelloFriend.java +++ b/src/main/java/com/yello/server/domain/question/dto/response/YelloFriend.java @@ -1,9 +1,9 @@ package com.yello.server.domain.question.dto.response; import com.yello.server.domain.friend.entity.Friend; -import com.yello.server.domain.user.entity.User; import lombok.Builder; +@Builder public record YelloFriend( Long id, String yelloId, @@ -17,10 +17,4 @@ public static YelloFriend of(Friend friend) { .build(); } - @Builder - public YelloFriend(Long id, String yelloId, String name) { - this.id = id; - this.yelloId = yelloId; - this.name = name; - } } diff --git a/src/main/java/com/yello/server/domain/question/dto/response/YelloKeyword.java b/src/main/java/com/yello/server/domain/question/dto/response/YelloKeyword.java index 977d312d..d24554f7 100644 --- a/src/main/java/com/yello/server/domain/question/dto/response/YelloKeyword.java +++ b/src/main/java/com/yello/server/domain/question/dto/response/YelloKeyword.java @@ -3,17 +3,14 @@ import com.yello.server.domain.keyword.entity.Keyword; import lombok.Builder; +@Builder public record YelloKeyword( String keywordName ) { - public static YelloKeyword of(Keyword keyword){ + public static YelloKeyword of(Keyword keyword) { return YelloKeyword.builder() .keywordName(keyword.getKeywordName()) .build(); } - @Builder - public YelloKeyword(String keywordName) { - this.keywordName = keywordName; - } } diff --git a/src/main/java/com/yello/server/domain/question/dto/response/YelloQuestion.java b/src/main/java/com/yello/server/domain/question/dto/response/YelloQuestion.java index 853557c4..7d44be0f 100644 --- a/src/main/java/com/yello/server/domain/question/dto/response/YelloQuestion.java +++ b/src/main/java/com/yello/server/domain/question/dto/response/YelloQuestion.java @@ -4,15 +4,15 @@ import lombok.Builder; import java.util.Objects; -import java.util.Optional; +@Builder public record YelloQuestion( String nameHead, String nameFoot, String keywordHead, String keywordFoot ) { - public static YelloQuestion of(Question question){ + public static YelloQuestion of(Question question) { return YelloQuestion.builder() .nameHead(Objects.isNull(question.getNameHead()) ? null : question.getNameHead()) .nameFoot(Objects.isNull(question.getNameFoot()) ? null : question.getNameFoot()) @@ -21,11 +21,5 @@ public static YelloQuestion of(Question question){ .build(); } - @Builder - public YelloQuestion(String nameHead, String nameFoot, String keywordHead, String keywordFoot) { - this.nameHead = nameHead; - this.nameFoot = nameFoot; - this.keywordHead = keywordHead; - this.keywordFoot = keywordFoot; - } + } diff --git a/src/main/java/com/yello/server/domain/question/dto/response/YelloStartResponse.java b/src/main/java/com/yello/server/domain/question/dto/response/YelloStartResponse.java index 903c6cbd..1100e721 100644 --- a/src/main/java/com/yello/server/domain/question/dto/response/YelloStartResponse.java +++ b/src/main/java/com/yello/server/domain/question/dto/response/YelloStartResponse.java @@ -1,19 +1,12 @@ package com.yello.server.domain.question.dto.response; -import com.yello.server.domain.cooldown.entity.Cooldown; -import com.yello.server.domain.user.entity.User; import lombok.Builder; +@Builder public record YelloStartResponse( Boolean isStart, Integer point, String createdAt -){ +) { - @Builder - public YelloStartResponse(Boolean isStart, Integer point, String createdAt) { - this.isStart = isStart; - this.point = point; - this.createdAt = createdAt; - } } diff --git a/src/main/java/com/yello/server/domain/question/dto/response/YelloVoteResponse.java b/src/main/java/com/yello/server/domain/question/dto/response/YelloVoteResponse.java index df92012a..c50464b9 100644 --- a/src/main/java/com/yello/server/domain/question/dto/response/YelloVoteResponse.java +++ b/src/main/java/com/yello/server/domain/question/dto/response/YelloVoteResponse.java @@ -4,18 +4,12 @@ import java.util.List; +@Builder public record YelloVoteResponse( YelloQuestion question, List friendList, List keywordList, Integer questionPoint ) { - - @Builder - public YelloVoteResponse(YelloQuestion question, List friendList, List keywordList, Integer questionPoint) { - this.question = question; - this.friendList = friendList; - this.keywordList = keywordList; - this.questionPoint = questionPoint; - } + }