From 7690fc93505d64af7cd7844f896effbb69ae85ae Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Apr 2019 11:51:05 +0200 Subject: [PATCH 1/3] add tournament final position filter --- .../SessionFilterInstrumentedUnitTest.kt | 40 +++++++++++++++++++ .../android/model/filter/QueryCondition.kt | 11 ++++- .../android/model/realm/Session.kt | 3 +- .../rowrepresentable/FilterCategoryRow.kt | 5 ++- .../view/rowrepresentable/FilterSectionRow.kt | 16 ++++---- 5 files changed, 61 insertions(+), 14 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt index 5d2cab7b..0ffff7a1 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt @@ -573,4 +573,44 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(result.contains((it as Session).id)) } } + + @Test + fun testTournamentFinalPosition() { + val realm = this.mockRealm + realm.beginTransaction() + val s1 = Session.testInstance(netResult = 200.0, isTournament = true) + s1.result!!.tournamentFinalPosition = 5 + + val s2 = Session.testInstance(netResult = 50.0, isTournament = true) + s2.result!!.tournamentFinalPosition = 15 + + val s3 = Session.testInstance(netResult = 500.0, isTournament = true) + s3.result!!.tournamentFinalPosition = 2 + + val s4 = Session.testInstance(netResult = 570.0, isTournament = true) + s4.result!!.tournamentFinalPosition = 1 + realm.commitTransaction() + + val filterLess = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.LESS, finalPosition = 1) + var sessions = Filter.queryOn(realm, arrayListOf(filterLess)) + + Assert.assertEquals(1, sessions.size) + + var result = arrayListOf(s4.id) + sessions.forEach { + Assert.assertTrue(result.contains((it as Session).id)) + } + + + val filterMore = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.MORE, finalPosition = 10) + sessions = Filter.queryOn(realm, arrayListOf(filterMore)) + + Assert.assertEquals(1, sessions.size) + + result = arrayListOf(s2.id) + sessions.forEach { + Assert.assertTrue(result.contains((it as Session).id)) + } + + } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index b5166458..affa9310 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -333,7 +333,14 @@ sealed class QueryCondition : FilterElementRow { class NumberOfRebuy(): ListOfDouble() { constructor(operator: Operator, numberOfRebuy: Double) : this() { this.operator = operator - listOfValues = arrayListOf(numberOfRebuy) + this.listOfValues = arrayListOf(numberOfRebuy) + } + } + + open class TournamentFinalPosition(): ListOfInt() { + constructor(operator: Operator, finalPosition: Int) : this() { + this.operator = operator + this.listOfValues = arrayListOf(finalPosition) } } @@ -341,7 +348,7 @@ sealed class QueryCondition : FilterElementRow { class NetAmountWon: NetAmount() class NetAmountLost: NetAmount() { override var sign: Int = -1 } - class NumberOfPlayer: ListOfInt() + class TournamentNumberOfPlayer: ListOfInt() class StartedFromDate: DateQuery() { override var operator = Operator.MORE } class StartedToDate: DateQuery() { override var operator = Operator.LESS } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index f08e56cb..7aa0c342 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -79,7 +79,8 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat NumberOfTable::class.java -> "numberOfTable" NetAmount::class.java -> "computableResults.ratedNet" NumberOfRebuy::class.java -> "result.numberOfRebuy" - NumberOfPlayer::class.java -> "result.tournamentNumberOfPlayers" + TournamentNumberOfPlayer::class.java -> "result.tournamentNumberOfPlayers" + TournamentFinalPosition::class.java -> "result.tournamentFinalPosition" TournamentFee::class.java -> "tournamentEntryFee" StartedFromDate::class.java, StartedToDate::class.java -> "startDate" EndedFromDate::class.java, EndedToDate::class.java -> "endDate" diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt index f0202ccc..4c65f088 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt @@ -61,8 +61,9 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In TOURNAMENT_TYPE, TOURNAMENT_NAME, TOURNAMENT_FEATURE, - ENTRY_FEE, - NUMBER_OF_PLAYERS + TOURNAMENT_ENTRY_FEE, + TOURNAMENT_NUMBER_OF_PLAYER, + TOURNAMENT_FINAL_POSITION ) ONLINE -> arrayListOf( MULTI_TABLING diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt index a2235c00..fcd39dd6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt @@ -3,7 +3,6 @@ package net.pokeranalytics.android.ui.view.rowrepresentable import net.pokeranalytics.android.R import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.model.filter.QueryCondition -import net.pokeranalytics.android.model.filter.QueryCondition.NumberOfTable.* import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType @@ -29,10 +28,10 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable { TOURNAMENT_NAME(R.string.tournament_name), TOURNAMENT_FEATURE(R.string.tournament_feature), COMPLETION_PERCENTAGE(R.string.tournament_completion_percentage_interval), - PLACE(R.string.final_position), - PLAYERS_COUNT(R.string.players_count), + TOURNAMENT_FINAL_POSITION(R.string.final_position), + TOURNAMENT_NUMBER_OF_PLAYER(R.string.players_count), TOURNAMENT_RE_BUY_COUNT(R.string.rebuy_count), - ENTRY_FEE(R.string.buyin), + TOURNAMENT_ENTRY_FEE(R.string.buyin), MULTI_TABLING(R.string.number_of_tables), VALUE(R.string.value), LOCATION(R.string.locations), @@ -94,16 +93,15 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable { // Tournament TOURNAMENT_TYPE -> Criteria.TournamentTypes.queryConditions // COMPLETION_PERCENTAGE -> arrayListOf() - //PLACE -> QueryCondition.moreOrLess() - PLAYERS_COUNT -> QueryCondition.moreOrLess() - ENTRY_FEE -> Criteria.TournamentFees.queryConditions - + TOURNAMENT_FINAL_POSITION -> QueryCondition.moreOrLess() + TOURNAMENT_NUMBER_OF_PLAYER -> QueryCondition.moreOrLess() + TOURNAMENT_ENTRY_FEE -> Criteria.TournamentFees.queryConditions TOURNAMENT_NAME -> Criteria.TournamentNames.queryConditions TOURNAMENT_FEATURE -> Criteria.TournamentFeatures.queryConditions LOCATION -> Criteria.Locations.queryConditions BANKROLL -> Criteria.Bankrolls.queryConditions MULTI_TABLING -> QueryCondition.moreOrLess() - NUMBER_OF_PLAYERS -> QueryCondition.moreOrLess() + //NUMBER_OF_PLAYERS -> QueryCondition.moreOrLess() NUMBER_OF_REBUY -> QueryCondition.moreOrLess() // MULTI_PLAYER -> arrayListOf() From d86426bb18151a0e2a961af3b85b782d322edcd6 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Apr 2019 12:05:12 +0200 Subject: [PATCH 2/3] remove unused filter category --- .../ui/view/rowrepresentable/FilterCategoryRow.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt index 4c65f088..066d7410 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt @@ -14,10 +14,10 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In TOURNAMENT(R.string.tournament), ONLINE(R.string.online), RESULT(R.string.result), - TRANSACTION_TYPES(R.string.operation_types), + //TRANSACTION_TYPES(R.string.operation_types), LOCATIONS(R.string.locations), BANKROLLS(R.string.bankrolls), - PLAYERS(R.string.players), + //PLAYERS(R.string.players), ; val filterElements: List @@ -71,15 +71,13 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In LOCATIONS -> arrayListOf( LOCATION ) - PLAYERS -> arrayListOf( - MULTI_PLAYER - ) + //PLAYERS -> arrayListOf(MULTI_PLAYER) RESULT -> arrayListOf( VALUE, NUMBER_OF_REBUY ) - TRANSACTION_TYPES -> arrayListOf() + //TRANSACTION_TYPES -> arrayListOf() } } } From d42ca4f84b590eea46e009598621cf4c9b23baa3 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Apr 2019 13:18:49 +0200 Subject: [PATCH 3/3] rename updateValueMap --- .../filter/BlindFilterInstrumentedTest.kt | 8 +++--- .../filter/DateFilterInstrumentedUnitTest.kt | 14 +++++----- .../SessionFilterInstrumentedUnitTest.kt | 28 +++++++++---------- .../android/model/filter/QueryCondition.kt | 23 ++++++++------- .../android/model/realm/Filter.kt | 2 +- .../android/model/realm/FilterCondition.kt | 2 +- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt index 94ff6f5f..93cbaac2 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt @@ -49,7 +49,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind.filterSectionRow = FilterSectionRow.BLIND val filterElement = FilterCondition(filterElementRows = arrayListOf(blind)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -100,7 +100,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind2.filterSectionRow = FilterSectionRow.BLIND val filterElements = FilterCondition(filterElementRows = arrayListOf(blind1, blind2)) - filter.updateValueMap(filterElements) + filter.updateValueBy(filterElements) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -148,7 +148,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind.filterSectionRow = FilterSectionRow.BLIND val filterElement = FilterCondition(filterElementRows = arrayListOf(blind)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) println("<<<< ${filter.listOfValues}") val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -200,7 +200,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind2.filterSectionRow = FilterSectionRow.BLIND val filterElement = FilterCondition(filterElementRows = arrayListOf(blind1, blind2)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt index 6f273150..79ab6ab6 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt @@ -35,7 +35,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow = QueryCondition.AnyDayOfWeek().apply { listOfValues = arrayListOf(cal.get(Calendar.DAY_OF_WEEK)) } filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE val filterElement = FilterCondition(arrayListOf(filterElementRow)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -64,7 +64,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE val filterElement = FilterCondition(arrayListOf(filterElementRow)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -92,7 +92,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow = QueryCondition.AnyYear().apply { listOfValues = arrayListOf(cal.get(Calendar.YEAR)) } filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE val filterElement = FilterCondition(arrayListOf(filterElementRow)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -385,7 +385,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.StartedFromDate() val filterElementRow = QueryCondition.StartedFromDate().apply { singleValue = s2.startDate!!} filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -413,7 +413,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.StartedToDate() val filterElementRow = QueryCondition.StartedToDate().apply { singleValue = s1.startDate!! } filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -442,7 +442,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.EndedFromDate() val filterElementRow = QueryCondition.EndedFromDate().apply { singleValue = s2.endDate() } filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -471,7 +471,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.EndedToDate() val filterElementRow = QueryCondition.EndedToDate().apply { singleValue = s1.endDate() } filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt index 0ffff7a1..96a74496 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt @@ -110,7 +110,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.AnyBankroll() val filterElementRow = QueryCondition.AnyBankroll().apply { setObject(b1) } filterElementRow.filterSectionRow = FilterSectionRow.BANKROLL - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -144,7 +144,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow2 = QueryCondition.AnyBankroll().apply { setObject(b2) } filterElementRow2.filterSectionRow = FilterSectionRow.BANKROLL - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -225,7 +225,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.AnyLocation() val filterElementRow = QueryCondition.AnyLocation().apply { setObject(l1) } filterElementRow.filterSectionRow = FilterSectionRow.LOCATION - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -260,7 +260,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow2 = QueryCondition.AnyLocation().apply { setObject(l3) } filterElementRow2.filterSectionRow = FilterSectionRow.LOCATION - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -287,7 +287,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow = QueryCondition.AnyTournamentName().apply { setObject(t1) } filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -320,7 +320,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME val filterElementRow2 = QueryCondition.AnyTournamentName().apply { setObject(t2) } filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -358,7 +358,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow2.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE val filterElementRow3 = QueryCondition.AllTournamentFeature().apply { setObject(t4) } filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -395,7 +395,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE val filterElementRow4 = QueryCondition.AnyTournamentFeature().apply { setObject(t4) } filterElementRow4.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -423,7 +423,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.AnyTournamentFeature() val filterElementRow = QueryCondition.AnyTournamentFeature().apply { setObject(t2) } filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -450,7 +450,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE val filterElementRow2 = QueryCondition.AnyTableSize().apply { listOfValues = arrayListOf(4) } filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -475,7 +475,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.NetAmountWon() val filterElementRow = QueryCondition.more().apply { listOfValues = arrayListOf(204.0) } filterElementRow.filterSectionRow = FilterSectionRow.VALUE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filterElementRow)) @@ -500,7 +500,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.NetAmountWon() val filterElementRow = QueryCondition.less().apply { listOfValues = arrayListOf(540.0) } filterElementRow.filterSectionRow = FilterSectionRow.VALUE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -525,12 +525,12 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterMore = QueryCondition.NetAmountWon() val filterElementRow = QueryCondition.more().apply { listOfValues = arrayListOf(200.0) } filterElementRow.filterSectionRow = FilterSectionRow.VALUE - filterMore.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filterMore.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val filterLess = QueryCondition.NetAmountWon() val filterElementRow2 = QueryCondition.less().apply { listOfValues = arrayListOf(400.0) } filterElementRow2.filterSectionRow = FilterSectionRow.VALUE - filterLess.updateValueMap(FilterCondition(arrayListOf(filterElementRow2))) + filterLess.updateValueBy(FilterCondition(arrayListOf(filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filterMore, filterLess)) diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index affa9310..ce2bde8b 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -143,8 +143,8 @@ sealed class QueryCondition : FilterElementRow { open var sign: Int = 1 override var listOfValues = arrayListOf(0.0) - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) listOfValues = filterCondition.getValues() } override fun labelForValue(value: Double): String { @@ -154,9 +154,8 @@ sealed class QueryCondition : FilterElementRow { abstract class ListOfInt: ListOfValues() { override var listOfValues = arrayListOf(0) - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) - println("<<<< updateValueMap ${filterCondition.intValues}") + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) listOfValues = filterCondition.getValues() } override fun labelForValue(value: Int): String { @@ -167,8 +166,8 @@ sealed class QueryCondition : FilterElementRow { abstract class ListOfString: ListOfValues() { override var listOfValues = ArrayList() override fun labelForValue(value: String): String { return value } - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) listOfValues = filterCondition.getValues() } } @@ -182,8 +181,8 @@ sealed class QueryCondition : FilterElementRow { get() { return listOfValues.firstOrNull() ?: Date() } set(value) { listOfValues.add(value) } - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) singleValue = filterCondition.getValue() } } @@ -196,8 +195,8 @@ sealed class QueryCondition : FilterElementRow { get() { return listOfValues.firstOrNull() ?: 0 } set(value) { listOfValues.add(value) } - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) singleValue = filterCondition.getValue() } } @@ -543,7 +542,7 @@ sealed class QueryCondition : FilterElementRow { } } - open fun updateValueMap(filterCondition: FilterCondition) { + open fun updateValueBy(filterCondition: FilterCondition) { filterCondition.operator?.let { this.operator = Operator.values()[it] } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt index d9c2c159..5c3e3bcc 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt @@ -113,7 +113,7 @@ open class Filter : RealmObject() { it.queryCondition.id == filterElementRow.id } if (filtered.isNotEmpty()) { - return filterElementRow.updateValueMap(filtered.first()) + return filterElementRow.updateValueBy(filtered.first()) } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt index 4340ed63..d0ca264d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt @@ -33,7 +33,7 @@ open class FilterCondition() : RealmObject() { val queryCondition : QueryCondition get() = QueryCondition.valueOf(this.filterName ?: throw PokerAnalyticsException.FilterElementUnknownName) .apply { - this.updateValueMap(this@FilterCondition) + this.updateValueBy(this@FilterCondition) } var doubleValues: RealmList? = null