⚙️ :: formmat 형식 변경

Team-return · May 7, 2024 · 8dee7a8 · 8dee7a8
1 parent d3c2e5e
commit 8dee7a8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/src/main/kotlin/scul/projectscul/domain/bookmark/service/GetMyBookMarkService.kt b/src/main/kotlin/scul/projectscul/domain/bookmark/service/GetMyBookMarkService.kt
@@ -22,7 +22,7 @@ class GetMyBookMarkService (
 
         val cultureList = bookMarkList.mapNotNull { it.culture }
 
-        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")
 
         return GetCultureListResponse(
                 cultureList.map { cultureItem ->

diff --git a/src/main/kotlin/scul/projectscul/domain/culture/domain/repository/CultureRepository.kt b/src/main/kotlin/scul/projectscul/domain/culture/domain/repository/CultureRepository.kt
@@ -7,7 +7,7 @@ import java.util.*
 
 interface CultureRepository: JpaRepository<Culture, UUID> {
 
-    fun findCultureById(cultureId: UUID) : Culture
+    fun findCultureById(cultureId: UUID) : Culture?
 
     fun findByWantedPeopleContaining(tag: String) : List<Culture>
 

diff --git a/src/main/kotlin/scul/projectscul/domain/culture/service/GetCultureListService.kt b/src/main/kotlin/scul/projectscul/domain/culture/service/GetCultureListService.kt
@@ -24,7 +24,7 @@ class GetCultureListService (
         val culture: List<Culture> = cultureRepository.findAll()
         val currentUser: User = userFacade.getCurrentUser()
 
-        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")
 
 
         return GetCultureListResponse(

diff --git a/src/main/kotlin/scul/projectscul/domain/culture/service/GetCultureService.kt b/src/main/kotlin/scul/projectscul/domain/culture/service/GetCultureService.kt
@@ -6,6 +6,7 @@ import scul.projectscul.domain.bookmark.domain.repository.BookMarkRepository
 import scul.projectscul.domain.culture.domain.Culture
 import scul.projectscul.domain.culture.domain.repository.CultureRepository
 import scul.projectscul.domain.culture.presentation.dto.response.GetCultureResponse
+import scul.projectscul.domain.review.excpetion.CultureNotFoundException
 import scul.projectscul.domain.user.domain.User
 import scul.projectscul.domain.user.facade.UserFacade
 import java.time.LocalDateTime
@@ -22,9 +23,9 @@ class GetCultureService (
     fun execute(cultureId: UUID): GetCultureResponse {
 
         val currentUser: User = userFacade.getCurrentUser()
-        val culture: Culture = cultureRepository.findCultureById(cultureId)
+        val culture: Culture = cultureRepository.findCultureById(cultureId) ?: throw CultureNotFoundException
         val isBookMarked = bookMarkRepository.existsByCultureAndUser(culture ,currentUser)
-        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")
         val now = LocalDateTime.now()
 
         val applicationStartDate: LocalDateTime = LocalDateTime.parse(culture.applicationStartDate, formatter)

diff --git a/src/main/kotlin/scul/projectscul/domain/culture/service/GetTagCultureService.kt b/src/main/kotlin/scul/projectscul/domain/culture/service/GetTagCultureService.kt
@@ -10,7 +10,6 @@ import scul.projectscul.domain.user.domain.User
 import scul.projectscul.domain.user.facade.UserFacade
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-
 @Service
 @Transactional(readOnly = true)
 class GetTagCultureService (
@@ -22,8 +21,7 @@ class GetTagCultureService (
     fun execute(tag: String): GetCultureListResponse {
         val culture: List<Culture> = cultureRepository.findByWantedPeopleContaining(tag)
         val currentUser: User = userFacade.getCurrentUser()
-        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
-
+        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")
 
         return GetCultureListResponse(
                 culture.map { cultureItem ->

diff --git a/src/main/kotlin/scul/projectscul/domain/culture/service/SearchCultureService.kt b/src/main/kotlin/scul/projectscul/domain/culture/service/SearchCultureService.kt
@@ -22,7 +22,7 @@ class SearchCultureService (
         val culture: List<Culture> = cultureRepository.findByCultureNameContainingOrContentContaining(keyword = keyword, keyword2 = keyword)
         val currentUser: User = userFacade.getCurrentUser()
 
-        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+        val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")
 
         return GetCultureListResponse(
                 culture.map { cultureItem ->

diff --git a/src/main/kotlin/scul/projectscul/domain/review/excpetion/CultureNotFoundException.kt b/src/main/kotlin/scul/projectscul/domain/review/excpetion/CultureNotFoundException.kt
@@ -0,0 +1,8 @@
+package scul.projectscul.domain.user.exception
+
+import scul.projectscul.global.security.error.exception.ErrorCode
+import scul.projectscul.global.security.error.exception.SculException
+
+object PasswordMisMatchException : SculException(
+        ErrorCode.PASSWORD_MISMATCH
+)