Skip to content

Commit d8e3574

Browse files
sungchaewonsungchaewon
authored
Merge pull request #70 from FixLog/develop
Develop
2 parents 346d29c + 1a6cc45 commit d8e3574

32 files changed

Lines changed: 1199 additions & 35 deletions

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ out/
3636
### VS Code ###
3737
.vscode/
3838

39-
### Environment variables ###
39+
### Environment variables ###::wq
40+
4041
.env
4142
*.env
43+
.env

‎build.gradle‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.4.5'
3+
id 'org.springframework.boot' version '3.2.5'//스웨거로 인해 버전 낮춤
44
id 'io.spring.dependency-management' version '1.1.7'
55
}
66

7+
ext {
8+
queryDslVersion = "5.0.0"
9+
}
10+
711
group = 'com.example'
812
version = '0.0.1-SNAPSHOT'
913

@@ -13,6 +17,10 @@ java {
1317
}
1418
}
1519

20+
ext {
21+
queryDslVersion = "5.0.0"
22+
}
23+
1624
configurations {
1725
compileOnly {
1826
extendsFrom annotationProcessor
@@ -21,29 +29,69 @@ configurations {
2129

2230
repositories {
2331
mavenCentral()
32+
33+
// springdoc 2.5.0은 여기서 제공됨
34+
maven { url 'https://repo.spring.io/release' }
2435
}
2536

2637
dependencies {
38+
// Spring Boot
2739
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
28-
implementation 'org.springframework.boot:spring-boot-starter-security'
40+
implementation 'org.springframework.boot:spring-boot-starter-security'
2941
implementation 'org.springframework.boot:spring-boot-starter-web'
3042
implementation 'org.springframework.boot:spring-boot-starter-validation'
43+
44+
// JWT
3145
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
3246
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
33-
runtimeOnly('io.jsonwebtoken:jjwt-jackson:0.11.5')
47+
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
48+
49+
// DB
3450
runtimeOnly 'com.h2database:h2'
3551
runtimeOnly 'com.mysql:mysql-connector-j'
52+
53+
// AWS
54+
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.538'
55+
56+
// QueryDSL
57+
implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
58+
annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
59+
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
60+
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
61+
62+
// Swagger (springdoc)
63+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
64+
65+
// Lombok
3666
compileOnly 'org.projectlombok:lombok'
3767
annotationProcessor 'org.projectlombok:lombok'
68+
69+
// Test
3870
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3971
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
40-
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.538'
41-
}
4272

4373
tasks.named('test') {
4474
useJUnitPlatform()
4575
}
4676

77+
// WAR 파일 안 만들게 설정
4778
jar {
4879
enabled = false
49-
}
80+
}
81+
82+
// QueryDSL 설정
83+
def querydslDir = "src/main/generated"
84+
85+
sourceSets {
86+
main {
87+
java {
88+
srcDirs += querydslDir
89+
}
90+
}
91+
}
92+
93+
tasks.withType(JavaCompile).configureEach {
94+
options.annotationProcessorGeneratedSourcesDirectory = file(querydslDir)
95+
}
96+
97+

‎src/main/generated/com/example/FixLog/domain/bookmark/QBookmark.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package com.example.FixLog.domain.bookmark;
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+
* QBookmark is a Querydsl query type for Bookmark
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QBookmark extends EntityPathBase<Bookmark> {
18+
19+
private static final long serialVersionUID = -975112590L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QBookmark bookmark = new QBookmark("bookmark");
24+
25+
public final NumberPath<Long> bookmarkId = createNumber("bookmarkId", Long.class);
26+
27+
public final QBookmarkFolder folderId;
28+
29+
public final BooleanPath isMarked = createBoolean("isMarked");
30+
31+
public final com.example.FixLog.domain.post.QPost postId;
32+
33+
public QBookmark(String variable) {
34+
this(Bookmark.class, forVariable(variable), INITS);
35+
}
36+
37+
public QBookmark(Path<? extends Bookmark> path) {
38+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
39+
}
40+
41+
public QBookmark(PathMetadata metadata) {
42+
this(metadata, PathInits.getFor(metadata, INITS));
43+
}
44+
45+
public QBookmark(PathMetadata metadata, PathInits inits) {
46+
this(Bookmark.class, metadata, inits);
47+
}
48+
49+
public QBookmark(Class<? extends Bookmark> type, PathMetadata metadata, PathInits inits) {
50+
super(type, metadata, inits);
51+
this.folderId = inits.isInitialized("folderId") ? new QBookmarkFolder(forProperty("folderId"), inits.get("folderId")) : null;
52+
this.postId = inits.isInitialized("postId") ? new com.example.FixLog.domain.post.QPost(forProperty("postId"), inits.get("postId")) : null;
53+
}
54+
55+
}
56+

‎src/main/generated/com/example/FixLog/domain/bookmark/QBookmarkFolder.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package com.example.FixLog.domain.bookmark;
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+
* QBookmarkFolder is a Querydsl query type for BookmarkFolder
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QBookmarkFolder extends EntityPathBase<BookmarkFolder> {
18+
19+
private static final long serialVersionUID = 655942016L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QBookmarkFolder bookmarkFolder = new QBookmarkFolder("bookmarkFolder");
24+
25+
public final ListPath<Bookmark, QBookmark> bookmarks = this.<Bookmark, QBookmark>createList("bookmarks", Bookmark.class, QBookmark.class, PathInits.DIRECT2);
26+
27+
public final NumberPath<Long> folderId = createNumber("folderId", Long.class);
28+
29+
public final StringPath folderName = createString("folderName");
30+
31+
public final com.example.FixLog.domain.member.QMember userId;
32+
33+
public QBookmarkFolder(String variable) {
34+
this(BookmarkFolder.class, forVariable(variable), INITS);
35+
}
36+
37+
public QBookmarkFolder(Path<? extends BookmarkFolder> path) {
38+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
39+
}
40+
41+
public QBookmarkFolder(PathMetadata metadata) {
42+
this(metadata, PathInits.getFor(metadata, INITS));
43+
}
44+
45+
public QBookmarkFolder(PathMetadata metadata, PathInits inits) {
46+
this(BookmarkFolder.class, metadata, inits);
47+
}
48+
49+
public QBookmarkFolder(Class<? extends BookmarkFolder> type, PathMetadata metadata, PathInits inits) {
50+
super(type, metadata, inits);
51+
this.userId = inits.isInitialized("userId") ? new com.example.FixLog.domain.member.QMember(forProperty("userId"), inits.get("userId")) : null;
52+
}
53+
54+
}
55+

‎src/main/generated/com/example/FixLog/domain/follow/QFollow.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package com.example.FixLog.domain.follow;
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+
* QFollow is a Querydsl query type for Follow
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QFollow extends EntityPathBase<Follow> {
18+
19+
private static final long serialVersionUID = 1281338898L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QFollow follow = new QFollow("follow");
24+
25+
public final com.example.FixLog.domain.member.QMember followerId;
26+
27+
public final NumberPath<Long> followId = createNumber("followId", Long.class);
28+
29+
public final com.example.FixLog.domain.member.QMember followingId;
30+
31+
public QFollow(String variable) {
32+
this(Follow.class, forVariable(variable), INITS);
33+
}
34+
35+
public QFollow(Path<? extends Follow> path) {
36+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
37+
}
38+
39+
public QFollow(PathMetadata metadata) {
40+
this(metadata, PathInits.getFor(metadata, INITS));
41+
}
42+
43+
public QFollow(PathMetadata metadata, PathInits inits) {
44+
this(Follow.class, metadata, inits);
45+
}
46+
47+
public QFollow(Class<? extends Follow> type, PathMetadata metadata, PathInits inits) {
48+
super(type, metadata, inits);
49+
this.followerId = inits.isInitialized("followerId") ? new com.example.FixLog.domain.member.QMember(forProperty("followerId"), inits.get("followerId")) : null;
50+
this.followingId = inits.isInitialized("followingId") ? new com.example.FixLog.domain.member.QMember(forProperty("followingId"), inits.get("followingId")) : null;
51+
}
52+
53+
}
54+

‎src/main/generated/com/example/FixLog/domain/fork/QFork.java‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package com.example.FixLog.domain.fork;
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+
* QFork is a Querydsl query type for Fork
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QFork extends EntityPathBase<Fork> {
18+
19+
private static final long serialVersionUID = 1327242738L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QFork fork = new QFork("fork");
24+
25+
public final com.example.FixLog.domain.post.QPost forkedPostId;
26+
27+
public final NumberPath<Long> forkId = createNumber("forkId", Long.class);
28+
29+
public final com.example.FixLog.domain.post.QPost originalPostId;
30+
31+
public final com.example.FixLog.domain.member.QMember userId;
32+
33+
public QFork(String variable) {
34+
this(Fork.class, forVariable(variable), INITS);
35+
}
36+
37+
public QFork(Path<? extends Fork> path) {
38+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
39+
}
40+
41+
public QFork(PathMetadata metadata) {
42+
this(metadata, PathInits.getFor(metadata, INITS));
43+
}
44+
45+
public QFork(PathMetadata metadata, PathInits inits) {
46+
this(Fork.class, metadata, inits);
47+
}
48+
49+
public QFork(Class<? extends Fork> type, PathMetadata metadata, PathInits inits) {
50+
super(type, metadata, inits);
51+
this.forkedPostId = inits.isInitialized("forkedPostId") ? new com.example.FixLog.domain.post.QPost(forProperty("forkedPostId"), inits.get("forkedPostId")) : null;
52+
this.originalPostId = inits.isInitialized("originalPostId") ? new com.example.FixLog.domain.post.QPost(forProperty("originalPostId"), inits.get("originalPostId")) : null;
53+
this.userId = inits.isInitialized("userId") ? new com.example.FixLog.domain.member.QMember(forProperty("userId"), inits.get("userId")) : null;
54+
}
55+
56+
}
57+

‎src/main/generated/com/example/FixLog/domain/like/QPostLike.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package com.example.FixLog.domain.like;
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+
* QPostLike is a Querydsl query type for PostLike
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QPostLike extends EntityPathBase<PostLike> {
18+
19+
private static final long serialVersionUID = -1255529902L;
20+
21+
private static final PathInits INITS = PathInits.DIRECT2;
22+
23+
public static final QPostLike postLike = new QPostLike("postLike");
24+
25+
public final BooleanPath isLiked = createBoolean("isLiked");
26+
27+
public final NumberPath<Long> likeId = createNumber("likeId", Long.class);
28+
29+
public final com.example.FixLog.domain.post.QPost postId;
30+
31+
public final com.example.FixLog.domain.member.QMember userId;
32+
33+
public QPostLike(String variable) {
34+
this(PostLike.class, forVariable(variable), INITS);
35+
}
36+
37+
public QPostLike(Path<? extends PostLike> path) {
38+
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
39+
}
40+
41+
public QPostLike(PathMetadata metadata) {
42+
this(metadata, PathInits.getFor(metadata, INITS));
43+
}
44+
45+
public QPostLike(PathMetadata metadata, PathInits inits) {
46+
this(PostLike.class, metadata, inits);
47+
}
48+
49+
public QPostLike(Class<? extends PostLike> type, PathMetadata metadata, PathInits inits) {
50+
super(type, metadata, inits);
51+
this.postId = inits.isInitialized("postId") ? new com.example.FixLog.domain.post.QPost(forProperty("postId"), inits.get("postId")) : null;
52+
this.userId = inits.isInitialized("userId") ? new com.example.FixLog.domain.member.QMember(forProperty("userId"), inits.get("userId")) : null;
53+
}
54+
55+
}
56+

0 commit comments

Comments
 (0)