From 84d3bbf869bfbb5ef7caa1a65d21af0025215394 Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@thomasbutton.com>
Date: Mon, 8 Apr 2019 18:09:39 +0200
Subject: [PATCH] update query subtype handling on the inline filter method

---
 .../android/model/filter/QueryType.kt         | 40 +++++++------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt
index 1f22c794..99193403 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt
@@ -144,21 +144,19 @@ enum class QueryType(var subType:SubType? = null) {
                 fieldName ?: throw PokerAnalyticsException.QueryValueMapUnknown
 	            Timber.d(">>>> fi = ${fieldName}")
 
-                this.subType?.let { subType ->
-                    return when (subType) {
-                        SubType.LESS -> {
-                            val value: Double by valueMap
-                            realmQuery.lessThanOrEqualTo(fieldName, value)
-                        }
-                        SubType.MORE -> {
-                            val value: Double by valueMap
-                            realmQuery.greaterThanOrEqualTo(fieldName, value)
-                        }
-                        SubType.BETWEEN -> {
-                            val leftValue: Double by valueMap
-                            val rightValue: Double by valueMap
-                            realmQuery.between(fieldName, leftValue, rightValue)
-                        }
+                when (subType) {
+                    SubType.LESS -> {
+                        val value: Double by valueMap
+                        return realmQuery.lessThanOrEqualTo(fieldName, value)
+                    }
+                    SubType.MORE -> {
+                        val value: Double by valueMap
+                        return realmQuery.greaterThanOrEqualTo(fieldName, value)
+                    }
+                    SubType.BETWEEN -> {
+                        val leftValue: Double by valueMap
+                        val rightValue: Double by valueMap
+                        return realmQuery.between(fieldName, leftValue, rightValue)
                     }
                 }
 
@@ -235,17 +233,7 @@ enum class QueryType(var subType:SubType? = null) {
         }
 
         this.subType?.let { subType ->
-            valueMap = when (subType) {
-                SubType.LESS, SubType.MORE -> {
-                    mapOf("value" to filterElement.value)
-                }
-                SubType.BETWEEN -> {
-                    mapOf(
-                        "leftValue" to filterElement.leftValue,
-                        "rightValue" to filterElement.rightValue
-                    )
-                }
-            }
+            valueMap = mapOf("value" to filterElement.value)
             return
         }