Updating element api to return no elements if resource type or topics…

… don't exist or blog categories does not exist
imarc · Apr 5, 2022 · 8ce617b · 8ce617b
1 parent 9a7bfdb
commit 8ce617b
Showing 1 changed file with 34 additions and 16 deletions.
diff --git a/config/element-api.php b/config/element-api.php
@@ -85,31 +85,49 @@
             $resourceType  = Craft::$app->request->getQueryParam('type');
             $resourceTopic = Craft::$app->request->getQueryParam('topic');
 
-
-            if ($resourceType && $resourceTopic) {
-                $relatedTo[] = 'and';
-            }
+            $topicCategories = [];
+            $typeCategories = [];
+            $paramCount = 0;
 
             if ($resourceType) {
-                $category = Category::findOne([
-                    'group' => 'resourceTypes',
-                    'slug' => $resourceType
-                ]);
+                $resourceTypes = explode(',', $resourceType);
+                foreach ($resourceTypes as $type) {
+                    $category = Category::findOne([
+                        'group' => 'resourceTypes',
+                        'slug' => $type
+                    ]);
+                    if ($category) {
+                        $typeCategories[] = $category;
+                    }
+                }
 
-                $relatedTo[] = ["targetElement" => $category];
+                $paramCount++;
             }    
 
             if ($resourceTopic) {
-                $category = Category::findOne([
-                    'group' => 'resourceTopics',
-                    'slug' => $resourceTopic
-                ]);
-
-                $relatedTo[] = ["targetElement" => $category];
+                $resourceTopics = explode(',', $resourceTopic);
+                foreach ($resourceTopics as $topic) {
+                    $category = Category::findOne([
+                        'group' => 'resourceTopics',
+                        'slug' => $topic
+                    ]);
+                    if ($category) {
+                        $topicCategories[] = $category;
+                    }
+                }
+                $paramCount++;
             }
 
-            $criteria['relatedTo'] = $relatedTo;
+            if ($paramCount > 1) {
+                $relatedTo[] = 'and';
+            }
 
+            if ($resourceType || $resourceTopic) {
+                $relatedTo[] = ["targetElement" => $typeCategories];
+                $relatedTo[] = ["targetElement" => $topicCategories];
+                $criteria['relatedTo'] = $relatedTo;
+            }
+
             return [
                 'criteria' => $criteria,
                 'transformer' => function(Entry $entry) {