Skip to content

Commit c5b5b51

Browse files
committed
setting :: 전체 ID 수정
1 parent 0cf00db commit c5b5b51

26 files changed

+219
-103
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package JavaProject.Dayoung.domain.quiz.domain;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
import com.querydsl.core.types.dsl.PathInits;
11+
12+
13+
/**
14+
* QQuiz is a Querydsl query type for Quiz
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QQuiz extends EntityPathBase<Quiz> {
18+
19+
private static final long serialVersionUID = -1210585498L;
20+
21+
public static final QQuiz quiz = new QQuiz("quiz");
22+
23+
public final ListPath<Long, NumberPath<Long>> areaIds = this.<Long, NumberPath<Long>>createList("areaIds", Long.class, NumberPath.class, PathInits.DIRECT2);
24+
25+
public final ListPath<Long, NumberPath<Long>> codeIds = this.<Long, NumberPath<Long>>createList("codeIds", Long.class, NumberPath.class, PathInits.DIRECT2);
26+
27+
public final DateTimePath<java.time.LocalDateTime> createdAt = createDateTime("createdAt", java.time.LocalDateTime.class);
28+
29+
public final NumberPath<Long> id = createNumber("id", Long.class);
30+
31+
public final EnumPath<JavaProject.Dayoung.domain.quiz.domain.type.Level> level = createEnum("level", JavaProject.Dayoung.domain.quiz.domain.type.Level.class);
32+
33+
public final StringPath question = createString("question");
34+
35+
public final StringPath title = createString("title");
36+
37+
public QQuiz(String variable) {
38+
super(Quiz.class, forVariable(variable));
39+
}
40+
41+
public QQuiz(Path<? extends Quiz> path) {
42+
super(path.getType(), path.getMetadata());
43+
}
44+
45+
public QQuiz(PathMetadata metadata) {
46+
super(Quiz.class, metadata);
47+
}
48+
49+
}
50+
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package JavaProject.Dayoung.domain.user.domain;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
import com.querydsl.core.types.dsl.PathInits;
11+
12+
13+
/**
14+
* QUser is a Querydsl query type for User
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QUser extends EntityPathBase<User> {
18+
19+
private static final long serialVersionUID = -1898250158L;
20+
21+
public static final QUser user = new QUser("user");
22+
23+
public final StringPath accountId = createString("accountId");
24+
25+
public final ListPath<Long, NumberPath<Long>> areaIds = this.<Long, NumberPath<Long>>createList("areaIds", Long.class, NumberPath.class, PathInits.DIRECT2);
26+
27+
public final StringPath email = createString("email");
28+
29+
public final NumberPath<Long> id = createNumber("id", Long.class);
30+
31+
public final StringPath introduction = createString("introduction");
32+
33+
public final StringPath name = createString("name");
34+
35+
public final StringPath password = createString("password");
36+
37+
public final EnumPath<JavaProject.Dayoung.domain.user.domain.type.Role> role = createEnum("role", JavaProject.Dayoung.domain.user.domain.type.Role.class);
38+
39+
public final NumberPath<Integer> score = createNumber("score", Integer.class);
40+
41+
public QUser(String variable) {
42+
super(User.class, forVariable(variable));
43+
}
44+
45+
public QUser(Path<? extends User> path) {
46+
super(path.getType(), path.getMetadata());
47+
}
48+
49+
public QUser(PathMetadata metadata) {
50+
super(User.class, metadata);
51+
}
52+
53+
}
54+

src/main/java/JavaProject/Dayoung/domain/quiz/domain/Quiz.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package JavaProject.Dayoung.domain.quiz.domain;
22

3-
import JavaProject.Dayoung.domain.area.domain.Area;
4-
import JavaProject.Dayoung.domain.code.domain.Code;
53
import JavaProject.Dayoung.domain.quiz.domain.type.Level;
4+
import JavaProject.Dayoung.global.StringListConverter;
65
import lombok.*;
76

87
import javax.persistence.*;
98
import java.time.LocalDateTime;
9+
import java.util.ArrayList;
1010
import java.util.List;
1111

1212
@Entity
@@ -30,22 +30,20 @@ public class Quiz {
3030
@Column(nullable = false)
3131
private Level level;
3232

33-
@OneToMany(fetch = FetchType.LAZY)
34-
@JoinColumn(name = "code_id")
35-
private List<Code> code; //기술 스택
33+
@Convert(converter = StringListConverter.class)
34+
private List<Long> codeIds = new ArrayList<>(); //기술 스택
3635

37-
@OneToMany(fetch = FetchType.LAZY)
38-
@JoinColumn(name = "area_id")
39-
private List<Area> area; // 분야
36+
@Convert(converter = StringListConverter.class)
37+
private List<Long> areaIds = new ArrayList<>(); // 분야
4038

4139
@Column(nullable = false)
4240
private LocalDateTime createdAt;
4341

44-
public void updateQuiz(String title, String question, Level level, List<Code> code, List<Area> area) {
42+
public void updateQuiz(String title, String question, Level level, List<Long> codeIds, List<Long> areaIds) {
4543
this.title = title;
4644
this.question = question;
4745
this.level = level;
48-
this.code = code;
49-
this.area = area;
46+
this.codeIds = codeIds;
47+
this.areaIds = areaIds;
5048
}
5149
}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/QuizController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ public QuizDetailResponse getQuizDetail(@PathVariable("quiz-id") Long quizId) {
5151
@Operation(summary = "문제 리스트 조회", description = "카테고리를 사용해 문제리스트를 조회")
5252
public QuizListResponse getQuizList(
5353
@RequestParam(value = "title", required = false) String title,
54-
@RequestParam(value = "area", required = false) List<Area> area,
54+
@RequestParam(value = "area_ids", required = false) List<Long> areaIds,
5555
@RequestParam(value = "level", required = false) List<Level> level,
5656
@RequestParam(value = "is_solved", required = false) Boolean isSolved,
5757
@RequestParam(value = "page", defaultValue = "1") @Positive int page
5858
) {
59-
return queryQuizListService.execute(title, area, level, isSolved, page);
59+
return queryQuizListService.execute(title, areaIds, level, isSolved, page);
6060
}
6161

6262
@GetMapping("/category")

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/request/CreateQuizRequest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package JavaProject.Dayoung.domain.quiz.presentation.dto.request;
22

3-
import JavaProject.Dayoung.domain.area.domain.Area;
43
import JavaProject.Dayoung.domain.code.domain.Code;
54
import JavaProject.Dayoung.domain.quiz.domain.type.Level;
65
import lombok.Getter;
@@ -25,7 +24,7 @@ public class CreateQuizRequest {
2524
@NotNull(message = "난이도를 선택해주세요")
2625
private Level level;
2726

28-
private List<Area> areas;
27+
private List<Long> areaIds;
2928

30-
private List<Code> codes;
29+
private List<Long> codeIds;
3130
}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/request/QuizFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class QuizFilter {
1313

1414
private final String title;
15-
private final List<Area> areas;
15+
private final List<Long> areaIds;
1616
private final List<Level> levels;
1717
private final Boolean isSolved;
1818
private final int page;

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/request/UpdateQuizRequest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package JavaProject.Dayoung.domain.quiz.presentation.dto.request;
22

3-
import JavaProject.Dayoung.domain.area.domain.Area;
4-
import JavaProject.Dayoung.domain.code.domain.Code;
53
import JavaProject.Dayoung.domain.quiz.domain.type.Level;
64
import lombok.Getter;
75
import lombok.NoArgsConstructor;
@@ -18,7 +16,7 @@ public class UpdateQuizRequest {
1816

1917
private Level level;
2018

21-
private List<Code> codes;
19+
private List<Long> codeIds;
2220

23-
private List<Area> areas;
21+
private List<Long> areaIds;
2422
}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/response/CategoryListResponse.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
@AllArgsConstructor
1212
public class CategoryListResponse {
1313

14-
private List<Code> codes;
14+
private List<Code> codeIds;
15+
16+
private List<Area> areaIds;
1517

16-
private List<Area> areas;
1718
}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/response/QuizDetailResponse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ public class QuizDetailResponse {
2121

2222
private final Level level;
2323

24-
private final List<Area> areas;
24+
private final List<Long> areas;
2525

26-
private final List<Code> codes;
26+
private final List<Long> codes;
2727

2828
public QuizDetailResponse(Quiz quiz) {
2929
quizId = quiz.getId();
3030
title = quiz.getTitle();
3131
question = quiz.getQuestion();
3232
level = quiz.getLevel();
33-
areas = quiz.getArea();
34-
codes = quiz.getCode();
33+
areas = quiz.getAreaIds();
34+
codes = quiz.getCodeIds();
3535
}
3636
}

src/main/java/JavaProject/Dayoung/domain/quiz/presentation/dto/response/QuizListResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package JavaProject.Dayoung.domain.quiz.presentation.dto.response;
22

3-
import JavaProject.Dayoung.domain.area.domain.Area;
43
import JavaProject.Dayoung.domain.quiz.domain.Quiz;
54
import JavaProject.Dayoung.domain.quiz.domain.type.Level;
65
import lombok.AllArgsConstructor;
@@ -25,7 +24,7 @@ public static class QuizResponse {
2524

2625
private final String question;
2726

28-
private final List<Area> area;
27+
private final List<Long> areaIds;
2928

3029
private final Level level;
3130

@@ -36,7 +35,7 @@ public static QuizResponse from(Quiz quiz) {
3635
.quizId(quiz.getId())
3736
.title(quiz.getTitle())
3837
.question(quiz.getQuestion())
39-
.area(quiz.getArea())
38+
.areaIds(quiz.getAreaIds())
4039
.level(quiz.getLevel())
4140
.avgScore(0)
4241
.build();

0 commit comments

Comments
 (0)