From 1551b5ffe8fe8977c1705fb34db845adf29b03aa Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@thomasbutton.com>
Date: Tue, 28 May 2019 10:35:21 +0200
Subject: [PATCH] remove customFieldId optional in queryCondition

---
 .../android/model/filter/QueryCondition.kt           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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