Refactor/module

high-core/src/main/kotlin/wiki/hi/hiwikiserver/core/user/domain/Authority.kt

@@ -0,0 +1,5 @@
+package wiki.hi.hiwikiserver.core.user.domain
+
+enum class Authority {
+    USER, MANAGER, ADMIN
+}

high-core/src/main/kotlin/wiki/hi/hiwikiserver/core/user/domain/Email.kt

@@ -0,0 +1,15 @@
+package wiki.hi.hiwikiserver.core.user.domain
+
+class Email(
+    email: String
+) {
+    companion object {
+        fun of(email: String): Email{
+            if (email.endsWith("hs.kr"))
+                return Email(email)
+
+            else
+                throw IllegalArgumentException("email의 형식이 올바르지 않습니다.")
+        }
+    }
+}

high-core/src/main/kotlin/wiki/hi/hiwikiserver/core/user/domain/User.kt

@@ -0,0 +1,11 @@
+package wiki.hi.hiwikiserver.core.user.domain
+
+data class User (
+    val id: Long,
+    val email: Email,
+    val nickName: String,
+    val authority: Authority,
+    val schoolId: Long,
+    val contributeId: ArrayList<Long>,
+    val thumbsUpsId: ArrayList<Long>
+)

high-api-server/build.gradle.kts → high-infrastructure/build.gradle.kts

@@ -7,11 +7,9 @@ plugins {
 
 dependencies {
     // impl project
+    implementation(project(":high-persistence"))
     implementation(project(":high-core"))
-    runtimeOnly(project(":high-internal-api-server"))
-
-    // web
-    implementation(Dependencies.SPRING_WEB)
+    implementation(project(":high-presentation"))
 
     // validation
     implementation(Dependencies.SPRING_VALIDATION)
@@ -33,9 +31,15 @@ dependencies {
 
     // aop
     implementation(Dependencies.AOP)
+}
 
+kapt {
+    arguments {
+        arg("mapstruct.defaultComponentModel", "spring")
+        arg("mapstruct.unmappedTargetPolicy", "ignore")
+    }
 }
 
-tasks.getByName<Jar>("bootJar") {
+tasks.getByName<Jar>("jar") {
     enabled = false
 }

high-infrastructure/src/main/resources/application.yml

@@ -0,0 +1,6 @@
+spring:
+  config:
+    import:
+      - core.yml
+      - presentation.yml
+      - persistence.yml

high-api-server/src/test/kotlin/wiki/hi/hiwikiserver/HiwikiServerApplicationTests.kt → high-infrastructure/src/test/kotlin/wiki/hi/hiwikiserver/HiwikiServerApplicationTests.kt

@@ -1,13 +1,12 @@
 package wiki.hi.hiwikiserver
 
-import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest
 class HiwikiServerApplicationTests {
 
-	@Test
-	fun contextLoads() {
-	}
+//	@Test
+//	fun contextLoads() {
+//	}
 
 }

high-internal-api-server/build.gradle.kts → high-persistence/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     // impl project
-    compileOnly(project(":high-core"))
+    implementation(project(":high-core"))
 
     // database
     implementation(Dependencies.SPRING_DATA_JPA)
@@ -16,6 +16,7 @@ dependencies {
     // querydsl
     implementation(Dependencies.QUERYDSL)
     kapt(Dependencies.QUERYDSL_PROCESSOR)
+
 }
 
 allOpen {

high-persistence/src/main/kotlin/wiki/hi/hiwikiserver/persistence/GenericMapper.kt

@@ -0,0 +1,7 @@
+package wiki.hi.hiwikiserver.persistence
+
+interface GenericMapper<D, E> {
+    fun toDomain(entity: E): D
+
+    fun toEntity(domain: D): E
+}

high-persistence/src/main/kotlin/wiki/hi/hiwikiserver/persistence/user/entity/UserJpaEntity.kt

@@ -0,0 +1,19 @@
+package wiki.hi.hiwikiserver.persistence.user.entity
+
+import wiki.hi.hiwikiserver.core.user.domain.Authority
+import wiki.hi.hiwikiserver.core.user.domain.Email
+import javax.persistence.*
+
+@Entity
+@Table(name = "USER")
+class UserJpaEntity (
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    val id: Long?,
+    @Embedded
+    val email: Email,
+    val nickName: String,
+    val authority: Authority,
+    val schoolId: Long
+)

high-persistence/src/main/kotlin/wiki/hi/hiwikiserver/persistence/user/mapper/UserMapper.kt

@@ -0,0 +1,23 @@
+package wiki.hi.hiwikiserver.persistence.user.mapper
+
+import wiki.hi.hiwikiserver.core.user.domain.User
+import wiki.hi.hiwikiserver.persistence.GenericMapper
+import wiki.hi.hiwikiserver.persistence.user.entity.UserJpaEntity
+
+class UserMapper : GenericMapper<User, UserJpaEntity> {
+    override fun toDomain(entity: UserJpaEntity): User {
+        TODO("ThumbsUpsId과 contributeId 때문에 추후에 개발")
+    }
+
+    override fun toEntity(domain: User): UserJpaEntity {
+
+        return UserJpaEntity(
+            id = domain.id,
+            email = domain.email,
+            nickName = domain.nickName,
+            authority = domain.authority,
+            schoolId = domain.schoolId
+        )
+    }
+
+}

high-persistence/src/main/resources/persistence.yml

@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: ${DB_URL}
+    username: ${DB_USERNAME}
+    password: ${DB_PASSWORD}
+
+  logging:
+    level:
+      org:
+        hibernate:
+          SQL: debug
+
+  jpa:
+    database: mysql
+
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    generate-ddl: true
+    hibernate:
+      ddl-auto: update

high-presentation/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("org.springframework.boot") version PluginVersions.SPRING_BOOT_VERSION
+    id("io.spring.dependency-management") version PluginVersions.DEPENDENCY_MANAGER_VERSION
+    kotlin("plugin.spring") version PluginVersions.SPRING_PLUGIN_VERSION
+}
+
+dependencies {
+    // impl project
+    implementation(project(":high-core"))
+
+    // web
+    implementation(Dependencies.SPRING_WEB)
+
+    // validation
+    implementation(Dependencies.SPRING_VALIDATION)
+}
+
+tasks.getByName<Jar>("bootJar") {
+    enabled = false
+}

settings.gradle.kts

@@ -1,5 +1,6 @@
 rootProject.name = "hiwiki-server"
 
 include("high-core")
-include("high-internal-api-server")
-include("high-api-server")
+include("high-presentation")
+include("high-persistence")
+include("high-infrastructure")