Handle duplicate wikis on event creation

wikimedia · Apr 30, 2018 · 2f4f161 · 2f4f161
1 parent 00bc3fb
commit 2f4f161
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/AppBundle/Controller/EventController.php b/src/AppBundle/Controller/EventController.php
@@ -319,7 +319,9 @@ function ($wikiObjects) {
                 }, $wikis);
             },
             function ($wikis) use ($event, $eventWikiRepo) {
-                return $this->normalizeEventWikis($wikis, $event, $eventWikiRepo);
+                return array_filter(
+                    $this->normalizeEventWikis($wikis, $event, $eventWikiRepo)
+                );
             }
         );
     }
@@ -337,6 +339,11 @@ private function normalizeEventWikis($wikis, Event $event, EventWikiRepository $
     {
         return array_map(function ($wiki) use ($event, $eventWikiRepo) {
             $domain = $eventWikiRepo->getDomainFromEventWikiInput($wiki);
+
+            if ($event->hasWikiWithDomain($domain)) {
+                return null;
+            }
+
             $eventWiki = $eventWikiRepo->findOneBy([
                 'event' => $event,
                 'domain' => $domain,

diff --git a/src/AppBundle/Model/Event.php b/src/AppBundle/Model/Event.php
@@ -549,6 +549,18 @@ public function removeWiki(EventWiki $wiki)
         $this->wikis->removeElement($wiki);
     }
 
+    /**
+     * Does the Event have a wiki with the given domain?
+     * @param  string $domain Must be the normalized form, e.g. en.wikipedia, *.wikipedia
+     * @return bool
+     */
+    public function hasWikiWithDomain($domain)
+    {
+        return $this->wikis->filter(function ($wiki) use ($domain) {
+            return $domain === $wiki->getDomain();
+        })->count() > 0;
+    }
+
     /***************
      * WIKI FAMILY *
      ***************/

diff --git a/tests/AppBundle/Model/EventTest.php b/tests/AppBundle/Model/EventTest.php
@@ -191,6 +191,7 @@ public function testAddRemoveWiki()
         $event->addWiki($wiki);
 
         $this->assertEquals($wiki, $event->getWikis()[0]);
+        $this->assertTrue($event->hasWikiWithDomain('testwiki'));
 
         // Try adding the same one, which shouldn't duplicate.
         $event->addWiki($wiki);
@@ -199,6 +200,7 @@ public function testAddRemoveWiki()
         // Removing the wiki.
         $event->removeWiki($wiki);
         $this->assertEquals(0, count($event->getWikis()));
+        $this->assertFalse($event->hasWikiWithDomain('testwiki'));
 
         // Double-remove shouldn't error out.
         $event->removeWiki($wiki);