From 12d563bc6459a754df706e1d1038ecb5de204927 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 17 Apr 2019 19:42:35 +0200 Subject: [PATCH] post merge fix --- .../android/model/realm/ComputableResult.kt | 5 +- .../android/model/realm/Session.kt | 52 +++++++++---------- .../android/model/realm/SessionSet.kt | 5 +- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt index 04589945..513040e9 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt @@ -57,7 +57,10 @@ open class ComputableResult() : RealmObject(), Computable, Filterable { companion object { fun fieldNameForQueryType(queryCondition: Class < out QueryCondition >): String? { - return "session." + Session.fieldNameForQueryType(queryCondition) + Session.fieldNameForQueryType(queryCondition)?.let { + return "session.$it" + } + return null } } 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 2b83ba98..49a3b80c 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 @@ -64,32 +64,32 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat } fun fieldNameForQueryType(queryCondition: Class < out QueryCondition >): String? { - return when (queryCondition) { - LIVE::class, ONLINE::class -> "bankroll.live" - CASH::class, TOURNAMENT::class -> "type" - BANKROLL::class -> "bankroll.id" - GAME::class -> "game.id" - TOURNAMENT_NAME::class -> "tournamentName.id" - ANY_TOURNAMENT_FEATURES::class, ALL_TOURNAMENT_FEATURES::class -> "tournamentFeatures.id" - LOCATION::class -> "location.id" - LIMIT::class -> "limit" - TABLE_SIZE::class -> "tableSize" - TOURNAMENT_TYPE::class -> "tournamentType" - BLIND::class -> "blinds" - COMMENT::class -> "comment" - BETWEEN_NUMBER_OF_TABLE::class, MORE_NUMBER_OF_TABLE::class, LESS_NUMBER_OF_TABLE::class -> "numberOfTable" - MORE_THAN_NET_RESULT::class, LESS_THAN_NET_RESULT::class -> "computableResults.ratedNet" - MORE_THAN_BUY_IN::class, LESS_THAN_BUY_IN::class -> "result.buyin" - MORE_THAN_CASH_OUT::class, LESS_THAN_CASH_OUT::class -> "result.cashout" - MORE_THAN_TIPS::class, LESS_THAN_TIPS::class -> "result.tips" - MORE_THAN_NUMBER_OF_PLAYER::class, LESS_THAN_NUMBER_OF_PLAYER::class, BETWEEN_NUMBER_OF_PLAYER::class -> "tournamentNumberOfPlayers" - MORE_THAN_TOURNAMENT_FEE::class, LESS_THAN_TOURNAMENT_FEE::class, BETWEEN_TOURNAMENT_FEE::class -> "tournamentEntryFee" - STARTED_FROM_DATE::class, STARTED_TO_DATE::class -> "startDate" - ENDED_FROM_DATE::class, ENDED_TO_DATE::class -> "endDate" - DAY_OF_WEEK::class, WEEK_END::class, WEEK_DAY::class -> "dayOfWeek" - MONTH::class -> "month" - YEAR::class -> "year" - TODAY::class, YESTERDAY::class, TODAY_AND_YESTERDAY::class, THIS_YEAR::class, THIS_MONTH::class, THIS_WEEK::class -> "startDate" + return when (queryCondition) { + LIVE::class.java, ONLINE::class.java -> "bankroll.live" + CASH::class.java, TOURNAMENT::class.java -> "type" + BANKROLL::class.java -> "bankroll.id" + GAME::class.java -> "game.id" + TOURNAMENT_NAME::class.java -> "tournamentName.id" + ANY_TOURNAMENT_FEATURES::class.java, ALL_TOURNAMENT_FEATURES::class.java -> "tournamentFeatures.id" + LOCATION::class.java -> "location.id" + LIMIT::class.java -> "limit" + TABLE_SIZE::class.java -> "tableSize" + TOURNAMENT_TYPE::class.java -> "tournamentType" + BLIND::class.java -> "blinds" + COMMENT::class.java -> "comment" + BETWEEN_NUMBER_OF_TABLE::class.java, MORE_NUMBER_OF_TABLE::class.java, LESS_NUMBER_OF_TABLE::class.java -> "numberOfTable" + MORE_THAN_NET_RESULT::class.java, LESS_THAN_NET_RESULT::class.java -> "computableResults.ratedNet" + MORE_THAN_BUY_IN::class.java, LESS_THAN_BUY_IN::class.java -> "result.buyin" + MORE_THAN_CASH_OUT::class.java, LESS_THAN_CASH_OUT::class.java -> "result.cashout" + MORE_THAN_TIPS::class.java, LESS_THAN_TIPS::class.java -> "result.tips" + MORE_THAN_NUMBER_OF_PLAYER::class.java, LESS_THAN_NUMBER_OF_PLAYER::class.java, BETWEEN_NUMBER_OF_PLAYER::class.java -> "tournamentNumberOfPlayers" + MORE_THAN_TOURNAMENT_FEE::class.java, LESS_THAN_TOURNAMENT_FEE::class.java, BETWEEN_TOURNAMENT_FEE::class.java -> "tournamentEntryFee" + STARTED_FROM_DATE::class.java, STARTED_TO_DATE::class.java -> "startDate" + ENDED_FROM_DATE::class.java, ENDED_TO_DATE::class.java -> "endDate" + DAY_OF_WEEK::class.java, WEEK_END::class.java, WEEK_DAY::class.java -> "dayOfWeek" + MONTH::class.java -> "month" + YEAR::class.java -> "year" + TODAY::class.java, YESTERDAY::class.java, TODAY_AND_YESTERDAY::class.java, THIS_YEAR::class.java, THIS_MONTH::class.java, THIS_WEEK::class.java -> "startDate" else -> null } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt index 06005334..80d3ed20 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt @@ -103,7 +103,10 @@ open class SessionSet() : RealmObject(), Timed, Filterable { } fun fieldNameForQueryType(queryCondition: Class < out QueryCondition >): String? { - return "sessions." + Session.fieldNameForQueryType(queryCondition) + Session.fieldNameForQueryType(queryCondition)?.let { + return "sessions.$it" + } + return null } }