From fdd8020e449bd39f18e199dba866346eb4d2aa84 Mon Sep 17 00:00:00 2001 From: lepitaaar Date: Sat, 19 Jul 2025 19:08:05 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feature:=20=EC=A7=80=EC=9B=90=EC=84=9C?= =?UTF-8?q?=EC=97=90=20description=20=ED=95=84=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=96=88=EC=8A=B5=EB=8B=88=EB=8B=A4.=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=A1=9C=20=EA=B0=81=EA=B0=81=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=EA=B3=BC=20=EC=A7=80=EC=9B=90=EC=84=9C=EC=9D=98=20?= =?UTF-8?q?=EC=A0=9C=ED=95=9C=20=EA=B8=B8=EC=9D=B4=EB=A5=BC=20=EC=A6=9D?= =?UTF-8?q?=EA=B0=80=EC=8B=9C=EC=BC=B0=EC=8A=B5=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/moadong/club/entity/ClubQuestion.java | 8 ++++++++ .../payload/request/ClubApplicationCreateRequest.java | 6 +++++- .../payload/request/ClubApplicationEditRequest.java | 6 +++++- .../club/payload/request/ClubApplyQuestion.java | 4 ++-- .../java/moadong/club/service/ClubApplyService.java | 11 +++++++---- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/moadong/club/entity/ClubQuestion.java b/backend/src/main/java/moadong/club/entity/ClubQuestion.java index 92fc16afe..382083cfd 100644 --- a/backend/src/main/java/moadong/club/entity/ClubQuestion.java +++ b/backend/src/main/java/moadong/club/entity/ClubQuestion.java @@ -28,6 +28,10 @@ public class ClubQuestion { @Builder.Default private String title = ""; + @NotBlank + @Builder.Default + private String description = ""; + @Builder.Default private List questions = new ArrayList<>(); @@ -41,6 +45,10 @@ public void updateFormTitle(String title) { this.title = title; } + public void updateFormDescription(String description) { + this.description = description; + } + public void updateQuestions(List newQuestions) { this.questions.clear(); this.questions.addAll(newQuestions); diff --git a/backend/src/main/java/moadong/club/payload/request/ClubApplicationCreateRequest.java b/backend/src/main/java/moadong/club/payload/request/ClubApplicationCreateRequest.java index 9148cf0ba..bc15eab37 100644 --- a/backend/src/main/java/moadong/club/payload/request/ClubApplicationCreateRequest.java +++ b/backend/src/main/java/moadong/club/payload/request/ClubApplicationCreateRequest.java @@ -9,9 +9,13 @@ public record ClubApplicationCreateRequest( @NotBlank - @Size(max = 20) + @Size(max = 50) String title, + @NotBlank + @Size(max = 500) + String description, + @NotNull @Valid List questions diff --git a/backend/src/main/java/moadong/club/payload/request/ClubApplicationEditRequest.java b/backend/src/main/java/moadong/club/payload/request/ClubApplicationEditRequest.java index a9167e037..a7658329e 100644 --- a/backend/src/main/java/moadong/club/payload/request/ClubApplicationEditRequest.java +++ b/backend/src/main/java/moadong/club/payload/request/ClubApplicationEditRequest.java @@ -9,9 +9,13 @@ public record ClubApplicationEditRequest( @NotBlank - @Size(max = 20) + @Size(max = 50) String title, + @NotBlank + @Size(max = 500) + String description, + @NotNull @Valid List questions diff --git a/backend/src/main/java/moadong/club/payload/request/ClubApplyQuestion.java b/backend/src/main/java/moadong/club/payload/request/ClubApplyQuestion.java index c74c8d3b2..e54162123 100644 --- a/backend/src/main/java/moadong/club/payload/request/ClubApplyQuestion.java +++ b/backend/src/main/java/moadong/club/payload/request/ClubApplyQuestion.java @@ -13,7 +13,7 @@ public record ClubApplyQuestion( @NotNull Long id, @NotBlank - @Size(max = 20) + @Size(max = 200) String title, @NotNull //빈칸 허용 String description, @@ -32,7 +32,7 @@ public record Options( public record QuestionItem( @NotNull - @Size(max = 20) + @Size(max = 200) String value ) {} } \ No newline at end of file diff --git a/backend/src/main/java/moadong/club/service/ClubApplyService.java b/backend/src/main/java/moadong/club/service/ClubApplyService.java index 39077d1f3..080623464 100644 --- a/backend/src/main/java/moadong/club/service/ClubApplyService.java +++ b/backend/src/main/java/moadong/club/service/ClubApplyService.java @@ -20,10 +20,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -54,6 +51,7 @@ public ResponseEntity getClubApplication(String clubId) { ClubApplicationResponse clubApplicationResponse = ClubApplicationResponse.builder() .title(clubQuestion.getTitle()) + .description(Optional.ofNullable(clubQuestion.getDescription()).orElse("")) .questions(clubQuestion.getQuestions()) .build(); @@ -190,10 +188,14 @@ private ClubQuestion createQuestions(ClubQuestion clubQuestion, ClubApplicationC clubQuestion.updateQuestions(newQuestions); clubQuestion.updateFormTitle(request.title()); + clubQuestion.updateFormDescription(request.description()); return clubQuestion; } + /** + * update와 create 메서드는 추후 변경예정 + */ private ClubQuestion updateQuestions(ClubQuestion clubQuestion, ClubApplicationEditRequest request) { List newQuestions = new ArrayList<>(); @@ -224,6 +226,7 @@ private ClubQuestion updateQuestions(ClubQuestion clubQuestion, ClubApplicationE clubQuestion.updateQuestions(newQuestions); clubQuestion.updateFormTitle(request.title()); + clubQuestion.updateFormDescription(request.description()); return clubQuestion; } From bd915ce6cd1c1eb007b88ff9a9f953f4c8e80f85 Mon Sep 17 00:00:00 2001 From: lepitaaar Date: Sat, 19 Jul 2025 19:08:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feature:=20=EC=A7=80=EC=9B=90=EC=84=9C?= =?UTF-8?q?=EC=97=90=20description=20=ED=95=84=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=96=88=EC=8A=B5=EB=8B=88=EB=8B=A4.=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=A1=9C=20=EA=B0=81=EA=B0=81=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=EA=B3=BC=20=EC=A7=80=EC=9B=90=EC=84=9C=EC=9D=98=20?= =?UTF-8?q?=EC=A0=9C=ED=95=9C=20=EA=B8=B8=EC=9D=B4=EB=A5=BC=20=EC=A6=9D?= =?UTF-8?q?=EA=B0=80=EC=8B=9C=EC=BC=B0=EC=8A=B5=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moadong/club/payload/response/ClubApplicationResponse.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/moadong/club/payload/response/ClubApplicationResponse.java b/backend/src/main/java/moadong/club/payload/response/ClubApplicationResponse.java index e22415897..bd9f0d6a7 100644 --- a/backend/src/main/java/moadong/club/payload/response/ClubApplicationResponse.java +++ b/backend/src/main/java/moadong/club/payload/response/ClubApplicationResponse.java @@ -8,6 +8,7 @@ @Builder public record ClubApplicationResponse( String title, + String description, List questions ) { -} +} \ No newline at end of file From 27a7da27e895d92477b05f280325d8763964d6b4 Mon Sep 17 00:00:00 2001 From: lepitaaar Date: Sat, 19 Jul 2025 19:19:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=9D=98=EB=AF=B8=EC=97=86=EB=8A=94?= =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/moadong/club/entity/ClubQuestion.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/moadong/club/entity/ClubQuestion.java b/backend/src/main/java/moadong/club/entity/ClubQuestion.java index 382083cfd..8005c71d2 100644 --- a/backend/src/main/java/moadong/club/entity/ClubQuestion.java +++ b/backend/src/main/java/moadong/club/entity/ClubQuestion.java @@ -2,6 +2,7 @@ import jakarta.persistence.Id; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -24,11 +25,11 @@ public class ClubQuestion { private String clubId; - @NotBlank + @NotNull @Builder.Default private String title = ""; - @NotBlank + @NotNull @Builder.Default private String description = "";