From 14f09710178c403fa73d37b279ef1aa734dd1fa8 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 27 May 2019 18:37:55 +0200
Subject: [PATCH] Fixing issues due to modeling changes

---
 .../java/net/pokeranalytics/android/model/Criteria.kt | 11 +++++++----
 .../net/pokeranalytics/android/model/realm/Session.kt |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
index 44d72805..a5177aff 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
@@ -16,7 +16,6 @@ import net.pokeranalytics.android.model.Criteria.TournamentFees.comparison
 import net.pokeranalytics.android.model.Criteria.TournamentNames.comparison
 import net.pokeranalytics.android.model.Criteria.TournamentTypes.comparison
 import net.pokeranalytics.android.model.Criteria.TransactionTypes.comparison
-import net.pokeranalytics.android.model.filter.FilterHelper
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.interfaces.NameManageable
@@ -24,6 +23,7 @@ import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.enumerations.IntIdentifiable
 import net.pokeranalytics.android.util.enumerations.IntSearchable
+import net.pokeranalytics.android.util.extensions.findById
 
 fun List<Criteria>.combined(): List<Query> {
 	val comparatorList = ArrayList<List<Query>>()
@@ -64,9 +64,12 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
             if (this is ListCustomFields) {
                 val objects = mutableListOf<QueryCondition.CustomFieldListQuery>()
                 val realm = Realm.getDefaultInstance()
-                realm.where<CustomFieldEntry>().equalTo("customField.id", this.customField.id).findAll().forEach {
-                    objects.add(QueryCondition.CustomFieldListQuery(it))
-                }
+	            realm.findById(CustomField::class.java, this.customFieldId)?.entries?.forEach {
+		            objects.add(QueryCondition.CustomFieldListQuery(it))
+	            }
+//                realm.where<CustomFieldEntry>().equalTo("customField.id", this.customFieldId).findAll().forEach {
+//                    objects.add(QueryCondition.CustomFieldListQuery(it))
+//                }
                 objects.sorted()
                 realm.close()
                 return objects.map { Query(it) }
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 3e8da0b9..5ff4f9f9 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
@@ -109,7 +109,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
                 Duration::class.java -> "netDuration"
                 CustomFieldListQuery::class.java -> "customFieldEntries.id"
                 CustomFieldAmountQuery::class.java, CustomFieldNumberQuery::class.java -> "customFieldEntries.numericValue"
-                CustomFieldQuery::class.java -> "customFieldEntries.customField.id"
+                CustomFieldQuery::class.java -> "customFieldEntries.customFields.id"
                 else -> null
 			}
 		}