diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 0352f7f..0000000 --- a/build.gradle +++ /dev/null @@ -1,79 +0,0 @@ -buildscript { - ext { - springBootVersion = '2.7.0' - dependencyManagementVersion = '1.0.11.RELEASE' - kotlinVersion = '1.6.21' - flywayVersion = '7.15.0' - } - repositories { - mavenCentral() - } - dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}" - classpath "io.spring.gradle:dependency-management-plugin:${dependencyManagementVersion}" - - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" - classpath "org.jetbrains.kotlin:kotlin-noarg:${kotlinVersion}" - classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}" - } -} - -apply plugin: 'kotlin' -apply plugin: 'kotlin-spring' -apply plugin: "kotlin-jpa" -apply plugin: "kotlin-noarg" -apply plugin: "kotlin-allopen" -apply plugin: 'java' -apply plugin: 'org.springframework.boot' -apply plugin: 'io.spring.dependency-management' - -group = 'io.beaniejoy.dongecafe' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = '17' - -repositories { - mavenCentral() -} - -allOpen { - annotation("javax.persistence.Entity") - annotation("javax.persistence.MappedSuperclass") - annotation("javax.persistence.Embeddable") -} - -dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}") - implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - - implementation('io.github.microutils:kotlin-logging:2.1.21') - - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-web' - - // log4j2 -// implementation 'org.springframework.boot:spring-boot-starter-log4j2' -// testImplementation 'org.springframework.boot:spring-boot-starter-log4j2' - - developmentOnly 'org.springframework.boot:spring-boot-devtools' - - runtimeOnly 'mysql:mysql-connector-java' // MySQL - runtimeOnly 'com.h2database:h2' // H2 - - implementation "org.flywaydb:flyway-core:${flywayVersion}" // flyway - - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} - -//configurations { -// all { -// // log4j2 적용을 위해 기존 spring boot에서 제공하는 logging exclude -// exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' -// } -//} - -test { - useJUnitPlatform() -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..379dfe2 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,93 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +buildscript { + repositories { + mavenCentral() + } +} + +plugins { + id("org.springframework.boot") version "2.7.0" + id("io.spring.dependency-management") version "1.0.11.RELEASE" + kotlin("jvm") version "1.6.21" + kotlin("plugin.spring") version "1.6.21" apply false + kotlin("plugin.jpa") version "1.6.21" apply false +} + +java.sourceCompatibility = JavaVersion.VERSION_17 + +allprojects { + group = "io.beaniejoy.dongecafe" + version = "0.0.1-SNAPSHOT" + + repositories { + mavenCentral() + } +} + +subprojects { + apply(plugin = "java") + + apply(plugin = "io.spring.dependency-management") + apply(plugin = "org.springframework.boot") + apply(plugin = "org.jetbrains.kotlin.plugin.spring") + + apply(plugin = "kotlin") + apply(plugin = "kotlin-spring") + apply(plugin = "kotlin-jpa") + + repositories { + mavenCentral() + } + +// configurations { +// all { +// // log4j2 적용을 위해 기존 spring boot에서 제공하는 logging exclude +// exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' +// } +// } + + dependencies { + // Spring Boot Project + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-validation") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + developmentOnly("org.springframework.boot:spring-boot-devtools") + + //kotlin + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + + // DB + runtimeOnly("mysql:mysql-connector-java") // MySQL + runtimeOnly("com.h2database:h2") // H2 + + // Logging + // log4j2 + // implementation("org.springframework.boot:spring-boot-starter-log4j2") + // testImplementation("org.springframework.boot:spring-boot-starter-log4j2") + implementation("io.github.microutils:kotlin-logging:2.1.21") + + implementation("org.flywaydb:flyway-core:7.15.0") // flyway + + // Test + testImplementation("org.springframework.boot:spring-boot-starter-test") + } + + tasks.withType { + sourceCompatibility = "17" + targetCompatibility = "17" + } + + tasks.withType { + kotlinOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + jvmTarget = "17" + } + } + + tasks.withType { + useJUnitPlatform() + } +} \ No newline at end of file diff --git a/dongne-common/build.gradle.kts b/dongne-common/build.gradle.kts new file mode 100644 index 0000000..8324f5a --- /dev/null +++ b/dongne-common/build.gradle.kts @@ -0,0 +1,19 @@ +import org.springframework.boot.gradle.tasks.bundling.BootJar + +val jar: Jar by tasks +val bootJar: BootJar by tasks + +bootJar.enabled = false +jar.enabled = true + +allOpen { + annotation("javax.persistence.Entity") + annotation("javax.persistence.Embeddable") + annotation("javax.persistence.MappedSuperclass") +} + +noArg { + annotation("javax.persistence.Entity") + annotation("javax.persistence.Embeddable") + annotation("javax.persistence.MappedSuperclass") +} \ No newline at end of file diff --git a/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseTimeEntity.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt similarity index 94% rename from src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseTimeEntity.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt index bc366e1..b5c4ab1 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseTimeEntity.kt +++ b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt @@ -1,4 +1,4 @@ -package io.beaniejoy.dongnecafe.common.entity +package io.beaniejoy.dongnecafe.common import org.springframework.data.annotation.CreatedBy import org.springframework.data.annotation.CreatedDate diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt similarity index 97% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt index c3a11b2..7196bfe 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt +++ b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt @@ -1,6 +1,6 @@ package io.beaniejoy.dongnecafe.domain.cafe.entity -import io.beaniejoy.dongnecafe.common.entity.BaseTimeEntity +import io.beaniejoy.dongnecafe.common.BaseTimeEntity import io.beaniejoy.dongnecafe.domain.cafe.model.request.CafeMenuRegisterRequest import javax.persistence.* diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt similarity index 88% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt index e90c349..22a0a8c 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt +++ b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt @@ -1,6 +1,6 @@ package io.beaniejoy.dongnecafe.domain.cafe.entity -import io.beaniejoy.dongnecafe.common.entity.BaseTimeEntity +import io.beaniejoy.dongnecafe.common.BaseTimeEntity import javax.persistence.* @Entity diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt similarity index 97% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt index 92b8299..d2b4bcb 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt +++ b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt @@ -1,6 +1,6 @@ package io.beaniejoy.dongnecafe.domain.cafe.entity -import io.beaniejoy.dongnecafe.common.entity.BaseTimeEntity +import io.beaniejoy.dongnecafe.common.BaseTimeEntity import io.beaniejoy.dongnecafe.domain.cafe.model.request.MenuOptionRegisterRequest import java.math.BigDecimal import javax.persistence.* diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt similarity index 96% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt index e63795a..8072dbd 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt +++ b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt @@ -1,6 +1,6 @@ package io.beaniejoy.dongnecafe.domain.cafe.entity -import io.beaniejoy.dongnecafe.common.entity.BaseTimeEntity +import io.beaniejoy.dongnecafe.common.BaseTimeEntity import io.beaniejoy.dongnecafe.domain.cafe.model.request.OptionDetailRegisterRequest import javax.persistence.* diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt similarity index 95% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt index 6bf8b70..a97c7c4 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt +++ b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt @@ -1,6 +1,6 @@ package io.beaniejoy.dongnecafe.domain.cafe.entity -import io.beaniejoy.dongnecafe.common.entity.BaseTimeEntity +import io.beaniejoy.dongnecafe.common.BaseTimeEntity import java.math.BigDecimal import javax.persistence.* diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt b/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt rename to dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt diff --git a/dongne-service-api/build.gradle.kts b/dongne-service-api/build.gradle.kts new file mode 100644 index 0000000..ea96773 --- /dev/null +++ b/dongne-service-api/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + implementation(project(":dongne-common")) +} \ No newline at end of file diff --git a/src/main/java/io/beaniejoy/dongnecafe/DongneCafeApiApplication.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt similarity index 67% rename from src/main/java/io/beaniejoy/dongnecafe/DongneCafeApiApplication.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt index afefa48..b4f74ba 100644 --- a/src/main/java/io/beaniejoy/dongnecafe/DongneCafeApiApplication.kt +++ b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt @@ -4,8 +4,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication @SpringBootApplication -class DongneCafeApiApplication +class DongneCafeServiceApiApplication fun main(args: Array) { - runApplication(*args) + runApplication(*args) } \ No newline at end of file diff --git a/src/main/java/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt diff --git a/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt b/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt similarity index 100% rename from src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt rename to dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt diff --git a/src/main/resources/application-local.yml b/dongne-service-api/src/main/resources/application-local.yml similarity index 100% rename from src/main/resources/application-local.yml rename to dongne-service-api/src/main/resources/application-local.yml diff --git a/src/main/resources/application.yml b/dongne-service-api/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to dongne-service-api/src/main/resources/application.yml diff --git a/src/main/resources/db/migration/V1__Delete_all_tables_if_exists.sql b/dongne-service-api/src/main/resources/db/migration/V1__Delete_all_tables_if_exists.sql similarity index 100% rename from src/main/resources/db/migration/V1__Delete_all_tables_if_exists.sql rename to dongne-service-api/src/main/resources/db/migration/V1__Delete_all_tables_if_exists.sql diff --git a/src/main/resources/db/migration/V2__Create_cafe.sql b/dongne-service-api/src/main/resources/db/migration/V2__Create_cafe.sql similarity index 100% rename from src/main/resources/db/migration/V2__Create_cafe.sql rename to dongne-service-api/src/main/resources/db/migration/V2__Create_cafe.sql diff --git a/src/main/resources/db/migration/V3__Create_cafe_menu.sql b/dongne-service-api/src/main/resources/db/migration/V3__Create_cafe_menu.sql similarity index 100% rename from src/main/resources/db/migration/V3__Create_cafe_menu.sql rename to dongne-service-api/src/main/resources/db/migration/V3__Create_cafe_menu.sql diff --git a/src/main/resources/db/migration/V4__Create_cafe_image.sql b/dongne-service-api/src/main/resources/db/migration/V4__Create_cafe_image.sql similarity index 100% rename from src/main/resources/db/migration/V4__Create_cafe_image.sql rename to dongne-service-api/src/main/resources/db/migration/V4__Create_cafe_image.sql diff --git a/src/main/resources/db/migration/V5__Create_menu_option.sql b/dongne-service-api/src/main/resources/db/migration/V5__Create_menu_option.sql similarity index 100% rename from src/main/resources/db/migration/V5__Create_menu_option.sql rename to dongne-service-api/src/main/resources/db/migration/V5__Create_menu_option.sql diff --git a/src/main/resources/db/migration/V6__Create_option_detail.sql b/dongne-service-api/src/main/resources/db/migration/V6__Create_option_detail.sql similarity index 100% rename from src/main/resources/db/migration/V6__Create_option_detail.sql rename to dongne-service-api/src/main/resources/db/migration/V6__Create_option_detail.sql diff --git a/src/main/resources/db/migration/V7__Alter_all_tables_pk_fk.sql b/dongne-service-api/src/main/resources/db/migration/V7__Alter_all_tables_pk_fk.sql similarity index 100% rename from src/main/resources/db/migration/V7__Alter_all_tables_pk_fk.sql rename to dongne-service-api/src/main/resources/db/migration/V7__Alter_all_tables_pk_fk.sql diff --git a/src/main/resources/db/seed/R__Insert_Seed_cafe.sql b/dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_cafe.sql similarity index 100% rename from src/main/resources/db/seed/R__Insert_Seed_cafe.sql rename to dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_cafe.sql diff --git a/src/main/resources/db/seed/R__Insert_Seed_cafe_image.sql b/dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_cafe_image.sql similarity index 100% rename from src/main/resources/db/seed/R__Insert_Seed_cafe_image.sql rename to dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_cafe_image.sql diff --git a/src/main/resources/db/seed/R__Insert_Seed_cafe_menu.sql b/dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_cafe_menu.sql similarity index 100% rename from src/main/resources/db/seed/R__Insert_Seed_cafe_menu.sql rename to dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_cafe_menu.sql diff --git a/src/main/resources/db/seed/R__Insert_Seed_menu_option.sql b/dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_menu_option.sql similarity index 100% rename from src/main/resources/db/seed/R__Insert_Seed_menu_option.sql rename to dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_menu_option.sql diff --git a/src/main/resources/db/seed/R__Insert_Seed_option_detail.sql b/dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_option_detail.sql similarity index 100% rename from src/main/resources/db/seed/R__Insert_Seed_option_detail.sql rename to dongne-service-api/src/main/resources/db/seed/R__Insert_Seed_option_detail.sql diff --git a/src/test/java/io/beaniejoy/dongnecafe/DongneCafeSirenOrderApplicationTests.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/DongneCafeServiceApiApplicationTests.kt similarity index 77% rename from src/test/java/io/beaniejoy/dongnecafe/DongneCafeSirenOrderApplicationTests.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/DongneCafeServiceApiApplicationTests.kt index 7196f01..bdfac3c 100644 --- a/src/test/java/io/beaniejoy/dongnecafe/DongneCafeSirenOrderApplicationTests.kt +++ b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/DongneCafeServiceApiApplicationTests.kt @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest @SpringBootTest -internal class DongneCafeSirenOrderApplicationTests { +internal class DongneCafeServiceApiApplicationTests { @Test fun contextLoads() { diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt similarity index 100% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt similarity index 100% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt similarity index 90% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt index 59b9b89..5746790 100644 --- a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt +++ b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt @@ -1,6 +1,8 @@ package io.beaniejoy.dongnecafe.domain.cafe.service -import io.beaniejoy.dongnecafe.domain.cafe.model.request.* +import io.beaniejoy.dongnecafe.domain.cafe.model.request.CafeMenuUpdateRequest +import io.beaniejoy.dongnecafe.domain.cafe.model.request.MenuOptionUpdateRequest +import io.beaniejoy.dongnecafe.domain.cafe.model.request.OptionDetailUpdateRequest import io.beaniejoy.dongnecafe.domain.cafe.utils.CafeTestUtils import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt similarity index 100% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt similarity index 100% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt similarity index 100% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt diff --git a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt similarity index 78% rename from src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt rename to dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt index 66d3d2a..449b7d2 100644 --- a/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt +++ b/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt @@ -1,15 +1,8 @@ package io.beaniejoy.dongnecafe.domain.cafe.utils import io.beaniejoy.dongnecafe.domain.cafe.model.request.CafeRegisterRequest -import io.beaniejoy.dongnecafe.domain.cafe.model.request.CafeMenuRegisterRequest -import io.beaniejoy.dongnecafe.domain.cafe.model.request.MenuOptionRegisterRequest -import io.beaniejoy.dongnecafe.domain.cafe.model.request.OptionDetailRegisterRequest import io.beaniejoy.dongnecafe.domain.cafe.entity.Cafe -import io.beaniejoy.dongnecafe.domain.cafe.entity.CafeMenu -import io.beaniejoy.dongnecafe.domain.cafe.entity.MenuOption -import io.beaniejoy.dongnecafe.domain.cafe.entity.OptionDetail import org.junit.jupiter.api.Assertions.* -import java.math.BigDecimal import javax.persistence.GeneratedValue class CafeTestUtils { diff --git a/src/test/resources/application.yml b/dongne-service-api/src/test/resources/application.yml similarity index 100% rename from src/test/resources/application.yml rename to dongne-service-api/src/test/resources/application.yml diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index b005d83..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'dongne-cafe-api' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..741ff6f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "dongne-cafe-api" +include("dongne-common") +include("dongne-service-api")