Skip to content

Commit

Permalink
[release] v1.1.0 (#117)
Browse files Browse the repository at this point in the history
Co-authored-by: Wonjun You <59856002+wonjunYou@users.noreply.github.com>
Co-authored-by: koseonje <127813439+KoSeonJe@users.noreply.github.com>
  • Loading branch information
3 people committed Sep 10, 2024
1 parent 2258f62 commit 83ae9e9
Show file tree
Hide file tree
Showing 104 changed files with 2,339 additions and 852 deletions.
64 changes: 17 additions & 47 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
buildscript {
ext {
queryDslVersion = '5.0.0'
}
}

plugins {
id 'java'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id 'org.jetbrains.kotlin.jvm'
id "com.ewerk.gradle.plugins.querydsl" version "1.0.10"
id 'org.springframework.boot' version '3.2.6'
id 'io.spring.dependency-management' version '1.1.3'
}

group = 'ddingdong'
Expand All @@ -36,25 +28,28 @@ dependencies {
//develop
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
implementation 'org.springdoc:springdoc-openapi-ui:1.6.11'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
implementation 'org.springframework.boot:spring-boot-configuration-processor'

implementation "com.querydsl:querydsl-jpa:${queryDslVersion}"
implementation "com.querydsl:querydsl-apt:${queryDslVersion}"
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

//db
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'com.mysql:mysql-connector-j'
implementation 'org.flywaydb:flyway-core'
implementation "org.flywaydb:flyway-mysql"

// queryDSL
implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
annotationProcessor "jakarta.persistence:jakarta.persistence-api"

//etc(기타)
implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.4'
implementation 'org.apache.poi:poi:5.2.0'
implementation 'org.apache.poi:poi-ooxml:5.2.0'
implementation 'io.hypersistence:hypersistence-utils-hibernate-55:3.7.2'
implementation 'io.sentry:sentry-logback:7.6.0'
implementation 'com.fasterxml.jackson.core:jackson-core'
implementation 'com.github.f4b6a3:uuid-creator:6.0.0'
Expand All @@ -63,51 +58,26 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'com.auth0:java-jwt:4.2.1'

// Sentry
implementation 'io.sentry:sentry-spring-boot-starter-jakarta:7.14.0'
implementation 'io.sentry:sentry-logback:7.14.0'

//test
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
testCompileOnly 'org.projectlombok:lombok'
testAnnotationProcessor 'org.projectlombok:lombok'
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:1.0.23")

// TestContainer
testImplementation 'org.testcontainers:testcontainers:1.20.1'
testImplementation 'org.testcontainers:junit-jupiter:1.20.1'

// mysql 컨테이너
testImplementation 'org.testcontainers:mysql:1.20.1'
}

tasks.named('test') {
useJUnitPlatform()
}
def querydslDir = "$buildDir/generated/'querydsl'"

querydsl { // JPA 사용여부 및 사용 경로 설정
jpa = true
querydslSourcesDir = querydslDir
}

sourceSets { // build시 사용할 sourceSet 추가 설정
main.java.srcDir querydslDir
}

compileQuerydsl { // querydsl 컴파일 시 사용할 옵션 설정
options.annotationProcessorPath = configurations.querydsl
}

// querydsl이 compileClassPath를 상속하도록 설정
configurations {
compileOnly {
extendsFrom annotationProcessor
}
querydsl.extendsFrom compileClasspath
}

compileQuerydsl.doFirst {
if (file(querydslDir).exists())
delete(file(querydslDir))
}

compileQuerydsl {
options.annotationProcessorPath = configurations.querydsl
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
39 changes: 39 additions & 0 deletions src/main/generated/ddingdong/ddingdongBE/common/QBaseEntity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package ddingdong.ddingdongBE.common;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QBaseEntity is a Querydsl query type for BaseEntity
*/
@Generated("com.querydsl.codegen.DefaultSupertypeSerializer")
public class QBaseEntity extends EntityPathBase<BaseEntity> {

private static final long serialVersionUID = 654623242L;

public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity");

public final DateTimePath<java.time.LocalDateTime> createdAt = createDateTime("createdAt", java.time.LocalDateTime.class);

public final DateTimePath<java.time.LocalDateTime> updatedAt = createDateTime("updatedAt", java.time.LocalDateTime.class);

public QBaseEntity(String variable) {
super(BaseEntity.class, forVariable(variable));
}

public QBaseEntity(Path<? extends BaseEntity> path) {
super(path.getType(), path.getMetadata());
}

public QBaseEntity(PathMetadata metadata) {
super(BaseEntity.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package ddingdong.ddingdongBE.domain.activityreport.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.dsl.PathInits;


/**
* QActivityReport is a Querydsl query type for ActivityReport
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QActivityReport extends EntityPathBase<ActivityReport> {

private static final long serialVersionUID = 1287698975L;

private static final PathInits INITS = PathInits.DIRECT2;

public static final QActivityReport activityReport = new QActivityReport("activityReport");

public final ddingdong.ddingdongBE.common.QBaseEntity _super = new ddingdong.ddingdongBE.common.QBaseEntity(this);

public final ddingdong.ddingdongBE.domain.club.entity.QClub club;

public final StringPath content = createString("content");

//inherited
public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;

public final DateTimePath<java.time.LocalDateTime> deletedAt = createDateTime("deletedAt", java.time.LocalDateTime.class);

public final DateTimePath<java.time.LocalDateTime> endDate = createDateTime("endDate", java.time.LocalDateTime.class);

public final NumberPath<Long> id = createNumber("id", Long.class);

public final ListPath<Participant, QParticipant> participants = this.<Participant, QParticipant>createList("participants", Participant.class, QParticipant.class, PathInits.DIRECT2);

public final StringPath place = createString("place");

public final DateTimePath<java.time.LocalDateTime> startDate = createDateTime("startDate", java.time.LocalDateTime.class);

public final StringPath term = createString("term");

//inherited
public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;

public QActivityReport(String variable) {
this(ActivityReport.class, forVariable(variable), INITS);
}

public QActivityReport(Path<? extends ActivityReport> path) {
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
}

public QActivityReport(PathMetadata metadata) {
this(metadata, PathInits.getFor(metadata, INITS));
}

public QActivityReport(PathMetadata metadata, PathInits inits) {
this(ActivityReport.class, metadata, inits);
}

public QActivityReport(Class<? extends ActivityReport> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.club = inits.isInitialized("club") ? new ddingdong.ddingdongBE.domain.club.entity.QClub(forProperty("club"), inits.get("club")) : null;
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package ddingdong.ddingdongBE.domain.activityreport.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QActivityReportTermInfo is a Querydsl query type for ActivityReportTermInfo
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QActivityReportTermInfo extends EntityPathBase<ActivityReportTermInfo> {

private static final long serialVersionUID = -149711239L;

public static final QActivityReportTermInfo activityReportTermInfo = new QActivityReportTermInfo("activityReportTermInfo");

public final DateTimePath<java.time.LocalDateTime> deletedAt = createDateTime("deletedAt", java.time.LocalDateTime.class);

public final DatePath<java.time.LocalDate> endDate = createDate("endDate", java.time.LocalDate.class);

public final NumberPath<Long> id = createNumber("id", Long.class);

public final DatePath<java.time.LocalDate> startDate = createDate("startDate", java.time.LocalDate.class);

public final NumberPath<Integer> term = createNumber("term", Integer.class);

public QActivityReportTermInfo(String variable) {
super(ActivityReportTermInfo.class, forVariable(variable));
}

public QActivityReportTermInfo(Path<? extends ActivityReportTermInfo> path) {
super(path.getType(), path.getMetadata());
}

public QActivityReportTermInfo(PathMetadata metadata) {
super(ActivityReportTermInfo.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package ddingdong.ddingdongBE.domain.activityreport.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QParticipant is a Querydsl query type for Participant
*/
@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
public class QParticipant extends BeanPath<Participant> {

private static final long serialVersionUID = 670376887L;

public static final QParticipant participant = new QParticipant("participant");

public final StringPath department = createString("department");

public final StringPath name = createString("name");

public final StringPath studentId = createString("studentId");

public QParticipant(String variable) {
super(Participant.class, forVariable(variable));
}

public QParticipant(Path<? extends Participant> path) {
super(path.getType(), path.getMetadata());
}

public QParticipant(PathMetadata metadata) {
super(Participant.class, metadata);
}

}

Loading

0 comments on commit 83ae9e9

Please # to comment.