staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

Browse Source 
# Conflicts:
#	app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
feature/top10
Aurelien Hubert 7 years ago
parent 536ce246b1 43d32bcecc
commit ed424e9dcd
17 changed files with 177 additions and 309 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      app/build.gradle
  2. 3
      app/src/androidTest/java/net/pokeranalytics/android/components/RealmInstrumentedUnitTest.kt
  3. 3
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt
  4. 31
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt
  5. 63
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt
  6. 7
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/ExceptionFilterInstrumentedTest.kt
  7. 4
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt
  8. 114
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt
  9. 19
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  10. 24
      app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt
  11. 84
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt
  12. 13
      app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt
  13. 60
      app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
  14. 10
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  15. 18
      app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
  16. 2
      app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt
  17. 22
      app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt

9
app/build.gradle
Unescape View File

@ -62,7 +62,12 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// Kotlin
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
// Android
implementation 'androidx.appcompat:appcompat:1.0.2'
@ -87,10 +92,6 @@ dependencies {
// Crashlytics
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
// Kotlin
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
// Logs
implementation 'com.jakewharton.timber:timber:4.7.1'

3
app/src/androidTest/java/net/pokeranalytics/android/components/RealmInstrumentedUnitTest.kt
Unescape View File

@ -15,9 +15,10 @@ open class RealmInstrumentedUnitTest {
companion object {
fun newSessionInstance(realm: Realm) : Session {
fun newSessionInstance(realm: Realm, isCashGame: Boolean = true) : Session {
val session = realm.createObject(Session::class.java, UUID.randomUUID().toString())
session.startDate = Date()
session.type = if (isCashGame) Session.Type.CASH_GAME.ordinal else Session.Type.TOURNAMENT.ordinal
session.result = realm.createObject(Result::class.java)
return session
}

3
app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt
Unescape View File

@ -31,8 +31,11 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() {
s3.endDate = Date()
s1.cgBigBlind = 4.0
s1.cgSmallBlind = 2.0
s2.cgBigBlind = 4.0
s2.cgSmallBlind = 2.0
s3.cgBigBlind = 1.0
s3.cgSmallBlind = 1.0
realm.insert(s1)
realm.insert(s2)

31
app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt
Unescape View File

@ -2,7 +2,10 @@ package net.pokeranalytics.android.unitTests.filter
import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest
import net.pokeranalytics.android.model.filter.QueryType
import net.pokeranalytics.android.model.realm.*
import net.pokeranalytics.android.model.realm.Bankroll
import net.pokeranalytics.android.model.realm.Filter
import net.pokeranalytics.android.model.realm.FilterElement
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow
import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
import org.junit.Assert
@ -45,11 +48,9 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRows = arrayListOf(blind))
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(2, sessions.size)
sessions.map {
@ -92,11 +93,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRows = arrayListOf(blind))
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(2, sessions.size)
sessions.map {
@ -139,11 +136,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRows = arrayListOf(blind))
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions.map {
@ -188,11 +181,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRows = arrayListOf(blind1, blind2))
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(2, sessions.size)
sessions.map {

63
app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt
Unescape View File

@ -37,11 +37,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRow)
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -70,11 +66,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRow)
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -102,11 +94,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val filterElement = FilterElement(filterElementRow)
filter.updateValueMap(filterElement)
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -128,11 +116,8 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
Session.testInstance(100.0, true, cal.time)
realm.commitTransaction()
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(QueryType.WEEK_END)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(QueryType.WEEK_END))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -145,19 +130,19 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val realm = this.mockRealm
realm.beginTransaction()
val cal = Calendar.getInstance()
cal.time = Date()
cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
val s1 = Session.testInstance(100.0, false, cal.time)
cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY)
cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY)
Session.testInstance(100.0, true, cal.time)
realm.commitTransaction()
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(QueryType.WEEK_DAY)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(QueryType.WEEK_DAY))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -185,12 +170,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
filter.updateValueMap(FilterElement(filterElementRow))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -218,11 +198,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
filter.updateValueMap(FilterElement(filterElementRow))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -251,11 +227,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
filter.updateValueMap(FilterElement(filterElementRow))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -284,12 +256,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
filter.updateValueMap(FilterElement(filterElementRow))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {

7
app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/ExceptionFilterInstrumentedTest.kt
Unescape View File

@ -20,11 +20,8 @@ class ExceptionFilterInstrumentedTest: BaseFilterInstrumentedUnitTest() {
filter.updateValueMap(filterElement)
val realm = this.mockRealm
Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
Filter.queryOn<Session>(realm, arrayListOf(filter))
}
@Test(expected = PokerAnalyticsException.FilterElementUnknownName::class)

4
app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt
Unescape View File

@ -22,7 +22,7 @@ class RealmFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val realm = this.mockRealm
realm.beginTransaction()
val filter = Filter(entity = Session)
val filter = Filter()
filter.name = "testSaveLoadCashFilter"
val filterElement = FilterElementRow.Cash
@ -51,7 +51,7 @@ class RealmFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val newRealm = this.mockRealm
newRealm.where(Filter::class.java).equalTo("name", "testSaveLoadCashFilter").findFirst()?.let { foundFilter ->
val sessions = foundFilter.results()
val sessions = foundFilter.results<Session>()
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {

114
app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt
Unescape View File

@ -26,11 +26,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
Session.testInstance(100.0, true, Date(), 1)
realm.commitTransaction()
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(QueryType.CASH)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(QueryType.CASH))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -48,11 +44,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
Session.testInstance(100.0, true, Date(), 1)
realm.commitTransaction()
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(QueryType.TOURNAMENT)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(QueryType.TOURNAMENT))
Assert.assertEquals(1, sessions.size)
sessions[0]?.run {
@ -75,11 +67,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
Session.testInstance(100.0, true, Date(), 1, b2)
realm.commitTransaction()
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(QueryType.LIVE)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(QueryType.LIVE))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).bankroll?.run {
@ -101,11 +89,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
Session.testInstance(100.0, true, Date(), 1, b2)
realm.commitTransaction()
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(QueryType.ONLINE)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(QueryType.ONLINE))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).bankroll?.run {
@ -130,11 +114,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.BANKROLL
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).bankroll?.run {
@ -168,11 +148,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow2.filterSectionRow = FilterSectionRow.BANKROLL
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(6, sessions.size)
@ -198,11 +174,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.GAME
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).game?.run {
@ -236,11 +208,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow2.filterSectionRow = FilterSectionRow.GAME
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(6, sessions.size)
@ -266,11 +234,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.LOCATION
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).location?.run {
@ -305,11 +269,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(6, sessions.size)
@ -336,11 +296,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).tournamentName?.run {
@ -373,11 +329,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(6, sessions.size)
@ -415,11 +367,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(1, sessions.size)
(sessions[0] as Session).run {
@ -456,11 +404,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow4.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(8, sessions.size)
}
@ -488,11 +432,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
val result = arrayListOf(s1.id, s2.id, s3.id, s4.id)
@ -519,11 +459,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE
filter.updateValueMap(FilterElement(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(2, sessions.size)
@ -548,11 +484,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.VALUE
filter.updateValueMap(FilterElement(filterElementRow))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(2, sessions.size)
@ -577,11 +509,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow.filterSectionRow = FilterSectionRow.VALUE
filter.updateValueMap(FilterElement(filterElementRow))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filter)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
Assert.assertEquals(3, sessions.size)
@ -611,11 +539,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
filterElementRow2.filterSectionRow = FilterSectionRow.VALUE
filterLess.updateValueMap(FilterElement(filterElementRow2))
val sessions = Filter.queryOn(
realm,
Session,
arrayListOf(filterMore, filterLess)
)
val sessions = Filter.queryOn<Session>(realm, arrayListOf(filterMore, filterLess))
Assert.assertEquals(1, sessions.size)

19
app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
Unescape View File

@ -64,8 +64,8 @@ class Calculator {
var computableGroups: MutableList<ComputableGroup> = mutableListOf()
filters.forEach { filter ->
val results = filter.realm.where(ComputableResult::class.java).findAll()
val sets = filter.realm.where(SessionSet::class.java).findAll()
val results = filter.results<ComputableResult>()
val sets = filter.results<SessionSet>()
val group = ComputableGroup(filter.name, results, sets)
computableGroups.add(group)
@ -104,21 +104,6 @@ class Calculator {
return computedResults
}
// fun compute(sessionGroup: ComputableGroup, options: Options): ComputedResults {
//
// var sum: Double = sessionGroup.computables.sum("ratedNet").toDouble()
// val results: ComputedResults = ComputedResults(sessionGroup)
//
// results.addStats(
// setOf(
// ComputedStat(NETRESULT, sum)
// )
// )
//
// return results
// }
/**
* Computes stats for a SessionSet
*/

24
app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt
Unescape View File

@ -1,7 +1,9 @@
package net.pokeranalytics.android.model.filter
import io.realm.RealmModel
import net.pokeranalytics.android.model.realm.ComputableResult
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.model.realm.SessionSet
/**
* We want to be able to store filters in the database:
@ -37,11 +39,11 @@ class UnmanagedFilterField(message: String) : Exception(message) {
* Companion-level Interface to indicate an RealmObject class can be filtered and to provide all the fieldNames (eg: parameter's path) needed to be query on.
*/
interface Filterable : RealmModel {
/**
* return the path of the parameter used in the [QueryType] related to this entity
*/
fun fieldNameForQueryType(queryType: QueryType) : String?
/**
* return the path of the parameter used in the [QueryType] related to this entity
*/
// fun fieldNameForQueryType(queryType: QueryType) : String?
}
@ -49,13 +51,17 @@ class FilterHelper {
companion object {
inline fun <reified T : Filterable> fieldNameForQueryType(queryType: QueryType) : String? {
when (T::class) {
is Session -> {
Session.fieldNameForQueryType(queryType)
inline fun <reified T : Filterable> fieldNameForQueryType(queryType: QueryType): String? {
return when (T::class.java) {
Session::class.java -> Session.fieldNameForQueryType(queryType)
ComputableResult::class.java -> ComputableResult.fieldNameForQueryType(queryType)
SessionSet::class.java -> SessionSet.fieldNameForQueryType(queryType)
else -> {
throw UnmanagedFilterField("Filterable type fields are not defined for class ${T::class}")
}
}
throw UnmanagedFilterField("Filterable type fields are not defined")
}
}

84
app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt
Unescape View File

@ -5,6 +5,7 @@ import io.realm.RealmQuery
import net.pokeranalytics.android.exceptions.PokerAnalyticsException
import net.pokeranalytics.android.model.realm.FilterElement
import net.pokeranalytics.android.model.realm.FilterElementBlind
import net.pokeranalytics.android.model.realm.Session
import java.util.*
@ -72,6 +73,22 @@ enum class QueryType(var subType:SubType? = null) {
LESS;
}
var valueMap : Map<String, Any?>? = null
get() {
this.filterValuesExpectedKeys?.let { valueMapExceptedKeys ->
field?.let { map ->
val missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) }
if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) {
throw PokerAnalyticsException.QueryValueMapMissingKeys(missingKeys)
}
} ?: run {
throw PokerAnalyticsException.QueryValueMapUnexpectedValue
}
}
return field
}
private set
private val filterValuesExpectedKeys : Array<String>?
get() {
this.subType?.let {
@ -141,27 +158,26 @@ enum class QueryType(var subType:SubType? = null) {
val fieldName = FilterHelper.fieldNameForQueryType<T>(this)
fieldName ?: throw PokerAnalyticsException.QueryValueMapUnknown
this.subType?.let { subType ->
return when (subType) {
SubType.LESS -> {
val value: Double by valueMap
realmQuery.lessThanOrEqualTo(fieldName, value)
}
SubType.MORE -> {
val value: Double by valueMap
realmQuery.greaterThanOrEqualTo(fieldName, value)
}
SubType.BETWEEN -> {
val leftValue: Double by valueMap
val rightValue: Double by valueMap
realmQuery.between(fieldName, leftValue, rightValue)
}
when (subType) {
SubType.LESS -> {
val value: Double by valueMap
return realmQuery.lessThanOrEqualTo(fieldName, value)
}
SubType.MORE -> {
val value: Double by valueMap
return realmQuery.greaterThanOrEqualTo(fieldName, value)
}
SubType.BETWEEN -> {
val leftValue: Double by valueMap
val rightValue: Double by valueMap
return realmQuery.between(fieldName, leftValue, rightValue)
}
}
return when (this) {
LIVE, ONLINE -> realmQuery.equalTo(fieldName, this == LIVE)
CASH, TOURNAMENT -> realmQuery.equalTo(fieldName, this.ordinal)
CASH -> realmQuery.equalTo(fieldName, Session.Type.CASH_GAME.ordinal)
TOURNAMENT -> realmQuery.equalTo(fieldName, Session.Type.TOURNAMENT.ordinal)
ALL_TOURNAMENT_FEATURES -> {
val ids: Array<String> by valueMap
ids.forEach {
@ -210,9 +226,11 @@ enum class QueryType(var subType:SubType? = null) {
realmQuery.equalTo(fieldName, year)
}
WEEK_END, WEEK_DAY -> {
var query = realmQuery.`in`(fieldName, arrayOf(Calendar.SATURDAY, Calendar.SUNDAY))
if (this == WEEK_DAY) { query.not() }
query
var query = realmQuery
if (this == WEEK_DAY) {
query = realmQuery.not()
}
query.`in`(fieldName, arrayOf(Calendar.SATURDAY, Calendar.SUNDAY))
}
else -> {
throw PokerAnalyticsException.QueryTypeUnhandled
@ -229,17 +247,7 @@ enum class QueryType(var subType:SubType? = null) {
}
this.subType?.let { subType ->
valueMap = when (subType) {
SubType.LESS, SubType.MORE -> {
mapOf("value" to filterElement.value)
}
SubType.BETWEEN -> {
mapOf(
"leftValue" to filterElement.leftValue,
"rightValue" to filterElement.rightValue
)
}
}
valueMap = mapOf("value" to filterElement.value)
return
}
@ -271,21 +279,5 @@ enum class QueryType(var subType:SubType? = null) {
}
}
var valueMap : Map<String, Any?>? = null
get() {
this.filterValuesExpectedKeys?.let { valueMapExceptedKeys ->
field?.let { map ->
val missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) }
if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) {
throw PokerAnalyticsException.QueryValueMapMissingKeys(missingKeys)
}
} ?: run {
throw PokerAnalyticsException.QueryValueMapUnexpectedValue
}
}
return field
}
private set
}

13
app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt
Unescape View File

@ -2,8 +2,10 @@ package net.pokeranalytics.android.model.realm
import io.realm.RealmObject
import net.pokeranalytics.android.calculus.interfaces.Computable
import net.pokeranalytics.android.model.filter.Filterable
import net.pokeranalytics.android.model.filter.QueryType
open class ComputableResult : RealmObject(), Computable {
open class ComputableResult : RealmObject(), Computable, Filterable {
override var ratedNet: Double = 0.0
@ -52,4 +54,13 @@ open class ComputableResult : RealmObject(), Computable {
BB_PER100HANDS("bbPer100Hands")
}
companion object : Filterable {
fun fieldNameForQueryType(queryType: QueryType): String? {
return "session." + Session.fieldNameForQueryType(queryType)
}
}
}

60
app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
Unescape View File

@ -17,49 +17,13 @@ import java.util.*
* It contains a list of [FilterElement] describing the complete query to launch
* The [Filter] is working closely with a [Filterable] interface providing the entity we want the query being launched on
*/
open class Filter(entity:Filterable) : RealmObject() {
open class Filter : RealmObject() {
constructor() : this(entity = Session)
private var entityType : Int? = Entity.SESSION.ordinal
private var entityType : Int? = FilterableClass.filterableClass(entity = entity).ordinal
private val filterableClass : FilterableClass?
get() {
entityType?.let {
return FilterableClass.values()[it]
}
return null
}
private enum class FilterableClass {
private enum class Entity {
SESSION,
;
companion object {
fun filterableClass(entity: Filterable): FilterableClass {
return when (entity) {
is Session.Companion -> SESSION
else -> throw PokerAnalyticsException.FilterUnhandledEntity
}
}
}
val relatedEntity: Class < out RealmObject >
get() {
return when (this) {
SESSION -> Session::class.java
// else -> throw FilterUnhandledEntityException("this entity is not filterable")
}
}
val filterable : Filterable
get() {
return when (this) {
SESSION -> Session.Companion
// else -> throw FilterUnhandledEntityException("this entity is not filterable")
}
}
}
companion object {
@ -75,14 +39,14 @@ open class Filter(entity:Filterable) : RealmObject() {
return realm.where<Filter>().equalTo("id", filterId).findFirst()
}
@TestOnly
inline fun <reified T : Filterable> queryOn(realm: Realm, queries: List<QueryType>): RealmResults<T> {
var realmQuery = realm.where<T>()
queries.forEach {
realmQuery = (it.filter<T>(realmQuery))
}
return realmQuery.findAll()
}
@TestOnly
inline fun <reified T : Filterable> queryOn(realm: Realm, queries: List<QueryType>): RealmResults<T> {
var realmQuery = realm.where<T>()
queries.forEach {
realmQuery = it.filter<T>(realmQuery)
}
return realmQuery.findAll()
}
}
@PrimaryKey
@ -142,7 +106,7 @@ open class Filter(entity:Filterable) : RealmObject() {
}
inline fun <reified T : Filterable> results(): RealmResults<T> {
var realmQuery : RealmQuery<T> = realm.where<T>()
var realmQuery = realm.where<T>()
this.filterElements.map {
it.queryType
}.forEach {

10
app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
Unescape View File

@ -41,7 +41,7 @@ import java.util.Currency
import kotlin.collections.ArrayList
open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDataSource, RowRepresentable, Timed,
TimeFilterable {
TimeFilterable, Filterable {
enum class Type {
CASH_GAME,
@ -61,10 +61,10 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
return realm.copyToRealm(session)
}
override fun fieldNameForQueryType(queryType: QueryType): String? {
fun fieldNameForQueryType(queryType: QueryType): String? {
return when (queryType) {
LIVE -> "bankroll.live"
CASH -> "type"
LIVE, ONLINE -> "bankroll.live"
CASH, TOURNAMENT -> "type"
BANKROLL -> "bankroll.id"
GAME -> "game.id"
TOURNAMENT_NAME -> "tournamentName.id"
@ -87,7 +87,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
MORE_THAN_TOURNAMENT_FEE, LESS_THAN_TOURNAMENT_FEE, BETWEEN_TOURNAMENT_FEE -> "tournamentEntryFee"
STARTED_FROM_DATE, STARTED_TO_DATE -> "startDate"
ENDED_FROM_DATE, ENDED_TO_DATE -> "endDate"
DAY_OF_WEEK, WEEK_END -> "dayOfWeek"
DAY_OF_WEEK, WEEK_END, WEEK_DAY -> "dayOfWeek"
MONTH -> "month"
YEAR -> "year"
else -> null

18
app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
Unescape View File

@ -5,11 +5,13 @@ import io.realm.RealmObject
import io.realm.RealmResults
import io.realm.annotations.Ignore
import io.realm.annotations.LinkingObjects
import net.pokeranalytics.android.model.filter.Filterable
import net.pokeranalytics.android.model.filter.QueryType
import net.pokeranalytics.android.model.interfaces.Timed
import java.util.*
open class SessionSet : RealmObject(), Timed {
open class SessionSet : RealmObject(), Timed, Filterable {
var startDate: Date = Date()
set(value) {
@ -47,12 +49,16 @@ open class SessionSet : RealmObject(), Timed {
*/
override var netDuration: Long = 0L
companion object {
companion object : Filterable {
fun newInstance(realm: Realm) : SessionSet {
val sessionSet: SessionSet = realm.createObject(SessionSet::class.java)
return realm.copyToRealm(sessionSet)
}
fun newInstance(realm: Realm) : SessionSet {
val sessionSet: SessionSet = realm.createObject(SessionSet::class.java)
return realm.copyToRealm(sessionSet)
}
fun fieldNameForQueryType(queryType: QueryType): String? {
return "sessions." + Session.fieldNameForQueryType(queryType)
}
}

2
app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt
Unescape View File

@ -124,7 +124,7 @@ class FavoriteSessionFinder {
}
val sortedCounters = counters.values.sortedBy { it.counter }
return sortedCounters.firstOrNull()?.session
return sortedCounters.lastOrNull()?.session
}
}

22
app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
Unescape View File

@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.core.view.isVisible
import io.realm.RealmResults
import io.realm.Sort
@ -20,6 +21,7 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
import net.pokeranalytics.android.util.Preferences
import java.text.SimpleDateFormat
import java.util.*
class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
@ -67,12 +69,27 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
disclaimerContainer.isVisible = Preferences.shouldShowDisclaimer(requireContext())
val sdf = SimpleDateFormat("dd/M/yyyy hh:mm")
val betaLimitDate = sdf.parse("17/7/2019 10:00")
newCashGame.setOnClickListener {
if (Date().after(betaLimitDate)) {
this.showEndOfBetaMessage()
return@setOnClickListener
}
SessionActivity.newInstance(requireContext(), false)
newSessionCreated = true
}
newTournament.setOnClickListener {
if (Date().after(betaLimitDate)) {
this.showEndOfBetaMessage()
return@setOnClickListener
}
SessionActivity.newInstance(requireContext(), true)
newSessionCreated = true
}
@ -84,6 +101,11 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
}
private fun showEndOfBetaMessage() {
Toast.makeText(context, "Beta has ended. Please update with the Google Play version", Toast.LENGTH_LONG).show()
}
/**
* Init data
*/

Write Preview
Loading…
Cancel
Save