Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

fix: removed csvFormat() and kept UTC format #3426

Merged
merged 6 commits into from
Aug 28, 2024
Merged

fix: removed csvFormat() and kept UTC format #3426

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a733ab
fix: removed csvFormat() and kept UTC format
akashs056 Aug 24, 2024
6bcaac7
Merge branch 'main' into fix-issue-3422
akashs056 Aug 25, 2024
f058c3b
Fix date-time formatting for CSV export
akashs056 Aug 25, 2024
06c3e3a
fix: Export timestamps in user's local time instead of UTC
akashs056 Aug 27, 2024
fb05c8a
Merge branch 'main' into fix-issue-3422
akashs056 Aug 27, 2024
6dd6246
Merge branch 'main' into fix-issue-3422
akashs056 Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions shared/domain/src/main/java/com/ivy/domain/usecase/csv/ExportCsvUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.net.Uri
import arrow.core.Either
import com.ivy.base.model.TransactionType
import com.ivy.base.threading.DispatchersProvider
import com.ivy.base.time.convertToLocal
import com.ivy.data.file.FileSystem
import com.ivy.data.model.Account
import com.ivy.data.model.AccountId
Expand All @@ -24,6 +23,7 @@ import org.apache.commons.text.StringEscapeUtils
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import java.time.Instant
import java.time.ZoneId
import java.time.format.DateTimeFormatter
import java.util.Locale
import javax.inject.Inject
Expand Down Expand Up @@ -187,8 +187,9 @@ class ExportCsvUseCase @Inject constructor(
id = id
)

private fun Instant.csvFormat(): String = convertToLocal()
.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
private fun Instant.csvFormat(): String {
return this.atZone(ZoneId.of("UTC")).toLocalDateTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
ILIYANGERMANOV marked this conversation as resolved.
Show resolved Hide resolved
}

private fun Double.csvFormat(): String = DecimalFormat(NUMBER_FORMAT).apply {
decimalFormatSymbols = DecimalFormatSymbols.getInstance(Locale.ENGLISH)
Expand Down