diff --git a/build.gradle.kts b/build.gradle.kts index 379dfe2..d7e81a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,11 +75,6 @@ subprojects { testImplementation("org.springframework.boot:spring-boot-starter-test") } - tasks.withType { - sourceCompatibility = "17" - targetCompatibility = "17" - } - tasks.withType { kotlinOptions { freeCompilerArgs = listOf("-Xjsr305=strict") diff --git a/dongne-account-api/build.gradle.kts b/dongne-account-api/build.gradle.kts new file mode 100644 index 0000000..ea96773 --- /dev/null +++ b/dongne-account-api/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + implementation(project(":dongne-common")) +} \ No newline at end of file diff --git a/dongne-account-api/src/main/kotlin/io/beaniejoy/dongnecafe/DongneAccountApiApplication.kt b/dongne-account-api/src/main/kotlin/io/beaniejoy/dongnecafe/DongneAccountApiApplication.kt new file mode 100644 index 0000000..a79a862 --- /dev/null +++ b/dongne-account-api/src/main/kotlin/io/beaniejoy/dongnecafe/DongneAccountApiApplication.kt @@ -0,0 +1,11 @@ +package io.beaniejoy.dongnecafe + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class DongneAccountApiApplication + +fun main(args: Array) { + runApplication(*args) +} \ No newline at end of file diff --git a/dongne-account-api/src/main/resources/application-local.yml b/dongne-account-api/src/main/resources/application-local.yml new file mode 100644 index 0000000..0a4ee95 --- /dev/null +++ b/dongne-account-api/src/main/resources/application-local.yml @@ -0,0 +1,5 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/dongne?autoreconnect=true&characterEncoding=utf8&serverTimezone=Asia/Seoul + username: root + password: beaniejoy # TODO 추후 보안에 대해 생각해보기 diff --git a/dongne-account-api/src/main/resources/application.yml b/dongne-account-api/src/main/resources/application.yml new file mode 100644 index 0000000..91aa6e4 --- /dev/null +++ b/dongne-account-api/src/main/resources/application.yml @@ -0,0 +1,27 @@ +spring: + profiles: + active: local + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: + hibernate: + ddl-auto: none # use [service-api] flyway migration + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL5InnoDBDialect + format_sql: true + show-sql: false + open-in-view: + flyway: + enabled: false + devtools: + livereload: + enabled: false # no use devtools' LiveReload Server + +server: + port: 9090 + +logging: + level: + org.hibernate.SQL: debug # logger 통해 로깅 + # org.hibernate.type: trace \ No newline at end of file diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/DongneCafeServiceApiApplicationTests.kt b/dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/DongneAccountApiApplicationTests.kt similarity index 77% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/DongneCafeServiceApiApplicationTests.kt rename to dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/DongneAccountApiApplicationTests.kt index bdfac3c..d80294f 100644 --- a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/DongneCafeServiceApiApplicationTests.kt +++ b/dongne-account-api/src/test/kotlin/io/beaniejoy/dongnecafe/DongneAccountApiApplicationTests.kt @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest @SpringBootTest -internal class DongneCafeServiceApiApplicationTests { +internal class DongneAccountApiApplicationTests { @Test fun contextLoads() { diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/common/BaseTimeEntity.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/Cafe.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeImage.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeMenu.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/MenuOption.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/OptionDetail.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuBulkDeleteRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuRegisterRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeMenuUpdateRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeRegisterRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/CafeUpdateRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionRegisterRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/request/MenuOptionUpdateRequest.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeDetailedInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeImageInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuDetailedInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeMenuInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/CafeSearchInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/MenuOptionInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/model/response/OptionDetailInfo.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeMenuRepository.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepository.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/MenuOptionRepository.kt diff --git a/dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt b/dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt similarity index 100% rename from dongne-common/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt rename to dongne-common/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/OptionDetailRepository.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt similarity index 67% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt index b4f74ba..19d2072 100644 --- a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt +++ b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/DongneServiceApiApplication.kt @@ -4,8 +4,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication @SpringBootApplication -class DongneCafeServiceApiApplication +class DongneServiceApiApplication fun main(args: Array) { - runApplication(*args) + runApplication(*args) } \ No newline at end of file diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/common/config/AuditingConfig.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/common/entity/BaseEntityAuditorAware.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeController.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/controller/CafeMenuController.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExceptionHandler.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeExistedException.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeMenuNotFoundException.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/CafeNotFoundException.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/MenuOptionNotFoundException.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/error/OptionDetailNotFoundException.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuService.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeService.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/MenuOptionService.kt diff --git a/dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt b/dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt similarity index 100% rename from dongne-service-api/src/main/java/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt rename to dongne-service-api/src/main/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/OptionDetailService.kt diff --git a/dongne-service-api/src/main/resources/application.yml b/dongne-service-api/src/main/resources/application.yml index 436480a..4c4880c 100644 --- a/dongne-service-api/src/main/resources/application.yml +++ b/dongne-service-api/src/main/resources/application.yml @@ -15,6 +15,9 @@ spring: baseline-on-migrate: true baseline-version: 0 locations: classpath:db/migration,classpath:db/seed + devtools: + livereload: + enabled: false # no use devtools' LiveReload Server logging: level: diff --git a/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/DongneServiceApiApplicationTests.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/DongneServiceApiApplicationTests.kt new file mode 100644 index 0000000..1a4ce70 --- /dev/null +++ b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/DongneServiceApiApplicationTests.kt @@ -0,0 +1,12 @@ +package io.beaniejoy.dongnecafe + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +internal class DongneServiceApiApplicationTests { + + @Test + fun contextLoads() { + } +} \ No newline at end of file diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt similarity index 100% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/entity/CafeTest.kt diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt similarity index 100% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/repository/CafeRepositoryTest.kt diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt similarity index 100% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceIntegratedTest.kt diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt similarity index 100% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeMenuServiceTest.kt diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt similarity index 97% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt index 6855a8c..5e5247d 100644 --- a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt +++ b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/service/CafeServiceTest.kt @@ -98,7 +98,7 @@ internal class CafeServiceTest { // TODO 'findByIdOrNull'은 kotlin test 라이브러리 필요한 듯 val mockCafe = mock(Cafe::class.java) - doReturn(Optional.of(cafe)).`when`(mockCafeRepository.findById(eq(cafeId))) + `when`(mockCafeRepository.findById(cafeId)).thenReturn(Optional.of(mockCafe)) doNothing().`when`(mockCafe).updateInfo( name = anyString(), @@ -109,7 +109,7 @@ internal class CafeServiceTest { // when mockCafeService.updateInfo( - id = eq(cafeId), + id = cafeId, name = "updated_name", address = "updated_address", phoneNumber = "updated_phoneNumber", diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt similarity index 100% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeMenuTestUtils.kt diff --git a/dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt b/dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt similarity index 100% rename from dongne-service-api/src/test/java/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt rename to dongne-service-api/src/test/kotlin/io/beaniejoy/dongnecafe/domain/cafe/utils/CafeTestUtils.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 741ff6f..a1387d1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,4 @@ rootProject.name = "dongne-cafe-api" include("dongne-common") include("dongne-service-api") +include("dongne-account-api")