Implemented contains,starts/ends_with in searchCallbacks instead of i… (

#53) * Implemented contains,starts/ends_with in searchCallbacks instead of in getSpecialOperators() * Apply fixes from StyleCI * Pipeline fix * Small fix * Apply fixes from StyleCI --------- Co-authored-by: David <david.katalinic@asseco-see.hr> Co-authored-by: StyleCI Bot <bot@styleci.io>
asseco-voice · Mar 4, 2024 · fd8f5c3 · fd8f5c3
1 parent 531b333
commit fd8f5c3
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 1 deletion.
diff --git a/config/asseco-json-query-builder.php b/config/asseco-json-query-builder.php
@@ -11,13 +11,16 @@
 use Asseco\JsonQueryBuilder\RequestParameters\SearchParameter;
 use Asseco\JsonQueryBuilder\RequestParameters\SoftDeletedParameter;
 use Asseco\JsonQueryBuilder\SearchCallbacks\Between;
+use Asseco\JsonQueryBuilder\SearchCallbacks\Contains;
+use Asseco\JsonQueryBuilder\SearchCallbacks\EndsWith;
 use Asseco\JsonQueryBuilder\SearchCallbacks\Equals;
 use Asseco\JsonQueryBuilder\SearchCallbacks\GreaterThan;
 use Asseco\JsonQueryBuilder\SearchCallbacks\GreaterThanOrEqual;
 use Asseco\JsonQueryBuilder\SearchCallbacks\LessThan;
 use Asseco\JsonQueryBuilder\SearchCallbacks\LessThanOrEqual;
 use Asseco\JsonQueryBuilder\SearchCallbacks\NotBetween;
 use Asseco\JsonQueryBuilder\SearchCallbacks\NotEquals;
+use Asseco\JsonQueryBuilder\SearchCallbacks\StartsWith;
 use Asseco\JsonQueryBuilder\Types\BooleanType;
 use Asseco\JsonQueryBuilder\Types\GenericType;
 
@@ -51,6 +54,9 @@
         Equals::class,
         LessThan::class,
         GreaterThan::class,
+        Contains::class,
+        StartsWith::class,
+        EndsWith::class,
     ],
 
     /**

diff --git a/src/SearchCallbacks/AbstractCallback.php b/src/SearchCallbacks/AbstractCallback.php
@@ -138,6 +138,66 @@ protected function betweenCallback(Builder $builder, string $column, Categorized
         $builder->{$callback}($column, [$values->and[0], $values->and[1]]);
     }
 
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @param  string  $operator
+     *
+     * @throws JsonQueryBuilderException
+     */
+    protected function containsCallback(Builder $builder, string $column, CategorizedValues $values, string $operator)
+    {
+        if ($values->andLike) {
+            $builder->where($column, $this->getLikeOperator(), '%' . $values->andLike[0] . '%');
+        }
+        if ($values->and) {
+            foreach ($values->and as $andValue) {
+                $builder->orWhere($column, $this->getLikeOperator(), '%' . $andValue . '%');
+            }
+        }
+    }
+
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @param  string  $operator
+     *
+     * @throws JsonQueryBuilderException
+     */
+    protected function endsWithCallback(Builder $builder, string $column, CategorizedValues $values, string $operator)
+    {
+        if ($values->andLike) {
+            $builder->where($column, $this->getLikeOperator(), '%' . $values->andLike[0]);
+        }
+        if ($values->and) {
+            foreach ($values->and as $andValue) {
+                $builder->orWhere($column, $this->getLikeOperator(), '%' . $andValue);
+            }
+        }
+    }
+
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @param  string  $operator
+     *
+     * @throws JsonQueryBuilderException
+     */
+    protected function startsWithCallback(Builder $builder, string $column, CategorizedValues $values, string $operator)
+    {
+        if ($values->andLike) {
+            $builder->where($column, $this->getLikeOperator(), $values->andLike[0] . '%');
+        }
+        if ($values->and) {
+            foreach ($values->and as $andValue) {
+                $builder->orWhere($column, $this->getLikeOperator(), $andValue . '%');
+            }
+        }
+    }
+
     /**
      * Should throw exception if anything except '$values->and' is filled out.
      *

diff --git a/src/SearchCallbacks/Contains.php b/src/SearchCallbacks/Contains.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Asseco\JsonQueryBuilder\SearchCallbacks;
+
+use Asseco\JsonQueryBuilder\CategorizedValues;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+
+class Contains extends AbstractCallback
+{
+    public static function operator(): string
+    {
+        return 'contains';
+    }
+
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function execute(Builder $builder, string $column, CategorizedValues $values): void
+    {
+        $this->containsCallback($builder, $column, $values, 'contains');
+    }
+}
diff --git a/src/SearchCallbacks/EndsWith.php b/src/SearchCallbacks/EndsWith.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Asseco\JsonQueryBuilder\SearchCallbacks;
+
+use Asseco\JsonQueryBuilder\CategorizedValues;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+
+class EndsWith extends AbstractCallback
+{
+    public static function operator(): string
+    {
+        return 'ends_with';
+    }
+
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function execute(Builder $builder, string $column, CategorizedValues $values): void
+    {
+        $this->endsWithCallback($builder, $column, $values, 'ends_with');
+    }
+}
diff --git a/src/SearchCallbacks/StartsWith.php b/src/SearchCallbacks/StartsWith.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Asseco\JsonQueryBuilder\SearchCallbacks;
+
+use Asseco\JsonQueryBuilder\CategorizedValues;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+
+class StartsWith extends AbstractCallback
+{
+    public static function operator(): string
+    {
+        return 'starts_with';
+    }
+
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function execute(Builder $builder, string $column, CategorizedValues $values): void
+    {
+        $this->startsWithCallback($builder, $column, $values, 'starts_with');
+    }
+}
diff --git a/tests/Unit/Config/OperatorsConfigTest.php b/tests/Unit/Config/OperatorsConfigTest.php
@@ -34,7 +34,7 @@ public function returns_registered_operators()
     {
         $operatorsConfig = new OperatorsConfig();
 
-        $expected = ['!<>', '<=', '>=', '<>', '!=', '=', '<', '>'];
+        $expected = ['!<>', '<=', '>=', '<>', '!=', '=', '<', '>', 'contains', 'starts_with', 'ends_with'];
 
         $this->assertEquals($expected, $operatorsConfig->getOperators());
     }