@@ -2,7 +2,10 @@ package com.moneymong.moneymong.ocr_result
22
33import com.moneymong.moneymong.common.base.State
44import com.moneymong.moneymong.common.ext.toZonedDateTime
5+ import com.moneymong.moneymong.common.ui.isValidPaymentDate
6+ import com.moneymong.moneymong.common.ui.isValidPaymentTime
57import com.moneymong.moneymong.common.ui.toWonFormat
8+ import com.moneymong.moneymong.common.ui.validateValue
69import com.moneymong.moneymong.domain.entity.ocr.DocumentEntity
710import com.moneymong.moneymong.domain.entity.ocr.DocumentResultEntity
811import java.io.File
@@ -46,16 +49,28 @@ data class OCRResultState(
4649 val formattedDate: String
4750 get() {
4851 val currentDate = SimpleDateFormat (" yyyy년 MM월 dd일" , Locale .KOREA ).format(Date (System .currentTimeMillis()))
49- return receipt?.paymentInfo?.date?.let {
50- " ${it.formatted?.year} 년 ${it.formatted?.month} 월 ${it.formatted?.day} 일"
52+ return receipt?.paymentInfo?.date?.formatted?.let {
53+ (" ${it.year}${it.month}${it.day} " ).run {
54+ if (validateValue(length = 8 , isDigit = true ) && isValidPaymentDate()) {
55+ " ${it.year} 년 ${it.month} 월 ${it.day} 일"
56+ } else {
57+ currentDate
58+ }
59+ }
5160 } ? : currentDate
5261 }
5362
5463 val formattedTime: String
5564 get() {
5665 val currentTime = SimpleDateFormat (" HH:mm:ss" , Locale .KOREA ).format(Date (System .currentTimeMillis()))
57- return receipt?.paymentInfo?.time?.let {
58- " ${it.formatted?.hour} :${it.formatted?.minute} :${it.formatted?.second} "
66+ return receipt?.paymentInfo?.time?.formatted?.let {
67+ (" ${it.hour}${it.minute}${it.second} " ).run {
68+ if (validateValue(length = 6 , isDigit = true ) && isValidPaymentTime()) {
69+ " ${it.hour} :${it.minute} :${it.second} "
70+ } else {
71+ currentTime
72+ }
73+ }
5974 } ? : currentTime
6075 }
6176
0 commit comments