Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion backend/src/main/java/moadong/club/entity/ClubQuestion.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -24,10 +25,14 @@ public class ClubQuestion {

private String clubId;

@NotBlank
@NotNull
@Builder.Default
private String title = "";

@NotNull
@Builder.Default
private String description = "";

@Builder.Default
private List<ClubApplicationQuestion> questions = new ArrayList<>();

Expand All @@ -41,6 +46,10 @@ public void updateFormTitle(String title) {
this.title = title;
}

public void updateFormDescription(String description) {
this.description = description;
}

public void updateQuestions(List<ClubApplicationQuestion> newQuestions) {
this.questions.clear();
this.questions.addAll(newQuestions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ClubApplyQuestion> questions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ClubApplyQuestion> questions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public record ClubApplyQuestion(
@NotNull
Long id,
@NotBlank
@Size(max = 20)
@Size(max = 200)
String title,
@NotNull //빈칸 허용
String description,
Expand All @@ -32,7 +32,7 @@ public record Options(

public record QuestionItem(
@NotNull
@Size(max = 20)
@Size(max = 200)
String value
) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@Builder
public record ClubApplicationResponse(
String title,
String description,
List<ClubApplicationQuestion> questions
) {
}
}
11 changes: 7 additions & 4 deletions backend/src/main/java/moadong/club/service/ClubApplyService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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<ClubApplicationQuestion> newQuestions = new ArrayList<>();

Expand Down Expand Up @@ -224,6 +226,7 @@ private ClubQuestion updateQuestions(ClubQuestion clubQuestion, ClubApplicationE

clubQuestion.updateQuestions(newQuestions);
clubQuestion.updateFormTitle(request.title());
clubQuestion.updateFormDescription(request.description());

return clubQuestion;
}
Expand Down
Loading