fix: dto 소문자로 return하기 enum 함수로 넣어주기

wafflestudio · Feb 8, 2024 · a520f57 · a520f57
1 parent 3eae575
commit a520f57
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/src/main/kotlin/com/wafflestudio/csereal/common/properties/LanguageType.kt b/src/main/kotlin/com/wafflestudio/csereal/common/properties/LanguageType.kt
@@ -17,5 +17,8 @@ enum class LanguageType {
                 throw CserealException.Csereal400("해당하는 enum을 찾을 수 없습니다")
             }
         }
+
+        // dto로 통신할 때 소문자로 return
+        fun makeLowercase(languageType: LanguageType): String = languageType.toString().lowercase()
     }
 }
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/about/database/AboutEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/about/database/AboutEntity.kt
@@ -14,7 +14,7 @@ class AboutEntity(
     @Enumerated(EnumType.STRING)
     var postType: AboutPostType,
     @Enumerated(EnumType.STRING)
-    var language: LanguageType,
+    var language: LanguageType = LanguageType.KO,
     var name: String?,
 
     @Column(columnDefinition = "mediumText")

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/AboutDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/AboutDto.kt
@@ -1,6 +1,7 @@
 package com.wafflestudio.csereal.core.about.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.wafflestudio.csereal.common.properties.LanguageType
 import com.wafflestudio.csereal.core.about.database.AboutEntity
 import com.wafflestudio.csereal.core.resource.attachment.dto.AttachmentResponse
 import java.time.LocalDateTime
@@ -26,7 +27,7 @@ data class AboutDto(
         ): AboutDto = entity.run {
             AboutDto(
                 id = this.id,
-                language = this.language.toString().lowercase(),
+                language = LanguageType.makeLowercase(this.language),
                 name = this.name,
                 description = this.description,
                 year = this.year,

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/DirectionDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/DirectionDto.kt
@@ -1,6 +1,7 @@
 package com.wafflestudio.csereal.core.about.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.wafflestudio.csereal.common.properties.LanguageType
 import com.wafflestudio.csereal.core.about.database.AboutEntity
 
 data class DirectionDto(
@@ -14,7 +15,7 @@ data class DirectionDto(
         fun of(entity: AboutEntity): DirectionDto = entity.run {
             DirectionDto(
                 id = this.id,
-                language = this.language.toString().lowercase(),
+                language = LanguageType.makeLowercase(this.language),
                 name = this.name!!,
                 description = this.description
             )

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/FacilityDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/FacilityDto.kt
@@ -1,6 +1,7 @@
 package com.wafflestudio.csereal.core.about.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.wafflestudio.csereal.common.properties.LanguageType
 import com.wafflestudio.csereal.core.about.database.AboutEntity
 
 data class FacilityDto(
@@ -15,7 +16,7 @@ data class FacilityDto(
         fun of(entity: AboutEntity): FacilityDto = entity.run {
             FacilityDto(
                 id = this.id,
-                language = this.language.toString().lowercase(),
+                language = LanguageType.makeLowercase(this.language),
                 name = this.name!!,
                 description = this.description,
                 locations = this.locations.map { it.name }

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/StudentClubDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/about/dto/StudentClubDto.kt
@@ -1,6 +1,7 @@
 package com.wafflestudio.csereal.core.about.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.wafflestudio.csereal.common.properties.LanguageType
 import com.wafflestudio.csereal.core.about.database.AboutEntity
 
 data class StudentClubDto(
@@ -14,7 +15,7 @@ data class StudentClubDto(
         fun of(entity: AboutEntity): StudentClubDto = entity.run {
             StudentClubDto(
                 id = this.id,
-                language = this.language.toString().lowercase(),
+                language = LanguageType.makeLowercase(this.language),
                 name = this.name!!,
                 description = this.description
             )