Merge pull request #143 from TimerTiTi/141-fix-timemapper

close #141 fix time mapper
TimerTiTi · Jun 19, 2024 · e8a0588 · e8a0588
2 parents f6638ac + 61b62c3
commit e8a0588
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/feature/edit/src/main/kotlin/com/titi/app/feature/edit/mapper/TimeMapper.kt b/feature/edit/src/main/kotlin/com/titi/app/feature/edit/mapper/TimeMapper.kt
@@ -5,13 +5,22 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 
 fun AMPMHours.toLocalDateTime(currentDate: LocalDate): LocalDateTime {
-    val hours = if (dayTime == AMPMHours.DayTime.AM) hours else hours + 12
-    return currentDate.atTime(hours, minutes)
+    val adjustedHours = when {
+        dayTime == AMPMHours.DayTime.AM && hours == 12 -> 0
+        dayTime == AMPMHours.DayTime.PM && hours == 12 -> 12
+        dayTime == AMPMHours.DayTime.PM -> hours + 12
+        else -> hours
+    }
+    return currentDate.atTime(adjustedHours, minutes)
 }
 
 fun LocalDateTime.toAMPMHours(): AMPMHours {
     return AMPMHours(
-        hours = if (hour < 12) hour else hour - 12,
+        hours = when {
+            hour == 0 -> 12
+            hour > 12 -> hour - 12
+            else -> hour
+        },
         minutes = minute,
         dayTime = if (hour < 12) AMPMHours.DayTime.AM else AMPMHours.DayTime.PM,
     )