From 420055ab1d9ad3ed2160e813cc9cdb3f029e6787 Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 3 Jul 2019 16:18:42 +0200 Subject: [PATCH] Renaming Result.netResult into Result.onlineNet --- app/build.gradle | 4 ++-- .../android/components/SessionInstrumentedUnitTest.kt | 2 +- .../android/unitTests/BankrollInstrumentedUnitTest.kt | 2 +- .../android/unitTests/DeleteInstrumentedUnitTest.kt | 4 ++-- .../android/unitTests/StatPerformanceUnitTest.kt | 2 +- .../android/unitTests/StatsInstrumentedUnitTest.kt | 8 ++++---- .../pokeranalytics/android/PokerAnalyticsApplication.kt | 2 +- .../android/model/migrations/PokerAnalyticsMigration.kt | 1 + .../java/net/pokeranalytics/android/model/realm/Result.kt | 8 ++++---- .../net/pokeranalytics/android/model/realm/Session.kt | 8 ++++---- .../android/util/csv/SessionCSVDescriptor.kt | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f8f41259..1f543cc8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,8 +29,8 @@ android { applicationId "net.pokeranalytics.android" minSdkVersion 23 targetSdkVersion 28 - versionCode 48 - versionName "2.1.2" + versionCode 51 + versionName "2.1.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/androidTest/java/net/pokeranalytics/android/components/SessionInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/components/SessionInstrumentedUnitTest.kt index ed063e5e..0fc0779a 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/components/SessionInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/components/SessionInstrumentedUnitTest.kt @@ -30,7 +30,7 @@ open class SessionInstrumentedUnitTest : RealmInstrumentedUnitTest() { session.numberOfTables = numberOfTable session.tableSize = tableSize session.startDate = startDate - session.result?.netResult = netResult + session.result?.onlineNet = netResult val cal = Calendar.getInstance() // creates calendar cal.time = startDate // sets calendar time/date cal.add(Calendar.HOUR_OF_DAY, endDate) // adds one hour diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt index 5a21a604..6b789d1d 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt @@ -28,7 +28,7 @@ class BankrollInstrumentedUnitTest : SessionInstrumentedUnitTest() { // convenience extension fun Session.Companion.testInstance(netResult: Double, startDate: Date, endDate: Date?): Session { val session: Session = newInstance(super.mockRealm, false) - session.result?.netResult = netResult + session.result?.onlineNet = netResult session.startDate = startDate session.endDate = endDate return session diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt index f7faed23..5ceebd84 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/DeleteInstrumentedUnitTest.kt @@ -33,8 +33,8 @@ class DeleteInstrumentedUnitTest : RealmInstrumentedUnitTest() { s1.bankroll = br1 s2.bankroll = br2 - s1.result?.netResult = 100.0 - s2.result?.netResult = 200.0 + s1.result?.onlineNet = 100.0 + s2.result?.onlineNet = 200.0 realm.commitTransaction() diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt index 7b9f296e..a5400018 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt @@ -28,7 +28,7 @@ class StatPerformanceUnitTest : SessionInstrumentedUnitTest() { realm.commitTransaction() val d1 = Date() - realm.where(Result::class.java).sum("netResult") + realm.where(Result::class.java).sum("onlineNet") val d2 = Date() val duration = (d2.time - d1.time) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt index e741456b..3080d301 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt @@ -593,8 +593,8 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { b2.currency = c2 s1.bankroll = b1 s2.bankroll = b2 - s1.result?.netResult = 100.0 - s2.result?.netResult = 200.0 + s1.result?.onlineNet = 100.0 + s2.result?.onlineNet = 200.0 } @@ -629,8 +629,8 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { b2.currency = c2 s1.bankroll = b1 s2.bankroll = b2 - s1.result?.netResult = 100.0 - s2.result?.netResult = 200.0 + s1.result?.onlineNet = 100.0 + s2.result?.onlineNet = 200.0 } diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index 321c458b..742c3030 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -33,7 +33,7 @@ class PokerAnalyticsApplication : Application() { Realm.init(this) val realmConfiguration = RealmConfiguration.Builder() .name(Realm.DEFAULT_REALM_NAME) - .schemaVersion(7) + .schemaVersion(8) .migration(PokerAnalyticsMigration()) .initialData(Seed(this)) .build() diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt index 169fbc7b..a64c6525 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt @@ -168,6 +168,7 @@ class PokerAnalyticsMigration : RealmMigration { } schema.get("Session")?.addField("tournamentPrizepool", Double::class.java)?.setNullable("tournamentPrizepool", true) + schema.get("Result")?.renameField("netResult", "onlineNet") currentVersion++ } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt index 5825013a..844b23c0 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt @@ -49,7 +49,7 @@ open class Result : RealmObject(), Filterable { /** * The net result */ - var netResult: Double? = null + var onlineNet: Double? = null set(value) { var errorMessage: String? = null @@ -118,7 +118,7 @@ open class Result : RealmObject(), Filterable { val transactionsSum = transactions.sumByDouble { it.amount } - this.netResult?.let { + this.onlineNet?.let { this.net = it + transactionsSum } ?: run { val buyin = this.buyin ?: 0.0 @@ -132,8 +132,8 @@ open class Result : RealmObject(), Filterable { // val cashOut = this.cashout ?: 0.0 // this.net = cashOut - buyin + transactionsSum // } else { -// val netResult = this.netResult ?: 0.0 -// this.net = netResult + transactionsSum +// val onlineNet = this.onlineNet ?: 0.0 +// this.net = onlineNet + transactionsSum // } // Precompute results 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 9c91b6e0..4df1af75 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 @@ -476,7 +476,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat val hasNetResult: Boolean get() { - return this.result?.netResult != null + return this.result?.onlineNet != null } // Manageable @@ -788,7 +788,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat SessionRow.BREAK_TIME -> if (this.breakDuration > 0.0) this.breakDuration.toMinutes() else NULL_TEXT SessionRow.BUY_IN -> this.result?.buyin?.toCurrency(currency) ?: NULL_TEXT SessionRow.CASHED_OUT, SessionRow.PRIZE -> this.result?.cashout?.toCurrency(currency) ?: NULL_TEXT - SessionRow.NET_RESULT -> this.result?.netResult?.toCurrency(currency) ?: NULL_TEXT + SessionRow.NET_RESULT -> this.result?.onlineNet?.toCurrency(currency) ?: NULL_TEXT SessionRow.COMMENT -> if (this.comment.isNotEmpty()) this.comment else NULL_TEXT SessionRow.END_DATE -> this.endDate?.shortDateTime() ?: NULL_TEXT SessionRow.GAME -> getFormattedGame() @@ -903,7 +903,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat ) SessionRow.NET_RESULT -> row.editingDescriptors( mapOf( - "defaultValue" to result?.netResult + "defaultValue" to result?.onlineNet ) ) SessionRow.COMMENT -> row.editingDescriptors( @@ -998,7 +998,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat } SessionRow.NET_RESULT -> { this.result?.let { result -> - result.netResult = value as Double? + result.onlineNet = value as Double? } } SessionRow.COMMENT -> comment = value as String? ?: "" diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt index 95814083..615092b2 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt @@ -253,7 +253,7 @@ class SessionCSVDescriptor(source: DataSource, private var isTournament: Boolean session.bankroll = bankroll netResult?.let { - session.result?.netResult = it // need to be set after BR + session.result?.onlineNet = it // need to be set after BR } session.result?.buyin?.let {