refactor : rds 모듈 entity 매핑 방식 통일

grida-database/database-rds/src/main/kotlin/org/grida/persistence/diary/DiaryEntity.kt

@@ -1,8 +1,6 @@
 package org.grida.persistence.diary
 
-import org.grida.domain.diary.Diary
 import org.grida.domain.diary.DiaryScope
-import org.grida.domain.user.User
 import org.grida.persistence.base.BaseEntity
 import org.grida.persistence.user.UserEntity
 import java.time.LocalDate
@@ -39,37 +37,11 @@ class DiaryEntity(
     var user: UserEntity
 ) : BaseEntity() {
 
-    fun toDiary(): Diary {
-        return Diary(
-            id = id,
-            timestamp = this.toTimeStamp(),
-            targetDate = targetDate,
-            content = content,
-            scope = scope,
-            userId = user.id
-        )
-    }
-
     fun updateContent(content: String) {
         this.content = content
     }
 
     fun updateScope(scope: DiaryScope) {
         this.scope = scope
     }
-
-    companion object {
-        fun from(
-            diary: Diary,
-            user: User
-        ): DiaryEntity {
-            return DiaryEntity(
-                id = diary.id,
-                targetDate = diary.targetDate,
-                content = diary.content,
-                scope = diary.scope,
-                user = UserEntity.from(user)
-            )
-        }
-    }
-}
+}

grida-database/database-rds/src/main/kotlin/org/grida/persistence/diary/DiaryEntityMapper.kt

@@ -0,0 +1,26 @@
+package org.grida.persistence.diary
+
+import org.grida.domain.diary.Diary
+import org.grida.domain.user.User
+import org.grida.persistence.user.toEntity
+
+fun Diary.toEntity(user: User): DiaryEntity {
+    return DiaryEntity(
+        id = this.id,
+        targetDate = this.targetDate,
+        content = this.content,
+        scope = this.scope,
+        user = user.toEntity()
+    )
+}
+
+fun DiaryEntity.toDomain(): Diary {
+    return Diary(
+        id = this.id,
+        timestamp = this.toTimeStamp(),
+        targetDate = this.targetDate,
+        content = this.content,
+        scope = this.scope,
+        userId = this.user.id
+    )
+}

grida-database/database-rds/src/main/kotlin/org/grida/persistence/diary/DiaryEntityRepository.kt

@@ -19,13 +19,14 @@ class DiaryEntityRepository(
         diary: Diary,
         user: User
     ): Long {
-        val diaryEntity = diaryJpaEntityRepository.save(DiaryEntity.from(diary, user))
+        val diaryEntity = diary.toEntity(user)
+        diaryJpaEntityRepository.save(diaryEntity)
         return diaryEntity.id
     }
 
     override fun findById(id: Long): Diary {
         val diaryEntity = diaryJpaEntityRepository.findByIdOrException(id)
-        return diaryEntity.toDiary()
+        return diaryEntity.toDomain()
     }
 
     override fun existsByUserIdAndTargetDate(

grida-database/database-rds/src/main/kotlin/org/grida/persistence/diaryimage/DiaryImageMapper.kt → grida-database/database-rds/src/main/kotlin/org/grida/persistence/diaryimage/DiaryImageEntityMapper.kt

@@ -1,20 +1,22 @@
 package org.grida.persistence.diaryimage
 
+import org.grida.domain.diary.Diary
 import org.grida.domain.diaryimage.DiaryImage
 import org.grida.domain.image.Image
-import org.grida.persistence.diary.DiaryEntity
-import org.grida.persistence.user.UserEntity
+import org.grida.domain.user.User
+import org.grida.persistence.diary.toEntity
+import org.grida.persistence.user.toEntity
 
 fun DiaryImage.toEntity(
-    userEntity: UserEntity,
-    diaryEntity: DiaryEntity
+    user: User,
+    diary: Diary
 ): DiaryImageEntity {
     return DiaryImageEntity(
         id = this.id,
         imageUrl = this.image.url,
         status = this.image.status,
-        user = userEntity,
-        diary = diaryEntity
+        user = user.toEntity(),
+        diary = diary.toEntity(user)
     )
 }
 

grida-database/database-rds/src/main/kotlin/org/grida/persistence/profileimage/ProfileImageEntity.kt

@@ -1,11 +1,7 @@
 package org.grida.persistence.profileimage
 
-import org.grida.domain.image.Image
 import org.grida.domain.image.ImageStatus
-import org.grida.domain.profileimage.Appearance
 import org.grida.domain.profileimage.Gender
-import org.grida.domain.profileimage.ProfileImage
-import org.grida.domain.user.User
 import org.grida.persistence.base.BaseEntity
 import org.grida.persistence.user.UserEntity
 import javax.persistence.Column
@@ -50,44 +46,7 @@ class ProfileImageEntity(
     var user: UserEntity
 ) : BaseEntity() {
 
-    fun toProfileImage(): ProfileImage {
-        return ProfileImage(
-            id = id,
-            userId = user.id,
-            image = Image(
-                url = imageUrl,
-                status = status,
-                timestamp = toTimeStamp()
-            ),
-            appearance = Appearance(
-                gender = gender,
-                age = age,
-                hairStyle = hairStyle,
-                glasses = glasses,
-                bodyShape = bodyShape
-            )
-        )
-    }
-
     fun updateStatue(status: ImageStatus) {
         this.status = status
     }
-
-    companion object {
-        fun from(
-            profileImage: ProfileImage,
-            user: User
-        ): ProfileImageEntity {
-            return ProfileImageEntity(
-                imageUrl = profileImage.image.url,
-                status = profileImage.image.status,
-                gender = profileImage.appearance.gender,
-                age = profileImage.appearance.age,
-                hairStyle = profileImage.appearance.hairStyle,
-                glasses = profileImage.appearance.glasses,
-                bodyShape = profileImage.appearance.bodyShape,
-                user = UserEntity.from(user)
-            )
-        }
-    }
 }

grida-database/database-rds/src/main/kotlin/org/grida/persistence/profileimage/ProfileImageEntityMapper.kt

@@ -0,0 +1,39 @@
+package org.grida.persistence.profileimage
+
+import org.grida.domain.image.Image
+import org.grida.domain.profileimage.Appearance
+import org.grida.domain.profileimage.ProfileImage
+import org.grida.domain.user.User
+import org.grida.persistence.user.toEntity
+
+fun ProfileImage.toEntity(user: User): ProfileImageEntity {
+    return ProfileImageEntity(
+        imageUrl = this.image.url,
+        status = this.image.status,
+        gender = this.appearance.gender,
+        age = this.appearance.age,
+        hairStyle = this.appearance.hairStyle,
+        glasses = this.appearance.glasses,
+        bodyShape = this.appearance.bodyShape,
+        user = user.toEntity()
+    )
+}
+
+fun ProfileImageEntity.toDomain(): ProfileImage {
+    return ProfileImage(
+        id = this.id,
+        userId = this.user.id,
+        image = Image(
+            url = this.imageUrl,
+            status = this.status,
+            timestamp = this.toTimeStamp()
+        ),
+        appearance = Appearance(
+            gender = this.gender,
+            age = this.age,
+            hairStyle = this.hairStyle,
+            glasses = this.glasses,
+            bodyShape = this.bodyShape
+        )
+    )
+}

grida-database/database-rds/src/main/kotlin/org/grida/persistence/profileimage/ProfileImageEntityRepository.kt

@@ -18,25 +18,25 @@ class ProfileImageEntityRepository(
         profileImage: ProfileImage,
         user: User
     ): Long {
-        val profileImageEntity =
-            profileImageJpaEntityRepository.save(ProfileImageEntity.from(profileImage, user))
+        val profileImageEntity = profileImage.toEntity(user)
+        profileImageJpaEntityRepository.save(profileImageEntity)
         return profileImageEntity.id
     }
 
     override fun findById(id: Long): ProfileImage {
         val profileImageEntity = profileImageJpaEntityRepository.findByIdOrException(id)
-        return profileImageEntity.toProfileImage()
+        return profileImageEntity.toDomain()
     }
 
     override fun findByUserIdAndStatus(userId: Long, status: ImageStatus): ProfileImage {
         val profileImageEntity =
             profileImageJpaEntityRepository.findByUserIdAndStatusOrException(userId, status)
-        return profileImageEntity.toProfileImage()
+        return profileImageEntity.toDomain()
     }
 
     override fun findAllByUserId(userId: Long): List<ProfileImage> {
         val profileImageEntities = profileImageJpaEntityRepository.findAllByUserId(userId)
-        return profileImageEntities.map { it.toProfileImage() }
+        return profileImageEntities.map { it.toDomain() }
     }
 
     override fun existsByUserIdAndStatus(userId: Long, status: ImageStatus): Boolean {

grida-database/database-rds/src/main/kotlin/org/grida/persistence/user/UserEntity.kt

@@ -29,28 +29,4 @@ class UserEntity(
     var role: Role,
 
     var nickname: String
-) : BaseEntity() {
-
-    fun toUser(): User {
-        return User(
-            id = id,
-            username = username,
-            password = password,
-            role = role,
-            nickname = nickname,
-            timestamp = toTimeStamp()
-        )
-    }
-
-    companion object {
-        fun from(user: User): UserEntity {
-            return UserEntity(
-                id = user.id,
-                username = user.username,
-                password = user.password,
-                role = user.role,
-                nickname = user.nickname
-            )
-        }
-    }
-}
+) : BaseEntity()

grida-database/database-rds/src/main/kotlin/org/grida/persistence/user/UserEntityMapper.kt

@@ -0,0 +1,24 @@
+package org.grida.persistence.user
+
+import org.grida.domain.user.User
+
+fun User.toEntity(): UserEntity {
+    return UserEntity(
+        id = this.id,
+        username = this.username,
+        password = this.password,
+        role = this.role,
+        nickname = this.nickname
+    )
+}
+
+fun UserEntity.toDomain(): User {
+    return User(
+        id = this.id,
+        username = this.username,
+        password = this.password,
+        role = this.role,
+        nickname = this.nickname,
+        timestamp = this.toTimeStamp()
+    )
+}

grida-database/database-rds/src/main/kotlin/org/grida/persistence/user/UserEntityRepository.kt

@@ -13,18 +13,19 @@ class UserEntityRepository(
 
     @Transactional
     override fun save(user: User): Long {
-        val userEntity = userJpaEntityRepository.save(UserEntity.from(user))
+        val userEntity = user.toEntity()
+        userJpaEntityRepository.save(userEntity)
         return userEntity.id
     }
 
     override fun findById(id: Long): User {
         val userEntity = userJpaEntityRepository.findByIdOrException(id)
-        return userEntity.toUser()
+        return userEntity.toDomain()
     }
 
     override fun findByUsername(username: String): User {
         val userEntity = userJpaEntityRepository.findByUsernameOrException(username)
-        return userEntity.toUser()
+        return userEntity.toDomain()
     }
 
     override fun existsByUsername(username: String): Boolean {