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

remove customFieldId optional in queryCondition

Browse Source
dev
Razmig Sarkissian 7 years ago
parent 48df1ecba6
commit 1551b5ffe8
1 changed files with 6 additions and 6 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. 12
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

12
app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
Unescape View File

@ -513,7 +513,7 @@ sealed class QueryCondition : FilterElementRow {
} }
interface CustomFieldRelated { interface CustomFieldRelated {
var customFieldId : String? var customFieldId : String
fun customFieldName(realm: Realm): String { fun customFieldName(realm: Realm): String {
val query = realm.where(CustomField::class.java) val query = realm.where(CustomField::class.java)
@ -532,7 +532,7 @@ sealed class QueryCondition : FilterElementRow {
} }
open class CustomFieldNumberQuery() : ListOfDouble(), CustomFieldRelated { open class CustomFieldNumberQuery() : ListOfDouble(), CustomFieldRelated {
override var customFieldId : String? = null override var customFieldId : String = ""
override var operator: Operator = Operator.EQUALS override var operator: Operator = Operator.EQUALS
constructor(customFieldId: String, value: Double): this() { constructor(customFieldId: String, value: Double): this() {
this.listOfValues = arrayListOf(value) this.listOfValues = arrayListOf(value)
@ -564,7 +564,7 @@ sealed class QueryCondition : FilterElementRow {
override fun updateValueBy(filterCondition: FilterCondition) { override fun updateValueBy(filterCondition: FilterCondition) {
super.updateValueBy(filterCondition) super.updateValueBy(filterCondition)
listOfValues = filterCondition.getValues() listOfValues = filterCondition.getValues()
customFieldId = filterCondition.stringValue customFieldId = filterCondition.stringValue ?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue
} }
} }
@ -576,10 +576,10 @@ sealed class QueryCondition : FilterElementRow {
class CustomFieldListQuery() : QueryDataCondition<CustomFieldEntry>(), CustomFieldRelated { class CustomFieldListQuery() : QueryDataCondition<CustomFieldEntry>(), CustomFieldRelated {
override var entity: Class<CustomFieldEntry> = CustomFieldEntry::class.java override var entity: Class<CustomFieldEntry> = CustomFieldEntry::class.java
override var customFieldId : String? = null override var customFieldId : String = ""
constructor(customFieldEntry: CustomFieldEntry): this() { constructor(customFieldEntry: CustomFieldEntry): this() {
this.setObject(customFieldEntry) this.setObject(customFieldEntry)
this.customFieldId = customFieldEntry.customField?.id this.customFieldId = customFieldEntry.customField?.id ?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue
} }
override fun entityName(realm: Realm): String { override fun entityName(realm: Realm): String {
@ -589,7 +589,7 @@ sealed class QueryCondition : FilterElementRow {
override fun updateValueBy(filterCondition: FilterCondition) { override fun updateValueBy(filterCondition: FilterCondition) {
super.updateValueBy(filterCondition) super.updateValueBy(filterCondition)
listOfValues = filterCondition.getValues() listOfValues = filterCondition.getValues()
customFieldId = filterCondition.stringValue customFieldId = filterCondition.stringValue ?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue
} }
} }

Write Preview
Loading…
Cancel
Save