Merge pull request #711 from City-of-Helsinki/ASU-1732-fix-livingarea-search

ASU-1732 Fix living area filter

Author: Andrey-Baklanov

public/modules/custom/asu_rest/src/Plugin/rest/resource/ElasticSearch.php

@@ -283,11 +283,24 @@ private function addConditions(QueryInterface &$query, ParameterBag $parameters)
     }
 
     if (!empty($parameters->get('living_area'))) {
-      $min = isset($parameters->get('living_area')[0]) ? (int) $parameters->get('living_area')[0] : 0;
-      $max = isset($parameters->get('living_area')[1]) ? (int) $parameters->get('living_area')[1] : 5000;
-      $baseConditionGroup->addCondition('living_area', [$min, $max], 'BETWEEN');
+        $min = isset($parameters->get('living_area')[0]) && $parameters->get('living_area')[0] !== ""
+            ? (int) $parameters->get('living_area')[0]
+            : null;
+        $max = isset($parameters->get('living_area')[1]) && $parameters->get('living_area')[1] !== ""
+            ? (int) $parameters->get('living_area')[1]
+            : null;
+
+        if ($min !== null && $max !== null) {
+            $baseConditionGroup->addCondition('living_area', [$min, $max], 'BETWEEN');
+        } elseif ($min !== null) {
+            $baseConditionGroup->addCondition('living_area', [$min, 99999], 'BETWEEN');
+        } elseif ($max !== null) {
+            $baseConditionGroup->addCondition('living_area', [0, $max], 'BETWEEN');
+        }
     }
 
+
+
     // @todo Debt free sales price won't be needed in future.
     if ($value = $parameters->get('debt_free_sales_price')) {
       if (!$parameters->get('price')) {