From 7cf9bcc94c0765e38aa8a4c8a69afaf46258857a Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Mon, 22 Apr 2024 08:36:54 +0200
Subject: [PATCH] Revert "new: [event:index] Added support of ANDed tag
 filtering in the backend"

This reverts commit fc922910929e7bbaf2a89c2e3387c3f743910549.
---
 app/Controller/EventsController.php | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 418a40cce..4e695ac67 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -497,11 +497,6 @@ class EventsController extends AppController
                         continue 2;
                     }
                     $pieces = is_array($v) ? $v : explode('|', $v);
-                    $isANDed = false;
-                    if (count($pieces) == 1 && strpos($pieces[0], '&') !== -1) {
-                        $pieces = explode('&', $v);
-                        $isANDed = count($pieces) > 1;
-                    }
                     $filterString = "";
                     $expectOR = false;
                     $tagRules = [];
@@ -568,19 +563,10 @@ class EventsController extends AppController
                     }
 
                     if (!empty($tagRules['include'])) {
-                        if ($isANDed) {
-                            $include = $this->Event->EventTag->find('column', array(
-                                'conditions' => ['EventTag.tag_id' => $tagRules['include']],
-                                'fields' => ['EventTag.event_id'],
-                                'group' => ['EventTag.event_id'],
-                                'having' => ['COUNT(*) =' => count($tagRules['include'])],
-                            ));
-                        } else {
-                            $include = $this->Event->EventTag->find('column', array(
-                                'conditions' => array('EventTag.tag_id' => $tagRules['include']),
-                                'fields' => ['EventTag.event_id'],
-                            ));
-                        }
+                        $include = $this->Event->EventTag->find('column', array(
+                            'conditions' => array('EventTag.tag_id' => $tagRules['include']),
+                            'fields' => ['EventTag.event_id'],
+                        ));
                         if (!empty($include)) {
                             $this->paginate['conditions']['AND'][] = 'Event.id IN (' . implode(",", $include) . ')';
                         } else {