✨ add float condition type

Author: SimonBarrettACT

src/QueryBuilder.php

@@ -28,6 +28,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Livewire\Component;
 
+/**
+ * @method saveToSession()
+ */
 abstract class QueryBuilder extends Component
 {
 

src/Support/Concerns/WithQueryBuilder.php

@@ -10,7 +10,6 @@
 use ACTTraining\QueryBuilder\Support\Criteria\DateCriteria;
 use ACTTraining\QueryBuilder\Support\Criteria\LikeCriteria;
 use ACTTraining\QueryBuilder\Support\Criteria\NullCriteria;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Enumerable;
 
 trait WithQueryBuilder
@@ -19,12 +18,13 @@ trait WithQueryBuilder
 
     public string $andOr = 'and';
 
+    /** @noinspection PhpUndefinedMethodInspection */
     public function addCriteria(): void
     {
         $this->resetPage();
 
         $conditions = $this->resolveConditions();
-        $condition = Arr::first($conditions);
+        $condition = $conditions->first();
 
         $operations = $condition->toArray()['operations'];
         $firstOperationKey = array_key_first($operations);
@@ -36,7 +36,8 @@ public function addCriteria(): void
             'extraValue' => null,
             'requiresExtra' => false,
             'displayValue' => $condition->displayValue(),
-            'inputType' => $condition->inputType(),
+            'inputType' => $condition->inputType,
+            'factor' => $condition->factor,
         ];
     }
 
@@ -63,6 +64,7 @@ public function updatedCriteria($value, $indexOrKeyName): void
                 'requiresExtra' => false,
                 'displayValue' => $this->displayValueForOperation($firstOperationKey),
                 'inputType' => $this->inputTypeForCondition($value),
+                'factor' => $this->factorForCondition($value),
             ];
         }
 
@@ -81,7 +83,11 @@ public function operations(string $key): array
         $conditions = $this->resolveConditions();
         $condition = $conditions->firstWhere('key', $key);
 
-        return $condition->toArray()['operations'];
+        if ($condition) {
+            return $condition->toArray()['operations'];
+        }
+
+        return [];
     }
 
     public function displayValueForOperation($value): bool
@@ -94,7 +100,15 @@ public function inputTypeForCondition($key): string
         $conditions = $this->resolveConditions();
         $condition = $conditions->firstWhere('key', $key);
 
-        return $condition->inputType();
+        return $condition->inputType;
+    }
+
+    public function factorForCondition($key): string
+    {
+        $conditions = $this->resolveConditions();
+        $condition = $conditions->firstWhere('key', $key);
+
+        return $condition->factor;
     }
 
     public function displayExtraValueForOperation($value): bool
@@ -106,6 +120,8 @@ public function removeCriteria($index): void
     {
         unset($this->criteria[$index]);
         $this->criteria = array_values($this->criteria);
+
+        $this->saveToSession();
     }
 
     public function setAndOr($condition): void
@@ -155,22 +171,27 @@ private function getCriteriaClass($criteria
         $column = $criteria['column'];
         $value = $criteria['value'] ?? null;
         $extraValue = $criteria['extraValue'] ?? null;
+        $factor = $criteria['factor'] ?? null;
 
         if (is_null($value) && $criteria['displayValue']) {
             return null;
         }
 
+        if ($factor) {
+            $value = $value * $factor;
+        }
+
         return match ($criteria['operation']) {
             'equals' => new CompareCriteria($column, $value, '='),
             'not_equals' => new CompareCriteria($column, $value, '!='),
             'greater_than' => new CompareCriteria($column, $value, '>'),
             'less_than' => new CompareCriteria($column, $value, '<'),
             'greater_than_or_equal' => new CompareCriteria($column, $value, '>='),
             'less_than_or_equal' => new CompareCriteria($column, $value, '<='),
-            'contains' => new LikeCriteria($column, '%'.$value.'%'),
-            'not_contains' => new LikeCriteria($column, '%'.$value.'%', 'not like'),
-            'starts_with' => new LikeCriteria($column, $value.'%'),
-            'ends_with' => new LikeCriteria($column, '%'.$value),
+            'contains' => new LikeCriteria($column, '%' . $value . '%'),
+            'not_contains' => new LikeCriteria($column, '%' . $value . '%', 'not like'),
+            'starts_with' => new LikeCriteria($column, $value . '%'),
+            'ends_with' => new LikeCriteria($column, '%' . $value),
             'is_true' => new BooleanCriteria($column, true),
             'is_false' => new BooleanCriteria($column, false),
             'is' => new DateCriteria($column, $value, '='),

src/Support/Concerns/WithReportBuilder.php

@@ -7,6 +7,7 @@
 use ACTTraining\QueryBuilder\Support\Columns\DateColumn;
 use ACTTraining\QueryBuilder\Support\Conditions\BooleanCondition;
 use ACTTraining\QueryBuilder\Support\Conditions\DateCondition;
+use ACTTraining\QueryBuilder\Support\Conditions\FloatCondition;
 use ACTTraining\QueryBuilder\Support\Conditions\NumberCondition;
 use ACTTraining\QueryBuilder\Support\Conditions\TextCondition;
 use Livewire\Attributes\Validate;
@@ -99,6 +100,7 @@ public function buildConditions(): array
             }
             $conditions[] = match ($column['type'] ?? null) {
                 'number' => NumberCondition::make($column['label'], $column['key']),
+                'float' => FloatCondition::make($column['label'], $column['key']),
                 'boolean' => BooleanCondition::make($column['label'], $column['key']),
                 'date' => DateCondition::make($column['label'], $column['key']),
                 default => TextCondition::make($column['label'], $column['key'])
@@ -123,4 +125,9 @@ public function loadReportBuilder($id): void
     {
         //
     }
+
+    public function saveToSession(): void
+    {
+        //
+    }
 }

src/Support/Conditions/BaseCondition.php

@@ -17,6 +17,8 @@ class BaseCondition
 
     protected bool $displayValue = true;
 
+    public ?int $factor = null;
+
     public function __construct($key, $label)
     {
         $this->key = $key;

src/Support/Conditions/FloatCondition.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ACTTraining\QueryBuilder\Support\Conditions;
+
+class FloatCondition extends NumberCondition
+{
+    public ?int $factor = 100;
+}