[AN] feat(#554): localDateTime 시간대 변경하기

UTC -> Korea

Author: saesang

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/CommentListRVAdapter.kt

@@ -10,6 +10,7 @@ import com.bumptech.glide.Glide
 import com.takseha.data.dto.mystudy.StudyComment
 import com.takseha.presentation.R
 import com.takseha.presentation.databinding.ItemCommentBinding
+import com.takseha.presentation.ui.common.UTCToKoreanTimeConverter
 import java.time.LocalDateTime
 
 class CommentListRVAdapter(val context: Context, val commentList: List<StudyComment>) :
@@ -35,8 +36,8 @@ class CommentListRVAdapter(val context: Context, val commentList: List<StudyComm
             .into(holder.profileImg)
 
         holder.content.text = commentList[position].content
-        holder.date.text =
-            LocalDateTime.parse(commentList[position].commentSetDate).toLocalDate().toString()
+        val localDateTime = LocalDateTime.parse(commentList[position].commentSetDate)
+        holder.date.text = UTCToKoreanTimeConverter().convertToKoreaDate(localDateTime)
     }
 
     override fun getItemCount(): Int {

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/CommitListRVAdapter.kt

@@ -11,6 +11,8 @@ import com.takseha.data.dto.mystudy.Commit
 import com.takseha.data.dto.mystudy.CommitStatus
 import com.takseha.presentation.R
 import com.takseha.presentation.databinding.ItemCommitBinding
+import com.takseha.presentation.ui.common.UTCToKoreanTimeConverter
+import java.time.LocalDateTime
 
 class CommitListRVAdapter(val context : Context, val commitList : List<Commit>, val onClickListener: ToDoListRVAdapter.OnClickListener) : RecyclerView.Adapter<CommitListRVAdapter.ViewHolder>() {
 
@@ -39,7 +41,8 @@ class CommitListRVAdapter(val context : Context, val commitList : List<Commit>,
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.commitTitle.text = commitList[position].message
-        holder.commitInfo.text = context.getString(R.string.study_to_do_commit_info, commitList[position].name, commitList[position].commitDate)
+        val localDateTime = LocalDateTime.parse(commitList[position].commitDate)
+        holder.commitInfo.text = context.getString(R.string.study_to_do_commit_info, commitList[position].name, UTCToKoreanTimeConverter().convertToKoreaDate(localDateTime))
         when (commitList[position].status) {
             CommitStatus.COMMIT_APPROVAL -> holder.commitStatus.text = "승인완료"
             CommitStatus.COMMIT_DELETE -> {

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/DetailCommentListRVAdapter.kt

@@ -15,6 +15,7 @@ import com.bumptech.glide.Glide
 import com.takseha.data.dto.mystudy.StudyComment
 import com.takseha.presentation.R
 import com.takseha.presentation.databinding.ItemCommentDetailBinding
+import com.takseha.presentation.ui.common.UTCToKoreanTimeConverter
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Locale
@@ -53,8 +54,8 @@ class DetailCommentListRVAdapter(val context: Context, val commentList: List<Stu
             .into(holder.profileImg)
 
         holder.writerName.text = commentList[position].userInfo.name
-        holder.date.text =
-            getCreatedDate(commentList[position].commentSetDate)
+        val localDateTime = LocalDateTime.parse(commentList[position].commentSetDate)
+        holder.date.text = UTCToKoreanTimeConverter().convertToKoreaDate(localDateTime)
         holder.content.text = commentList[position].content
 
         if (commentList[position].isMyComment) {
@@ -76,14 +77,6 @@ class DetailCommentListRVAdapter(val context: Context, val commentList: List<Stu
 
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun getCreatedDate(date: String): String {
-        val dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm", Locale.getDefault())
-        val localDateTime = LocalDateTime.parse(date)
-
-        return localDateTime.format(dateFormat)
-    }
-
     private fun showPopupMenu(view: View, position: Int) {
         val popup = PopupMenu(context, view)
         popup.inflate(R.menu.delete_menu)

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/FeedRVAdapter.kt

@@ -14,8 +14,10 @@ import com.takseha.data.dto.feed.StudyPeriodStatus
 import com.takseha.data.dto.feed.UserInfo
 import com.takseha.presentation.R
 import com.takseha.presentation.databinding.ItemFeedBinding
+import com.takseha.presentation.ui.common.UTCToKoreanTimeConverter
 import com.takseha.presentation.viewmodel.feed.StudyInfoWithBookmarkStatus
 import java.time.LocalDateTime
+import java.time.ZoneId
 import java.time.temporal.ChronoUnit
 
 class FeedRVAdapter(
@@ -138,10 +140,11 @@ class FeedRVAdapter(
     @RequiresApi(Build.VERSION_CODES.O)
     private fun calculateTotalDayCnt(createdDate: String): Long {
         val createdDateLocalDate = LocalDateTime.parse(createdDate)
-
+        val utcZonedDateTime = createdDateLocalDate.atZone(ZoneId.of("UTC"))
+        val koreaZonedDateTime = utcZonedDateTime.withZoneSameInstant(ZoneId.of("Asia/Seoul"))
         val nowDate = LocalDateTime.now()
 
-        return ChronoUnit.DAYS.between(createdDateLocalDate, nowDate)
+        return ChronoUnit.DAYS.between(koreaZonedDateTime, nowDate)
     }
 
     private fun setCategoryList(holder: ViewHolder, position: Int) {

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/NoticeListRVAdapter.kt

@@ -9,6 +9,7 @@ import androidx.annotation.RequiresApi
 import androidx.recyclerview.widget.RecyclerView
 import com.takseha.data.dto.home.Notice
 import com.takseha.presentation.databinding.ItemAlertBinding
+import com.takseha.presentation.ui.common.UTCToKoreanTimeConverter
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Locale
@@ -35,8 +36,8 @@ class NoticeListRVAdapter(val context: Context, val noticeList: List<Notice>) :
 
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.date.text =
-            getCreatedDate(noticeList[position].localDateTime)
+        val localDateTime = LocalDateTime.parse(noticeList[position].localDateTime)
+        holder.date.text = UTCToKoreanTimeConverter().convertToKoreaDate(localDateTime)
         holder.title.text = noticeList[position].title
         holder.content.text = noticeList[position].message
 
@@ -48,14 +49,6 @@ class NoticeListRVAdapter(val context: Context, val noticeList: List<Notice>) :
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun getCreatedDate(date: String): String {
-        val dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm", Locale.getDefault())
-        val localDateTime = LocalDateTime.parse(date)
-
-        return localDateTime.format(dateFormat)
-    }
-
     override fun getItemCount(): Int {
         return noticeList.size
     }

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/StudyApplyMemberListRVAdapter.kt

@@ -11,6 +11,7 @@ import com.bumptech.glide.Glide
 import com.takseha.data.dto.mystudy.StudyApplyMember
 import com.takseha.presentation.R
 import com.takseha.presentation.databinding.ItemApplyMemberBinding
+import com.takseha.presentation.ui.common.UTCToKoreanTimeConverter
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Locale
@@ -42,8 +43,8 @@ class StudyApplyMemberListRVAdapter(val context: Context, val studyApplyMemberLi
             .error(R.drawable.logo_profile_default)
             .into(holder.memberProfileImg)
 
-        holder.date.text =
-            getCreatedDate(studyApplyMemberList[position].createdDateTime)
+        val localDateTime = LocalDateTime.parse(studyApplyMemberList[position].createdDateTime)
+        holder.date.text = UTCToKoreanTimeConverter().convertToKoreaDate(localDateTime)
         holder.memberName.text = studyApplyMemberList[position].name
 
         // 클릭 이벤트 처리
@@ -54,14 +55,6 @@ class StudyApplyMemberListRVAdapter(val context: Context, val studyApplyMemberLi
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun getCreatedDate(date: String): String {
-        val dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm", Locale.getDefault())
-        val localDateTime = LocalDateTime.parse(date)
-
-        return localDateTime.format(dateFormat)
-    }
-
     override fun getItemCount(): Int {
         return studyApplyMemberList.size
     }

android/gitudy/presentation/src/main/java/com/takseha/presentation/adapter/ToDoListRVAdapter.kt

@@ -51,7 +51,6 @@ class ToDoListRVAdapter(val context: Context, val todoList: List<Todo>) :
         holder.todoTitle.text = todoList[position].title
         holder.todoDate.text = todoList[position].todoDate
         holder.todoDetail.text = todoList[position].detail
-//        setCommitList(holder.commitList, todoList[position].commitList)
         setCommitList(holder, position)
 
         if (todoList[position].todoDate == LocalDate.now().toString()) {
@@ -73,13 +72,6 @@ class ToDoListRVAdapter(val context: Context, val todoList: List<Todo>) :
         }
     }
 
-//    private fun setCommitList(commitListView: RecyclerView, commitList: List<Commit>) {
-//        val commitListRVAdapter = CommitListRVAdapter(context, commitList, this.onClickListener!!)
-//
-//        commitListView.adapter = commitListRVAdapter
-//        commitListView.layoutManager = LinearLayoutManager(context)
-//    }
-
     private fun setCommitList(holder: ViewHolder, position: Int) {
         holder.commitList.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)

android/gitudy/presentation/src/main/java/com/takseha/presentation/ui/common/UTCToKoreanTimeConverter.kt

@@ -0,0 +1,23 @@
+package com.takseha.presentation.ui.common
+
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+
+class UTCToKoreanTimeConverter {
+    fun convertToKoreaTime(localDateTimeUTC: LocalDateTime): String {
+        val utcZonedDateTime = localDateTimeUTC.atZone(ZoneId.of("UTC"))
+        val koreaZonedDateTime = utcZonedDateTime.withZoneSameInstant(ZoneId.of("Asia/Seoul"))
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+
+        return koreaZonedDateTime.format(formatter)
+    }
+
+    fun convertToKoreaDate(localDateTimeUTC: LocalDateTime): String {
+        val utcZonedDateTime = localDateTimeUTC.atZone(ZoneId.of("UTC"))
+        val koreaZonedDateTime = utcZonedDateTime.withZoneSameInstant(ZoneId.of("Asia/Seoul"))
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+
+        return koreaZonedDateTime.format(formatter)
+    }
+}