Develop

.dockerignore

@@ -0,0 +1,6 @@
+.idea/
+*.iml
+*.iws
+target/
+.sonar/
+.sonarlint/

.gitignore

@@ -37,4 +37,7 @@ out/
 .vscode/
 
 ### .env ###
-.env
+.env
+
+### local swagger file ###
+src/main/resources/static/danpat-local.yaml

Dockerfile

@@ -0,0 +1,36 @@
+# Stage 1: Build
+FROM openjdk:17-jdk-slim AS builder
+
+# 작업 디렉토리 설정
+WORKDIR /app
+
+# Gradle Wrapper와 설정 파일 복사
+COPY gradle /app/gradle
+COPY gradlew /app/gradlew
+COPY build.gradle /app/
+COPY settings.gradle /app/
+
+# Gradle 의존성 캐시를 먼저 준비
+RUN ./gradlew build -x test --no-daemon || return 0
+
+# 나머지 소스 코드 복사
+COPY src /app/src
+COPY .env /app/.env
+
+# Gradle Wrapper를 사용하여 clean과 build 실행
+RUN ./gradlew clean build -x test --no-daemon
+
+# Stage 2: Run
+FROM openjdk:17-jdk-slim
+
+# 작업 디렉토리 설정
+WORKDIR /app
+
+# 빌드 결과물 복사
+COPY --from=builder /app/build/libs/*.jar app.jar
+
+# 포트 노출
+EXPOSE 8080
+
+# 애플리케이션 실행
+ENTRYPOINT ["java", "-jar", "app.jar"]

build.gradle

@@ -26,10 +26,9 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 
     compileOnly 'org.projectlombok:lombok'
-//    runtimeOnly 'com.mysql:mysql-connector-j'
+    runtimeOnly 'com.mysql:mysql-connector-j'
     runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
@@ -78,12 +77,11 @@ dependencies {
     //WIREMOCK (외부 의존성 테스트용)
     implementation 'org.wiremock.integrations:wiremock-spring-boot:3.3.0'
 
-    // ModelMapper 사용
-    //객체 간 매핑 처리
+    // ModelMapper 사용, 객체 간 매핑 처리
     implementation 'org.modelmapper:modelmapper:3.1.0'
 
     // swagger
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 
     // S3
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'

docker-compose.yml

@@ -0,0 +1,28 @@
+services:
+  mongodb:
+    image: mongo:latest
+    container_name: mongodb
+    ports:
+      - "27017:27017"
+    volumes:
+      - mongodb_data:/data/db
+    env_file:
+        - .env
+
+  backend:
+    image: taeyoungkims/danpat:latest
+    container_name: backend
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./src:/app/src
+    environment:
+      - SPRING_DATA_MONGODB_URI=${MONGO_URI}
+    env_file:
+      - .env
+    depends_on:
+       - mongodb
+
+volumes:
+  mongodb_data:
+  logs:

src/main/generated/com/example/api/auth/entitiy/QRefreshToken.java

@@ -50,7 +50,7 @@ public QRefreshToken(PathMetadata metadata, PathInits inits) {
 
     public QRefreshToken(Class<? extends RefreshToken> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.user = inits.isInitialized("user") ? new com.example.api.domain.QAccount(forProperty("user")) : null;
+        this.user = inits.isInitialized("user") ? new com.example.api.domain.QAccount(forProperty("user"), inits.get("user")) : null;
     }
 
 }

src/main/generated/com/example/api/domain/QAccount.java

@@ -18,6 +18,8 @@ public class QAccount extends EntityPathBase<Account> {
 
     private static final long serialVersionUID = -1087167288L;
 
+    private static final PathInits INITS = PathInits.DIRECT2;
+
     public static final QAccount account = new QAccount("account");
 
     public final QBaseEntity _super = new QBaseEntity(this);
@@ -26,6 +28,10 @@ public class QAccount extends EntityPathBase<Account> {
 
     public final NumberPath<Integer> age = createNumber("age", Integer.class);
 
+    public final StringPath birthdate = createString("birthdate");
+
+    public final StringPath callTime = createString("callTime");
+
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
 
@@ -35,6 +41,10 @@ public class QAccount extends EntityPathBase<Account> {
 
     public final BooleanPath emailReceivable = createBoolean("emailReceivable");
 
+    public final StringPath introduction = createString("introduction");
+
+    public final QLocation location;
+
     public final StringPath loginId = createString("loginId");
 
     public final StringPath name = createString("name");
@@ -63,15 +73,24 @@ public class QAccount extends EntityPathBase<Account> {
     public final NumberPath<Integer> workCount = createNumber("workCount", Integer.class);
 
     public QAccount(String variable) {
-        super(Account.class, forVariable(variable));
+        this(Account.class, forVariable(variable), INITS);
     }
 
     public QAccount(Path<? extends Account> path) {
-        super(path.getType(), path.getMetadata());
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
     }
 
     public QAccount(PathMetadata metadata) {
-        super(Account.class, metadata);
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QAccount(PathMetadata metadata, PathInits inits) {
+        this(Account.class, metadata, inits);
+    }
+
+    public QAccount(Class<? extends Account> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.location = inits.isInitialized("location") ? new QLocation(forProperty("location")) : null;
     }
 
 }

src/main/generated/com/example/api/domain/QBusiness.java

@@ -35,9 +35,9 @@ public class QBusiness extends EntityPathBase<Business> {
 
     public final QAccount employer;
 
-    public final com.example.api.account.entity.QLocation location;
+    public final QLocation location;
 
-    public final DatePath<java.time.LocalDate> openDate = createDate("openDate", java.time.LocalDate.class);
+    public final StringPath openDate = createString("openDate");
 
     public final StringPath registrationNumber = createString("registrationNumber");
 
@@ -64,8 +64,8 @@ public QBusiness(PathMetadata metadata, PathInits inits) {
 
     public QBusiness(Class<? extends Business> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer")) : null;
-        this.location = inits.isInitialized("location") ? new com.example.api.account.entity.QLocation(forProperty("location")) : null;
+        this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer"), inits.get("employer")) : null;
+        this.location = inits.isInitialized("location") ? new QLocation(forProperty("location")) : null;
     }
 
 }

src/main/generated/com/example/api/domain/QBusinessCategory.java

@@ -26,13 +26,13 @@ public class QBusinessCategory extends EntityPathBase<BusinessCategory> {
 
     public final QBusiness business;
 
-    public final QCategory category;
-
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
+    public final QSubCategory subCategory;
+
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
 
@@ -55,7 +55,7 @@ public QBusinessCategory(PathMetadata metadata, PathInits inits) {
     public QBusinessCategory(Class<? extends BusinessCategory> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.business = inits.isInitialized("business") ? new QBusiness(forProperty("business"), inits.get("business")) : null;
-        this.category = inits.isInitialized("category") ? new QCategory(forProperty("category"), inits.get("category")) : null;
+        this.subCategory = inits.isInitialized("subCategory") ? new QSubCategory(forProperty("subCategory"), inits.get("subCategory")) : null;
     }
 
 }

src/main/generated/com/example/api/domain/QCategory.java

@@ -7,7 +7,6 @@
 import com.querydsl.core.types.PathMetadata;
 import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
-import com.querydsl.core.types.dsl.PathInits;
 
 
 /**
@@ -18,14 +17,10 @@ public class QCategory extends EntityPathBase<Category> {
 
     private static final long serialVersionUID = -1449757245L;
 
-    private static final PathInits INITS = PathInits.DIRECT2;
-
     public static final QCategory category = new QCategory("category");
 
     public final QBaseEntity _super = new QBaseEntity(this);
 
-    public final QAccount account;
-
     public final NumberPath<Long> categoryId = createNumber("categoryId", Long.class);
 
     public final StringPath categoryName = createString("categoryName");
@@ -37,24 +32,15 @@ public class QCategory extends EntityPathBase<Category> {
     public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
 
     public QCategory(String variable) {
-        this(Category.class, forVariable(variable), INITS);
+        super(Category.class, forVariable(variable));
     }
 
     public QCategory(Path<? extends Category> path) {
-        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+        super(path.getType(), path.getMetadata());
     }
 
     public QCategory(PathMetadata metadata) {
-        this(metadata, PathInits.getFor(metadata, INITS));
-    }
-
-    public QCategory(PathMetadata metadata, PathInits inits) {
-        this(Category.class, metadata, inits);
-    }
-
-    public QCategory(Class<? extends Category> type, PathMetadata metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.account = inits.isInitialized("account") ? new QAccount(forProperty("account")) : null;
+        super(Category.class, metadata);
     }
 
 }

src/main/generated/com/example/api/domain/QContract.java

@@ -32,8 +32,6 @@ public class QContract extends EntityPathBase<Contract> {
 
     public final DateTimePath<java.time.LocalDateTime> contractStartTime = createDateTime("contractStartTime", java.time.LocalDateTime.class);
 
-    public final BooleanPath contractSucceeded = createBoolean("contractSucceeded");
-
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
 

src/main/generated/com/example/api/domain/QExternalCareer.java

@@ -31,13 +31,13 @@ public class QExternalCareer extends EntityPathBase<ExternalCareer> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final StringPath Name = createString("Name");
-
-    public final StringPath period = createString("period");
+    public final QSubCategory subCategory;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
 
+    public final NumberPath<Integer> workCount = createNumber("workCount", Integer.class);
+
     public QExternalCareer(String variable) {
         this(ExternalCareer.class, forVariable(variable), INITS);
     }
@@ -56,7 +56,8 @@ public QExternalCareer(PathMetadata metadata, PathInits inits) {
 
     public QExternalCareer(Class<? extends ExternalCareer> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee")) : null;
+        this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
+        this.subCategory = inits.isInitialized("subCategory") ? new QSubCategory(forProperty("subCategory"), inits.get("subCategory")) : null;
     }
 
 }

src/main/generated/com/example/api/domain/QFlavoredCategory.java

@@ -0,0 +1,65 @@
+package com.example.api.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;
+
+
+/**
+ * QFlavoredCategory is a Querydsl query type for FlavoredCategory
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QFlavoredCategory extends EntityPathBase<FlavoredCategory> {
+
+    private static final long serialVersionUID = -258789472L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QFlavoredCategory flavoredCategory = new QFlavoredCategory("flavoredCategory");
+
+    public final QBaseEntity _super = new QBaseEntity(this);
+
+    public final QCategory category;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
+
+    public final QAccount employee;
+
+    public final NumberPath<Long> flavoredCategoryId = createNumber("flavoredCategoryId", Long.class);
+
+    public final QSubCategory subCategory;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
+
+    public QFlavoredCategory(String variable) {
+        this(FlavoredCategory.class, forVariable(variable), INITS);
+    }
+
+    public QFlavoredCategory(Path<? extends FlavoredCategory> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QFlavoredCategory(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QFlavoredCategory(PathMetadata metadata, PathInits inits) {
+        this(FlavoredCategory.class, metadata, inits);
+    }
+
+    public QFlavoredCategory(Class<? extends FlavoredCategory> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.category = inits.isInitialized("category") ? new QCategory(forProperty("category")) : null;
+        this.employee = inits.isInitialized("employee") ? new QAccount(forProperty("employee"), inits.get("employee")) : null;
+        this.subCategory = inits.isInitialized("subCategory") ? new QSubCategory(forProperty("subCategory"), inits.get("subCategory")) : null;
+    }
+
+}
+