Skip to content

Commit 7ca6354

Browse files
committed
change how tags merged in retroactive mode
1 parent 0682e2d commit 7ca6354

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/AddRunningRecordMediator.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,10 @@ class AddRunningRecordMediator @Inject constructor(
247247
prevRecords: List<Record>,
248248
) {
249249
val prevRecord = getPrevRecordToMergeWith(params.typeId, prevRecords)
250-
val record = if (prevRecord != null) {
250+
val sameTags = prevRecord?.tags.orEmpty().sortedBy { it.tagId } == params.tags.sortedBy { it.tagId }
251+
val shouldMerge = sameTags || params.tags.isEmpty()
252+
253+
val record = if (prevRecord != null && shouldMerge) {
251254
Record(
252255
id = prevRecord.id, // Updates existing record.
253256
typeId = params.typeId,

0 commit comments

Comments
 (0)