Fix ShowListener for multiple socs. Fixes #191

camdram · Dec 7, 2018 · 68c8cc8 · 68c8cc8
1 parent 5e1bebb
commit 68c8cc8
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/Acts/CamdramBundle/EventListener/ShowListener.php b/src/Acts/CamdramBundle/EventListener/ShowListener.php
@@ -75,12 +75,20 @@ private function sendChangeEmails(Show $show, PreUpdateEventArgs $event)
     {
         $authorisationEmailSent = false;
 
-        if ($event->hasChangedField('society') && ! $show->getSocieties()->isEmpty()) {
-            if ($show->getAuthorised()) {
-                $this->moderationManager->notifySocietyChanged($show);
-            } else {
-                $this->moderationManager->autoApproveOrEmailModerators($show);
-                $authorisationEmailSent = true;
+        if ($event->hasChangedField('societies_display_list') && ! $show->getSocieties()->isEmpty()) {
+            // Can't access changes to the societies Association here, so
+            // it's neccessary to parse the JSON.
+            $socs_data = array_map('json_decode', $event->getEntityChangeSet()['societies_display_list']);
+            if (is_array($socs_data[0]) && is_array($socs_data[1])) {
+                $socs_data = [array_filter($socs_data[0], 'is_int'), array_filter($socs_data[1], 'is_int')];
+                if (array_diff($socs_data[0], $socs_data[1]) || array_diff($socs_data[1], $socs_data[0])) {
+                    if ($show->getAuthorised()) {
+                        $this->moderationManager->notifySocietyChanged($show);
+                    } else {
+                        $this->moderationManager->autoApproveOrEmailModerators($show);
+                        $authorisationEmailSent = true;
+                    }
+                }
             }
         }