isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

buildEntriesFromInterval: selectively copy over

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-29 08:50:46 -06:00
parent af93c0e488
commit 354a4d08be
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.kt
View File

@@ -19,6 +19,7 @@
package org.isoron.uhabits.core.models package org.isoron.uhabits.core.models
import org.isoron.uhabits.core.models.Entry.Companion.SKIP
import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
@@ -258,7 +259,7 @@ open class EntryList {
/** /**
* Converts a list of intervals into a list of entries. Entries that fall outside of any * Converts a list of intervals into a list of entries. Entries that fall outside of any
* interval receive value UNKNOWN. Entries that fall within an interval but do not appear * interval receive value UNKNOWN. Entries that fall within an interval but do not appear
* in [original] receive value YES_AUTO. Entries provided in [original] are just copied over. * in [original] receive value YES_AUTO. Entries provided in [original] are copied over.
* *
* The intervals should be sorted by timestamp. The first element in the list should * The intervals should be sorted by timestamp. The first element in the list should
* correspond to the newest interval. * correspond to the newest interval.
@@ -303,8 +304,10 @@ open class EntryList {
// Copy original entries // Copy original entries
original.forEach { entry -> original.forEach { entry ->
val offset = entry.timestamp.daysUntil(to) val offset = entry.timestamp.daysUntil(to)
if (result[offset].value == UNKNOWN || entry.value == SKIP || entry.value == YES_MANUAL) {
result[offset] = entry result[offset] = entry
} }
}
return result return result
} }

5
android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/EntryListTest.kt
View File

@@ -248,8 +248,10 @@ class EntryListTest {
val entries = listOf( val entries = listOf(
Entry(day(1), YES_MANUAL), Entry(day(1), YES_MANUAL),
Entry(day(2), NO), Entry(day(2), NO),
Entry(day(4), NO),
Entry(day(5), YES_MANUAL), Entry(day(5), YES_MANUAL),
Entry(day(10), YES_MANUAL), Entry(day(10), YES_MANUAL),
Entry(day(11), NO),
) )
val intervals = listOf( val intervals = listOf(
EntryList.Interval(day(2), day(2), day(1)), EntryList.Interval(day(2), day(2), day(1)),
@@ -258,7 +260,7 @@ class EntryListTest {
) )
val expected = listOf( val expected = listOf(
Entry(day(1), YES_MANUAL), Entry(day(1), YES_MANUAL),
Entry(day(2), NO), Entry(day(2), YES_AUTO),
Entry(day(3), UNKNOWN), Entry(day(3), UNKNOWN),
Entry(day(4), YES_AUTO), Entry(day(4), YES_AUTO),
Entry(day(5), YES_MANUAL), Entry(day(5), YES_MANUAL),
@@ -267,6 +269,7 @@ class EntryListTest {
Entry(day(8), YES_AUTO), Entry(day(8), YES_AUTO),
Entry(day(9), YES_AUTO), Entry(day(9), YES_AUTO),
Entry(day(10), YES_MANUAL), Entry(day(10), YES_MANUAL),
Entry(day(11), NO),
) )
val actual = EntryList.buildEntriesFromInterval(entries, intervals) val actual = EntryList.buildEntriesFromInterval(entries, intervals)
assertThat(actual, equalTo(expected)) assertThat(actual, equalTo(expected))