#1 jpa 모듈 분리

core/build.gradle.kts

@@ -2,11 +2,18 @@ plugins {
     idea
 }
 
-
 dependencies {
+    implementation(project(":jpa"))
+
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    //mysql
-    implementation("mysql:mysql-connector-java:8.0.33")
     //swagger
     implementation ("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2")
 }
+
+tasks.register("prepareKotlinBuildScriptModel") {}
+
+configurations {
+    compileOnly {
+        extendsFrom(configurations.annotationProcessor.get())
+    }
+}

core/src/main/kotlin/com/core/CoreApplication.kt

@@ -3,9 +3,8 @@ package com.core
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = ["com.core", "com.jpa"])
 class CoreApplication
-
 fun main(args: Array<String>) {
     runApplication<CoreApplication>(*args)
 }

core/src/main/kotlin/com/core/adapter/in/web/dto/AdapterMealDto.kt

@@ -1,6 +1,6 @@
 package com.core.adapter.`in`.web.dto
 
-import com.core.application.domain.meal.model.Meal
+import com.jpa.domain.model.Meal
 import java.math.BigDecimal
 import java.time.LocalDate
 

core/src/main/kotlin/com/core/application/domain/meal/service/MealReadService.kt

@@ -1,25 +1,25 @@
 package com.core.application.domain.meal.service
 
-import com.core.application.domain.meal.model.Meal
 import com.core.application.port.`in`.GetWeekMealUseCase
-import com.core.application.port.out.GetWeekMealPort
+import com.jpa.domain.MealPersistenceAdapter
+import com.jpa.domain.model.Meal
 import org.springframework.stereotype.Service
 import java.time.DayOfWeek
 import java.time.LocalDate
 
 @Service
 class MealReadService(
-    private val getWeekMealPort: GetWeekMealPort
+    private val mealPersistenceAdapter: MealPersistenceAdapter
 ) : GetWeekMealUseCase {
 
     /**
      * 주간 식단 조회
      * @param restaurantName
      * @return List<ApplicationMealDto.GetWeekMealRes>
      */
-    override fun invoke(restaurantIdx: Long): List<Meal> {
+    override operator fun invoke(restaurantIdx: Long): List<Meal> {
         val (startDay, endDay) = getWeekRange()
-        val meals = getWeekMealPort(restaurantIdx, startDay, endDay)
+        val meals = mealPersistenceAdapter.getWeekMeals(restaurantIdx, startDay, endDay)
         return meals
     }
 
@@ -31,7 +31,6 @@ class MealReadService(
         val today = LocalDate.now()
         val startOfWeek = today.minusDays((today.dayOfWeek.value % 7).toLong()).with(DayOfWeek.SUNDAY)
         val endOfWeek = startOfWeek.plusDays(6)
-
         return Pair(startOfWeek, endOfWeek)
     }
 

core/src/main/kotlin/com/core/application/port/in/GetWeekMealUseCase.kt

@@ -1,6 +1,7 @@
 package com.core.application.port.`in`
 
-import com.core.application.domain.meal.model.Meal
+import com.jpa.domain.model.Meal
+
 
 interface GetWeekMealUseCase {
 

core/src/main/resources/application.yml

@@ -2,16 +2,9 @@ server:
   port: 8080
 
 spring:
-  jpa:
-    show_sql: true
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        format_sql: true
-        highlight_sql: true
-        default_batch_fetch_size: 20
-    open-in-view: false
+  profiles:
+    include:
+      - jpa
 
 springdoc:
   swagger-ui:

jpa/src/main/kotlin/com/jpa/domain/MealPersistenceAdapter.kt

@@ -0,0 +1,19 @@
+package com.jpa.domain
+
+import com.jpa.domain.mapper.MealMapper
+import com.jpa.domain.repository.MealRepository
+import com.jpa.domain.model.Meal
+import org.springframework.stereotype.Component
+import java.time.LocalDate
+
+@Component
+class MealPersistenceAdapter(
+    private val mealRepository: MealRepository,
+    private val mealMapper: MealMapper
+)  {
+   fun getWeekMeals(restaurantIdx: Long, start: LocalDate, end: LocalDate): List<Meal> {
+       val weekMeal = mealRepository.getWeekMeal(restaurantIdx, start, end)
+       val applicationMeals = mealMapper.toDomain(weekMeal);
+       return applicationMeals
+   }
+}

core/src/main/kotlin/com/core/common/BaseEntity.kt → jpa/src/main/kotlin/com/jpa/domain/common/BaseEntity.kt

@@ -1,4 +1,4 @@
-package com.core.common
+package com.jpa.domain.common
 
 import jakarta.persistence.Column
 import jakarta.persistence.EntityListeners

core/src/main/kotlin/com/core/adapter/out/persistence/entity/CampusJpaEntity.kt → jpa/src/main/kotlin/com/jpa/domain/entity/CampusJpaEntity.kt

@@ -1,6 +1,6 @@
-package com.core.adapter.out.persistence.entity
+package com.jpa.domain.entity
 
-import com.core.common.BaseEntity
+import com.jpa.domain.common.BaseEntity
 import jakarta.persistence.*
 
 @Entity

core/src/main/kotlin/com/core/adapter/out/persistence/entity/MealJpaEntity.kt → jpa/src/main/kotlin/com/jpa/domain/entity/MealJpaEntity.kt

@@ -1,13 +1,11 @@
-package com.core.adapter.out.persistence.entity
+package com.jpa.domain.entity
 
-import com.core.adapter.out.persistence.enumerate.MealStatus
-import com.core.adapter.out.persistence.enumerate.MealType
-import com.core.common.BaseEntity
+import com.jpa.domain.common.BaseEntity
+import com.jpa.domain.enumerate.MealStatus
+import com.jpa.domain.enumerate.MealType
 import jakarta.persistence.*
-import org.hibernate.annotations.Comment
 import java.math.BigDecimal
 import java.time.LocalDate
-import java.time.LocalDateTime
 
 @Entity
 @Table(

core/src/main/kotlin/com/core/adapter/out/persistence/entity/RestaurantJpaEntity.kt → jpa/src/main/kotlin/com/jpa/domain/entity/RestaurantJpaEntity.kt

@@ -1,6 +1,6 @@
-package com.core.adapter.out.persistence.entity
+package com.jpa.domain.entity
 
-import com.core.common.BaseEntity
+import com.jpa.domain.common.BaseEntity
 import jakarta.persistence.*
 
 @Entity

core/src/main/kotlin/com/core/adapter/out/persistence/entity/ScrapJpaEntity.kt → jpa/src/main/kotlin/com/jpa/domain/entity/ScrapJpaEntity.kt

@@ -1,4 +1,4 @@
-package com.core.adapter.out.persistence.entity
+package com.jpa.domain.entity
 
 import jakarta.persistence.*
 import org.hibernate.annotations.Comment

core/src/main/kotlin/com/core/adapter/out/persistence/entity/StoreJpaEntity.kt → jpa/src/main/kotlin/com/jpa/domain/entity/StoreJpaEntity.kt

@@ -1,4 +1,4 @@
-package com.core.adapter.out.persistence.entity
+package com.jpa.domain.entity
 
 import jakarta.persistence.*
 import org.hibernate.annotations.Comment

core/src/main/kotlin/com/core/adapter/out/persistence/entity/UserJpaEntity.kt → jpa/src/main/kotlin/com/jpa/domain/entity/UserJpaEntity.kt

@@ -1,4 +1,4 @@
-package com.core.adapter.out.persistence.entity
+package com.jpa.domain.entity
 
 import jakarta.persistence.*
 

core/src/main/kotlin/com/core/adapter/out/persistence/enumerate/MealStatus.kt → jpa/src/main/kotlin/com/jpa/domain/enumerate/MealStatus.kt

@@ -1,4 +1,4 @@
-package com.core.adapter.out.persistence.enumerate
+package com.jpa.domain.enumerate
 
 enum class MealStatus(val value: String) {
     OPEN("운영중"),

core/src/main/kotlin/com/core/adapter/out/persistence/enumerate/MealType.kt → jpa/src/main/kotlin/com/jpa/domain/enumerate/MealType.kt

@@ -1,4 +1,4 @@
-package com.core.adapter.out.persistence.enumerate
+package com.jpa.domain.enumerate
 
 enum class MealType(val value: String) {
     BREAKFAST("조식"),

jpa/src/main/kotlin/com/jpa/domain/global/config/JpaConfig.kt

@@ -0,0 +1,11 @@
+package com.jpa.domain.global.config
+
+import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.context.annotation.Configuration
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
+
+@Configuration
+@EnableJpaRepositories(basePackages = ["com.jpa.domain.repository"])
+@EntityScan(basePackages = ["com.jpa"])
+class JpaConfig {
+}

core/src/main/kotlin/com/core/adapter/out/persistence/mapper/MealMapper.kt → jpa/src/main/kotlin/com/jpa/domain/mapper/MealMapper.kt

@@ -1,9 +1,9 @@
-package com.core.adapter.out.persistence.mapper
+package com.jpa.domain.mapper
 
-import com.core.adapter.out.persistence.entity.MealJpaEntity
-import com.core.adapter.out.persistence.enumerate.MealStatus
-import com.core.adapter.out.persistence.enumerate.MealType
-import com.core.application.domain.meal.model.Meal
+import com.jpa.domain.entity.MealJpaEntity
+import com.jpa.domain.enumerate.MealStatus
+import com.jpa.domain.enumerate.MealType
+import com.jpa.domain.model.Meal
 import org.springframework.stereotype.Component
 import java.math.BigDecimal
 import java.time.LocalDateTime

core/src/main/kotlin/com/core/application/domain/meal/model/Campus.kt → jpa/src/main/kotlin/com/jpa/domain/model/Campus.kt

@@ -1,4 +1,4 @@
-package com.core.application.domain.meal.model
+package com.jpa.domain.model
 
 import java.time.LocalDateTime
 

core/src/main/kotlin/com/core/application/domain/meal/model/Meal.kt → jpa/src/main/kotlin/com/jpa/domain/model/Meal.kt

@@ -1,7 +1,7 @@
-package com.core.application.domain.meal.model
+package com.jpa.domain.model
 
-import com.core.adapter.out.persistence.enumerate.MealStatus
-import com.core.adapter.out.persistence.enumerate.MealType
+import com.jpa.domain.enumerate.MealStatus
+import com.jpa.domain.enumerate.MealType
 import java.math.BigDecimal
 import java.time.LocalDate
 import java.time.LocalDateTime

core/src/main/kotlin/com/core/application/domain/meal/model/Restaurant.kt → jpa/src/main/kotlin/com/jpa/domain/model/Restaurant.kt

@@ -1,4 +1,4 @@
-package com.core.application.domain.meal.model
+package com.jpa.domain.model
 
 import java.time.LocalDateTime
 

core/src/main/kotlin/com/core/adapter/out/persistence/repository/MealRepository.kt → jpa/src/main/kotlin/com/jpa/domain/repository/MealRepository.kt

@@ -1,11 +1,10 @@
-package com.core.adapter.out.persistence.repository
+package com.jpa.domain.repository
 
-import com.core.adapter.out.persistence.entity.MealJpaEntity
+import com.jpa.domain.entity.MealJpaEntity
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import java.time.LocalDate
-import java.time.LocalDateTime
 
 @Repository
 interface MealRepository: JpaRepository<MealJpaEntity, Long> {

jpa/src/main/resources/application-jpa.yml

@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/myongsik?serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    username: root
+    password: 1q2w3e4r!
+  jpa:
+    hibernate:
+      ddl-auto: update
+    show_sql: true
+    properties:
+      hibernate:
+        format_sql: true
+        highlight_sql: true
+
+logging:
+  level:
+    org:
+      hibernate:
+        SQL: debug
+        orm.jdbc.bind: trace

settings.gradle.kts

@@ -3,4 +3,5 @@ plugins {
 }
 rootProject.name = "Server-v2"
 include("core")
-include("admin")
+include("admin")
+include("jpa")