Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix]: Error Code 구현 방식 수정 #415

Merged
merged 13 commits into from
Sep 20, 2024
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
22 changes: 12 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
id 'java'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
id 'org.asciidoctor.jvm.convert' version "3.3.2"
id 'jacoco'
}
Expand All @@ -10,18 +10,18 @@ group = 'liaison'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '17'
sourceCompatibility = '17'
}

configurations {
asciidoctorExt
compileOnly {
extendsFrom annotationProcessor
}
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
mavenCentral()
}

dependencies {
Expand All @@ -30,12 +30,14 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-mail'
implementation 'org.springframework.boot:spring-boot-starter-batch'

implementation 'io.jsonwebtoken:jjwt-api:0.11.5'

implementation 'com.amazonaws:aws-java-sdk-s3:1.12.715'
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.0.0'
implementation 'javax.xml.bind:jaxb-api:2.3.0'

// p6spy 자리
implementation 'org.springframework.boot:spring-boot-starter-data-redis'

Expand Down Expand Up @@ -74,7 +76,7 @@ dependencies {
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-mysql'

implementation 'org.mindrot:jbcrypt:0.4'
implementation 'org.mindrot:jbcrypt:0.4'
}

test {
Expand Down Expand Up @@ -116,7 +118,7 @@ tasks.withType(JavaCompile) {

// java source set 에 querydsl QClass 위치 추가
sourceSets {
main.java.srcDirs += [ generated ]
main.java.srcDirs += [generated]
}

// gradle clean 시에 QClass 디렉토리 삭제
Expand Down
51 changes: 0 additions & 51 deletions src/main/generated/liaison/linkit/admin/domain/QAdminMember.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package liaison.linkit.common.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;


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

private static final long serialVersionUID = -152371682L;

public static final QBaseDateTimeEntity baseDateTimeEntity = new QBaseDateTimeEntity("baseDateTimeEntity");

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 QBaseDateTimeEntity(String variable) {
super(BaseDateTimeEntity.class, forVariable(variable));
}

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

public QBaseDateTimeEntity(PathMetadata metadata) {
super(BaseDateTimeEntity.class, metadata);
}

}

14 changes: 7 additions & 7 deletions src/main/generated/liaison/linkit/member/domain/QMember.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ public class QMember extends EntityPathBase<Member> {

public static final QMember member = new QMember("member1");

public final DateTimePath<java.time.LocalDateTime> createdAt = createDateTime("createdAt", java.time.LocalDateTime.class);
public final liaison.linkit.common.domain.QBaseDateTimeEntity _super = new liaison.linkit.common.domain.QBaseDateTimeEntity(this);

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

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

Expand All @@ -34,22 +37,19 @@ public class QMember extends EntityPathBase<Member> {

public final EnumPath<liaison.linkit.member.domain.type.MemberState> memberState = createEnum("memberState", liaison.linkit.member.domain.type.MemberState.class);

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

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

public final liaison.linkit.profile.domain.QProfile profile;

public final EnumPath<liaison.linkit.member.domain.type.ProfileType> profileType = createEnum("profileType", liaison.linkit.member.domain.type.ProfileType.class);

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

public final liaison.linkit.team.domain.QTeamProfile teamProfile;

public final EnumPath<liaison.linkit.member.domain.type.TeamProfileType> teamProfileType = createEnum("teamProfileType", liaison.linkit.member.domain.type.TeamProfileType.class);

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

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

public QMember(String variable) {
this(Member.class, forVariable(variable), INITS);
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public class QPrivateWish extends EntityPathBase<PrivateWish> {
//inherited
public final EnumPath<liaison.linkit.global.type.StatusType> status = _super.status;

public final EnumPath<liaison.linkit.wish.domain.type.WishType> wishType = createEnum("wishType", liaison.linkit.wish.domain.type.WishType.class);

public QPrivateWish(String variable) {
this(PrivateWish.class, forVariable(variable), INITS);
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/generated/liaison/linkit/wish/domain/QTeamWish.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public class QTeamWish extends EntityPathBase<TeamWish> {

public final liaison.linkit.team.domain.announcement.QTeamMemberAnnouncement teamMemberAnnouncement;

public final EnumPath<liaison.linkit.wish.domain.type.WishType> wishType = createEnum("wishType", liaison.linkit.wish.domain.type.WishType.class);

public QTeamWish(String variable) {
this(TeamWish.class, forVariable(variable), INITS);
}
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/liaison/linkit/LinkitApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

@SpringBootApplication
@EnableJpaAuditing
public class LinkitApplication {
public static void main(String[] args) {
SpringApplication.run(LinkitApplication.class, args);
}
public static void main(String[] args) {
SpringApplication.run(LinkitApplication.class, args);
}
}
Loading
Loading