Added whereAll filter condition argument

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 4.6.0 - 2024.10.29
+### Added
+* Added `whereAll` argument which accepts stringified JSON `whereIn` conditions as an array of strings and filters by all conditions
+
 ## 4.5.1 - 2024.9.24
 ### Fixed
 * The `whereIn` and `whereNotIn` argument methods now are case-insensitive

composer.json

@@ -2,7 +2,7 @@
   "name": "lsst-epo/canto-dam-assets",
   "description": "This Craft CMS plugin adds a Field Type with GraphQL support for the Canto Digital Asset Management (DAM) web system",
   "type": "craft-plugin",
-  "version": "4.5.1",
+  "version": "4.6.0",
   "license": "MIT",
   "require": {
     "php": ">=8.0.2",

src/fields/CantoDamAsset.php

@@ -376,6 +376,19 @@ protected function getGqlArguments(): array
                 'description' => 'Return items from the collection where the given key is not null. You can use the `field.subField` syntax for nested fields.',
                 'type' => Type::string(),
             ],
+            'whereAll' => [
+                'name' => 'whereAll',
+                'description' => 'A container field for multiple where args',
+                'type' => new InputObjectType([
+                    'name' => 'WhereAllFilterInput',
+                    'fields' => [
+                        'filters' => [
+                            'type' => Type::listOf(Type::string()),
+                            'description' => 'A list of JSON strings representing whereIn conditions to filter by.'
+                        ]
+                    ]
+                ])
+            ],
             'whereIn' => [
                 'name' => 'whereIn',
                 'description' => 'Filter items such that the value of the given key is in the array of values provided.  (See https://laravel.com/docs/10.x/collections#method-wherein).',

src/gql/resolvers/CantoDamAssetResolver.php

@@ -2,6 +2,7 @@
 
 namespace lsst\cantodamassets\gql\resolvers;
 
+use Craft;
 use craft\base\ElementInterface;
 use craft\gql\base\Resolver;
 use GraphQL\Type\Definition\ResolveInfo;
@@ -16,6 +17,10 @@
             'args' => ['whereContainsIn'],
             'method' => 'whereContainsInArgs',
         ],
+        [
+            'args' => ['whereAll'],
+            'method' => 'whereAllArgs',
+        ],
         [
             'args' => ['where'],
             'method' => 'whereArgs',
@@ -50,7 +55,8 @@
         ],
     ];
 
-    public static function resolve(mixed $source, array $arguments, mixed $context, ResolveInfo $resolveInfo): mixed
+    // public static function resolve(mixed $source, array $arguments, mixed $context, ResolveInfo $resolveInfo): mixed
+    public static function resolve(mixed $source, mixed $arguments, mixed $context, ResolveInfo $resolveInfo): mixed
     {
         /** @var ElementInterface $source */
         $fieldName = $resolveInfo->fieldName;
@@ -64,7 +70,8 @@
         return static::applyArguments($cantoFieldData->cantoAssetData, $arguments);
     }
 
-    protected static function applyArguments(Collection $collection, array $arguments): Collection
+    //protected static function applyArguments(Collection $collection, array $arguments): Collection
+    protected static function applyArguments(Collection $collection, mixed $arguments): Collection
     {
         foreach (static::$argsList as $argList) {
             foreach ($argList['args'] as $arg) {
@@ -86,12 +93,19 @@
         );
     }
 
+    protected static function whereAllArgs(Collection $collection, array $arguments, string $arg): Collection
+    {
+        return $collection->$arg(
+            $arguments[$arg]
+        );
+    }
+
     protected static function whereArgs(Collection $collection, array $arguments, string $arg): Collection
     {
         return $collection->$arg(
             $arguments[$arg]['key'] ?? null,
             $arguments[$arg]['operator'] ?? null,
-            $arguments[$arg]['value'] ?? null
+            strtolower($arguments[$arg]['value']) ?? null
         );
     }
 
@@ -126,4 +140,11 @@
     {
         return new Collection([$collection->$arg(null)]);
     }
+
+    protected static function nestedLowercase($value) {
+        if (is_array($value)) {
+            return array_map('nestedLowercase', $value);
+        }
+        return strtolower($value);
+    }
 }

src/gql/types/CantoDamAssetType.php

@@ -2,6 +2,7 @@
 
 namespace lsst\cantodamassets\gql\types;
 
+use Craft;
 use craft\gql\base\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 use lsst\cantodamassets\gql\interfaces\CantoDamAssetInterface;

src/gql/types/generators/CantoDamAssetGenerator.php

@@ -2,6 +2,7 @@
 
 namespace lsst\cantodamassets\gql\types\generators;
 
+use Craft;
 use craft\gql\base\GeneratorInterface;
 use craft\gql\GqlEntityRegistry;
 use craft\gql\TypeLoader;
@@ -28,7 +29,6 @@ public static function generateTypes(mixed $context = null): array
         TypeLoader::registerType($typeName, function() use ($cantoDamAssetType) {
             return $cantoDamAssetType;
         });
-
         return $gqlTypes;
     }
 

src/lib/laravel/Collection.php

@@ -71,7 +71,6 @@ public function whereContainsIn($keys, $value): Collection
     public function whereIn($key, $values, $strict = false)
     {
         $values = $this->getArrayableItems($values);
-
         return $this->filter(function($item) use ($key, $values, $strict) {
             $item = data_get($item, $key);
             // Handle the case where the data is an array of items
@@ -82,6 +81,18 @@ public function whereIn($key, $values, $strict = false)
         });
     }
 
+    public function whereAll(array $keyValues) {
+        $whereAllArr = $this;
+        foreach($keyValues as $filters) {
+            foreach($filters as $filter) {
+                $filter = str_replace("'", '"', $filter );
+                $filter_decoded = json_decode($filter, true);
+                $whereAllArr = $whereAllArr->whereIn($filter_decoded["key"], $filter_decoded["values"]);
+            }
+        }
+        return $whereAllArr;
+    }
+
     /**
      * Filter items by the given key value pair.
      *