From bc4ce0a5d7e4e3c3a3e9254d91f53ecbbc39c373 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Thu, 20 Jan 2022 23:04:27 -0600
Subject: [PATCH 01/20] Make all the deck routes work for ids and uuids.

---
 .../Controller/BuilderController.php          | 194 ++++++++++++++----
 src/AppBundle/Controller/SocialController.php |  71 ++++++-
 src/AppBundle/Resources/config/routing.yml    |  77 ++++++-
 3 files changed, 289 insertions(+), 53 deletions(-)

diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 7d22c143..f0defe61 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -401,6 +401,21 @@ public function meteorimportAction(Request $request, EntityManagerInterface $ent
         return $this->redirect($this->generateUrl('decks_list'));
     }
 
+    /**
+     * @param Deck $deck
+     * @param Judge $judge
+     * @param CardsData $cardsData
+     * @return Response
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
+     */
+    public function textExportByUuidAction(Deck $deck, Judge $judge, CardsData $cardsData)
+    {
+        return $this->textExport($deck, $judge, $cardsData);
+    }
+
     /**
      * @param Deck $deck
      * @param Judge $judge
@@ -411,7 +426,20 @@ public function meteorimportAction(Request $request, EntityManagerInterface $ent
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
      */
-    public function textexportAction(Deck $deck, Judge $judge, CardsData $cardsData)
+    public function textExportByIdAction(Deck $deck, Judge $judge, CardsData $cardsData)
+    {
+        return $this->textExport($deck, $judge, $cardsData);
+    }
+
+    /**
+     * @param Deck $deck
+     * @param Judge $judge
+     * @param CardsData $cardsData
+     * @return Response
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     */
+    public function textExport(Deck $deck, Judge $judge, CardsData $cardsData)
     {
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
@@ -543,6 +571,19 @@ public function textexportAction(Deck $deck, Judge $judge, CardsData $cardsData)
         return $response;
     }
 
+    /**
+     * @param Deck $deck
+     * @return Response
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
+     */
+    public function octgnExportByUuidAction(Deck $deck)
+    {
+        return $this->octgnExport($deck);
+    }
+
     /**
      * @param Deck $deck
      * @return Response
@@ -551,7 +592,16 @@ public function textexportAction(Deck $deck, Judge $judge, CardsData $cardsData)
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
      */
-    public function octgnexportAction(Deck $deck)
+    public function octgnExportByIdAction(Deck $deck)
+    {
+        return $this->octgnExport($deck);
+    }
+
+    /**
+     * @param Deck $deck
+     * @return Response
+     */
+    public function octgnExport(Deck $deck)
     {
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
@@ -583,24 +633,14 @@ public function octgnexportAction(Deck $deck)
             return new Response('no identity found');
         }
 
-        return $this->octgnexport("$name.o8d", $identity, $rd, $deck->getDescription());
-    }
+        $filename = "$name.o8d";
 
-    /**
-     * @param string $filename
-     * @param array $identity
-     * @param array  $rd
-     * @param string $description
-     * @return Response
-     */
-    public function octgnexport(string $filename, array $identity, array $rd, string $description)
-    {
         $content = $this->renderView(
             '/octgn.xml.twig',
             [
                 "identity"    => $identity,
                 "rd"          => $rd,
-                "description" => strip_tags($description),
+                "description" => strip_tags($deck->getDescription()),
             ]
         );
 
@@ -735,18 +775,8 @@ public function deleteListAction(Request $request, EntityManagerInterface $entit
         return $this->redirect($this->generateUrl('decks_list'));
     }
 
-    /**
-     * @param int                    $deck_id
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     */
-    public function editAction(int $deck_id, EntityManagerInterface $entityManager)
-    {
-        $dbh = $entityManager->getConnection();
-        $rows = $dbh->executeQuery("
+    private function editQueryBase() {
+        return "
             SELECT
               d.id,
               d.name,
@@ -762,10 +792,13 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
               LEFT JOIN mwl m ON d.mwl_id=m.id
               LEFT JOIN user u ON d.user_id=u.id
               LEFT JOIN side s ON d.side_id=s.id
-            WHERE d.id=?
-              ", [
-            $deck_id,
-        ])->fetchAll();
+        ";
+    }
+
+    private function edit(EntityManagerInterface $entityManager, array $queryWithArgs)
+    {
+        $dbh = $entityManager->getConnection();
+        $rows = $dbh->executeQuery($queryWithArgs[0], $queryWithArgs[1])->fetchAll();
 
         $deck = $rows[0];
 
@@ -782,7 +815,7 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
             FROM deckslot s
               JOIN card c ON s.card_id=c.id
             WHERE s.deck_id=?", [
-            $deck_id,
+            $deck['id'],
         ])->fetchAll();
 
         $cards = [];
@@ -799,7 +832,7 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
               c.saved
             FROM deckchange c
             WHERE c.deck_id=? AND c.saved=1
-            ORDER BY date_creation DESC", [$deck_id])->fetchAll();
+            ORDER BY date_creation DESC", [$deck['id']])->fetchAll();
 
         // recreating the versions with the variation info, starting from $preversion
         $preversion = $cards;
@@ -840,7 +873,7 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
               c.saved
             FROM deckchange c
             WHERE c.deck_id=? AND c.saved=0
-            ORDER BY date_creation ASC", [$deck_id])->fetchAll();
+            ORDER BY date_creation ASC", [$deck['id']])->fetchAll();
 
         // recreating the snapshots with the variation info, starting from $postversion
         $postversion = $cards;
@@ -886,7 +919,7 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
              ORDER BY d.date_creation ASC",
 
             [
-                $deck_id,
+                $deck['id'],
             ]
 
         )->fetchAll();
@@ -905,7 +938,7 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
              ORDER BY d.date_creation ASC",
 
             [
-                $deck_id,
+                $deck['id'],
             ]
 
         )->fetchAll();
@@ -924,6 +957,32 @@ public function editAction(int $deck_id, EntityManagerInterface $entityManager)
         );
     }
 
+    /**
+     * @param string                    $deck_uuid
+     * @param EntityManagerInterface    $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     */
+    public function editByUuidAction(string $deck_uuid, EntityManagerInterface $entityManager)
+    {
+        return $this->edit($entityManager, [$this->editQueryBase() . " WHERE d.uuid = ?", [$deck_uuid]]);
+    }
+
+    /**
+     * @param int                    $deck_id
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     */
+    public function editByIdAction(int $deck_id, EntityManagerInterface $entityManager)
+    {
+        return $this->edit($entityManager, [$this->editQueryBase() . " WHERE d.id= ?", [$deck_id]]);
+    }
+
     public function viewByIdAction(int $deck_id, EntityManagerInterface $entityManager, Judge $judge) {
         $dbh = $entityManager->getConnection();
         $rows = $dbh->executeQuery("
@@ -1150,6 +1209,43 @@ public function copyAction(Decklist $decklist)
         );
     }
 
+    /**
+     * @param Deck $deck
+     * @return Response
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
+     */
+    public function duplicateByUuidAction(Deck $deck)
+    {
+        if ($this->getUser()->getId() != $deck->getUser()->getId()) {
+            throw $this->createAccessDeniedException();
+        }
+
+        $content = [];
+        foreach ($deck->getSlots() as $slot) {
+            $content[$slot->getCard()->getCode()] = $slot->getQuantity();
+        }
+        $description = strlen($deck->getDescription()) > 0 ? ("Original deck notes:\n\n" . $deck->getDescription()) : '';
+
+        $mwl = $deck->getMwl();
+        if ($mwl instanceof Mwl) {
+            $mwl = $mwl->getCode();
+        }
+
+        return $this->forward(
+            'AppBundle:Builder:save',
+            [
+                'name'        => $deck->getName() . ' (copy)',
+                'content'     => json_encode($content),
+                'description' => $description,
+                'deck_id'     => $deck->getParent() ? $deck->getParent()->getId() : null,
+                'mwl_code'    => $mwl,
+            ]
+        );
+    }
+
     /**
      * @param Deck $deck
      * @return Response
@@ -1158,7 +1254,7 @@ public function copyAction(Decklist $decklist)
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
      */
-    public function duplicateAction(Deck $deck)
+    public function duplicateByIdAction(Deck $deck)
     {
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
@@ -1292,8 +1388,27 @@ public function uploadallAction(Request $request, EntityManagerInterface $entity
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
      */
-    public function autosaveAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
+    public function autosaveByIdAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
     {
+		return $this->autosave($deck, $request, $entityManager);
+    }
+
+    /**
+     * @param Deck $deck
+     * @param Request                $request
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
+     */
+    public function autosaveByUuidAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
+    {
+		return $this->autosave($deck, $request, $entityManager);
+    }
+
+	private function autosave(Deck $deck, Request $request, EntityManagerInterface $entityManager) {
         $user = $this->getUser();
 
         if ($user->getId() != $deck->getUser()->getId()) {
@@ -1304,8 +1419,7 @@ public function autosaveAction(Deck $deck, Request $request, EntityManagerInterf
         if (count($diff) != 2) {
             throw new BadRequestHttpException("Wrong content " . $diff);
         }
-
-        if (count($diff[0]) || count($diff[1])) {
+        if (count((array) $diff[0]) || count((array) $diff[1])) {
             $change = new Deckchange();
             $change->setDeck($deck);
             $change->setVariation(json_encode($diff));
@@ -1317,5 +1431,5 @@ public function autosaveAction(Deck $deck, Request $request, EntityManagerInterf
         }
 
         return new Response('');
-    }
+	}
 }
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 7bff4583..5c86e900 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -32,6 +32,67 @@
 class SocialController extends Controller
 {
 
+    /**
+     * This function is used to check if a deck can be published from the deck list page.
+     *
+     * @param Deck $deck
+     * @param EntityManagerInterface $entityManager
+     * @param Judge                  $judge
+     * @return JsonResponse
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
+     */
+    public function publishByUuidAction(Deck $deck, EntityManagerInterface $entityManager, Judge $judge)
+    {
+        $response = new JsonResponse();
+
+        if ($this->getUser()->getId() != $deck->getUser()->getId()) {
+            throw $this->createAccessDeniedException();
+        }
+
+        $analyse = $judge->analyse($deck->getSlots()->toArray());
+
+        if (isset($analyse['problem'])) {
+            $response->setData([
+                'allowed' => false,
+                'message' => $judge->problem($analyse),
+            ]);
+
+            return $response;
+        }
+
+        $new_content = json_encode($deck->getContent());
+        $new_signature = md5($new_content);
+        $old_decklists = $entityManager
+                              ->getRepository('AppBundle:Decklist')
+                              ->findBy([
+                                  'signature' => $new_signature,
+                              ]);
+        foreach ($old_decklists as $decklist) {
+            if (json_encode($decklist->getContent()) == $new_content) {
+                $url = $this->generateUrl('decklist_detail', [
+                    'decklist_id'   => $decklist->getId(),
+                    'decklist_name' => $decklist->getPrettyName(),
+                ]);
+                $response->setData([
+                    'allowed' => true,
+                    'message' => 'This deck is <a href="' . $url . '">already published</a>. Are you sure you want to publish a duplicate?',
+                ]);
+
+                return $response;
+            }
+        }
+
+        $response->setData([
+            'allowed' => true,
+            'message' => '',
+        ]);
+
+        return $response;
+    }
+
     /**
      * This function is used to check if a deck can be published from the deck list page.
      *
@@ -44,7 +105,7 @@ class SocialController extends Controller
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
      */
-    public function publishAction(Deck $deck, EntityManagerInterface $entityManager, Judge $judge)
+    public function publishByIdAction(Deck $deck, EntityManagerInterface $entityManager, Judge $judge)
     {
         $response = new JsonResponse();
 
@@ -643,7 +704,7 @@ public function voteAction(Request $request, EntityManagerInterface $entityManag
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function textexportAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
+    public function textExportAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
     {
         $response = new Response();
         $response->setPublic();
@@ -779,7 +840,7 @@ public function textexportAction(Decklist $decklist, Judge $judge, CardsData $ca
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function octgnexportAction(Decklist $decklist)
+    public function octgnExportAction(Decklist $decklist)
     {
         $response = new Response();
         $response->setPublic();
@@ -811,7 +872,7 @@ public function octgnexportAction(Decklist $decklist)
             return new Response('no identity found');
         }
 
-        return $this->octgnexport("$name.o8d", $identity, $rd, $decklist->getRawdescription(), $response);
+        return $this->octgnExport("$name.o8d", $identity, $rd, $decklist->getRawdescription(), $response);
     }
 
     /**
@@ -822,7 +883,7 @@ public function octgnexportAction(Decklist $decklist)
      * @param Response $response
      * @return Response
      */
-    public function octgnexport(string $filename, array $identity, array $rd, string $description, Response $response)
+    public function octgnExport(string $filename, array $identity, array $rd, string $description, Response $response)
     {
         $content = $this->renderView('/octgn.xml.twig', [
             "identity"    => $identity,
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 3954af65..788488cf 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -38,12 +38,22 @@ deck_edit:
     path: /{_locale}/deck/edit/{deck_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:edit
+        _controller: AppBundle:Builder:editById
         _locale: en
     requirements:
         _locale: \w\w
         deck_id: \d+
 
+deck_edit_by_uuid:
+    path: /{_locale}/deck/edit/{deck_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Builder:editByUuid
+        _locale: en
+    requirements:
+        _locale: \w\w
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 deck_view:
     path: /{_locale}/deck/view/{deck_id}
     methods: [GET]
@@ -68,12 +78,22 @@ deck_duplicate:
     path: /{_locale}/deck/duplicate/{deck_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:duplicate
+        _controller: AppBundle:Builder:duplicateById
         _locale: en
     requirements:
         _locale: \w\w
         deck_id: \d+
 
+deck_duplicate_by_uuid:
+    path: /{_locale}/deck/duplicate/{deck_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Builder:duplicateByUuid
+        _locale: en
+    requirements:
+        _locale: \w\w
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decks_list:
     path: /{_locale}/decks
     methods: [GET]
@@ -87,14 +107,31 @@ deck_publish:
     path: /deck/can_publish/{deck_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:publish
+        _controller: AppBundle:Social:publishById
+    requirements:
         deck_id: \d+
 
+deck_publish_by_uuid:
+    path: /deck/can_publish/{deck_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Social:publishByUuid
+    requirements:
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 deck_autosave:
     path: /deck/autosave/{deck_id}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Builder:autosave
+        _controller: AppBundle:Builder:autosaveById
+
+deck_autosave_by_uuid:
+    path: /deck/autosave/{deck_uuid}
+    methods: [POST]
+    defaults:
+        _controller: AppBundle:Builder:autosaveByUuid
+    requirements:
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 deck_delete:
     path: /{_locale}/deck/delete
@@ -157,18 +194,35 @@ deck_export_octgn:
     path: /deck/export/octgn/{deck_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:octgnexport
+        _controller: AppBundle:Builder:octgnExportById
     requirements:
         deck_id: \d+
 
+deck_export_octgn_by_uuid:
+    path: /deck/export/octgn/{deck_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Builder:octgnExportByUuid
+    requirements:
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 deck_export_text:
     path: /deck/export/text/{deck_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:textexport
+        _controller: AppBundle:Builder:textExportById
     requirements:
         deck_id: \d+
 
+deck_export_text_by_uuid:
+    path: /deck/export/text/{deck_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Builder:textExportByUuid
+    requirements:
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
+# XXX
 deck_copy:
     path: /{_locale}/deck/copy/{decklist_id}
     methods: [POST]
@@ -179,19 +233,21 @@ deck_copy:
         _locale: \w\w
         decklist_id: \d+
 
+# XXX
 decklist_export_octgn:
     path: /decklist/export/octgn/{decklist_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:octgnexport
+        _controller: AppBundle:Social:octgnExport
     requirements:
         decklist_id: \d+
 
+# XXX
 decklist_export_text:
     path: /decklist/export/text/{decklist_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:textexport
+        _controller: AppBundle:Social:textExport
     requirements:
         decklist_id: \d+
 
@@ -226,6 +282,7 @@ decklists_list:
         _locale: \w\w
         page: \d+
 
+# XXX
 decklist_detail:
     path: /{_locale}/decklist/{decklist_id}/{decklist_name}
     methods: [GET]
@@ -237,6 +294,7 @@ decklist_detail:
         _locale: \w\w
         decklist_id: \d+
 
+# XXX
 decklist_detail_no_name:
     path: /{_locale}/decklist/{decklist_id}
     methods: [GET]
@@ -271,6 +329,7 @@ decklist_comment_hide:
     defaults:
         _controller: AppBundle:Social:hidecomment
 
+# XXX
 decklist_edit:
     path: /decklist/edit/{decklist_id}
     methods: [POST]
@@ -279,6 +338,7 @@ decklist_edit:
     requirements:
         decklist_id: \d+
 
+# XXX
 decklist_delete:
     path: /decklist/delete/{decklist_id}
     methods: [POST]
@@ -801,6 +861,7 @@ cards_sets:
     requirements:
         _locale: \w\w
 
+# XXX
 decklist_moderate:
     path: /decklist/moderate/{decklist_id}/{status}/{modflag_id}
     methods: [POST]

From e53cbd6bec271d9145065e675d39d9c8b6905189 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Thu, 20 Jan 2022 23:10:55 -0600
Subject: [PATCH 02/20] Make decklist copy work by UUID as well.

---
 .../Controller/BuilderController.php          | 28 +++++++++++++++----
 src/AppBundle/Resources/config/routing.yml    | 13 +++++++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index f0defe61..266460ae 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -1190,7 +1190,25 @@ public function listAction(EntityManagerInterface $entityManager, DeckManager $d
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function copyAction(Decklist $decklist)
+    public function copyByIdAction(Decklist $decklist)
+    {
+        return $this->copy($decklist);
+    }
+
+    /**
+     * @param Decklist $decklist
+     * @return Response
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
+     */
+    public function copyByUuidAction(Decklist $decklist)
+    {
+        return $this->copy($decklist);
+    }
+
+    private function copy(Decklist $decklist)
     {
         $content = [];
         foreach ($decklist->getSlots() as $slot) {
@@ -1390,7 +1408,7 @@ public function uploadallAction(Request $request, EntityManagerInterface $entity
      */
     public function autosaveByIdAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
     {
-		return $this->autosave($deck, $request, $entityManager);
+        return $this->autosave($deck, $request, $entityManager);
     }
 
     /**
@@ -1405,10 +1423,10 @@ public function autosaveByIdAction(Deck $deck, Request $request, EntityManagerIn
      */
     public function autosaveByUuidAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
     {
-		return $this->autosave($deck, $request, $entityManager);
+        return $this->autosave($deck, $request, $entityManager);
     }
 
-	private function autosave(Deck $deck, Request $request, EntityManagerInterface $entityManager) {
+    private function autosave(Deck $deck, Request $request, EntityManagerInterface $entityManager) {
         $user = $this->getUser();
 
         if ($user->getId() != $deck->getUser()->getId()) {
@@ -1431,5 +1449,5 @@ private function autosave(Deck $deck, Request $request, EntityManagerInterface $
         }
 
         return new Response('');
-	}
+    }
 }
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 788488cf..345cba98 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -222,17 +222,26 @@ deck_export_text_by_uuid:
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-# XXX
 deck_copy:
     path: /{_locale}/deck/copy/{decklist_id}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Builder:copy
+        _controller: AppBundle:Builder:copyById
         _locale: en
     requirements:
         _locale: \w\w
         decklist_id: \d+
 
+deck_copy_by_uuid:
+    path: /{_locale}/deck/copy/{decklist_uuid}
+    methods: [POST]
+    defaults:
+        _controller: AppBundle:Builder:copyByUuid
+        _locale: en
+    requirements:
+        _locale: \w\w
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 # XXX
 decklist_export_octgn:
     path: /decklist/export/octgn/{decklist_id}

From 1510342b3c9974120a437e837be0b1abf4cec7d2 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Fri, 21 Jan 2022 00:11:16 -0600
Subject: [PATCH 03/20] Update remaining decklist methods to have UUID version

---
 src/AppBundle/Controller/SocialController.php | 203 ++++++++++++++----
 src/AppBundle/Resources/config/routing.yml    |  84 ++++++--
 2 files changed, 228 insertions(+), 59 deletions(-)

diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 5c86e900..9093a332 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -196,8 +196,8 @@ public function newAction(Request $request, EntityManagerInterface $entityManage
 
         $decklist = new Decklist();
         // Note: We are doing the naive thing and just assuming we won't collide.
-		// If there is a collision, there will be an error returned to the user.
-		// Sorry, users!  v2 will be nicer to you!
+        // If there is a collision, there will be an error returned to the user.
+        // Sorry, users!  v2 will be nicer to you!
         $decklist->setUuid(Uuid::uuid4()->toString());
         $decklist->setName($name);
         $decklist->setPrettyname(preg_replace('/[^a-z0-9]+/', '-', mb_strtolower($name)));
@@ -260,21 +260,9 @@ public function newAction(Request $request, EntityManagerInterface $entityManage
         );
     }
 
-    /**
-     * @param int                    $decklist_id
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     */
-    public function viewAction(int $decklist_id, EntityManagerInterface $entityManager)
-    {
-        $response = new Response();
-        $response->setPublic();
-        $response->setMaxAge($this->getParameter('short_cache'));
-
-        $dbh = $entityManager->getConnection();
-        $rows = $dbh->executeQuery(
-            "SELECT
+    private function getViewQueryBase() {
+        return 
+            ["SELECT
                d.id,
                d.date_update,
                d.name,
@@ -304,19 +292,58 @@ public function viewAction(int $decklist_id, EntityManagerInterface $entityManag
                JOIN card c ON d.identity_id=c.id
                JOIN faction f ON d.faction_id=f.id
                LEFT JOIN tournament t ON d.tournament_id=t.id
-             WHERE d.id=?
-               AND d.moderation_status IN (0,1,2)
-               ",
-            [
-                $decklist_id,
-            ]
+             WHERE ",
+             "AND d.moderation_status IN (0,1,2)"];
+    }
+
+    /**
+     * @param int                    $decklist_id
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function viewByIdAction(int $decklist_id, EntityManagerInterface $entityManager)
+    {
+        $dbh = $entityManager->getConnection();
+        $viewQueryBase = $this->getViewQueryBase();
+        $rows = $dbh->executeQuery(
+            $viewQueryBase[0] . " d.id = ?" . $viewQueryBase[1], [$decklist_id]
+        )->fetchAll();
+
+        return $this->view($rows, $entityManager);
+    }
+
+    /**
+     * @param string                    $decklist_uuid
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function viewByUuidAction(string $decklist_uuid, EntityManagerInterface $entityManager)
+    {
+        $dbh = $entityManager->getConnection();
+        $viewQueryBase = $this->getViewQueryBase();
+        $rows = $dbh->executeQuery(
+            $viewQueryBase[0] . " d.uuid = ?" . $viewQueryBase[1], [$decklist_uuid]
         )->fetchAll();
 
+        return $this->view($rows, $entityManager);
+    }
+
+    private function view(array $rows, EntityManagerInterface $entityManager)
+    {
+        $response = new Response();
+        $response->setPublic();
+        $response->setMaxAge($this->getParameter('short_cache'));
+
         if (empty($rows)) {
             throw $this->createNotFoundException();
         }
 
+        $dbh = $entityManager->getConnection();
+
         $decklist = $rows[0];
+        $decklist_id = $decklist['id'];
 
         $comments = $dbh->executeQuery(
             "SELECT
@@ -704,7 +731,25 @@ public function voteAction(Request $request, EntityManagerInterface $entityManag
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function textExportAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
+    public function textExportByIdAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
+    {
+        return $this->textExport($decklist, $judge, $cardsData);
+    }
+
+    /**
+     * @param Decklist $decklist
+     * @param Judge $judge
+     * @param CardsData $cardsData
+     * @return Response
+     *
+     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
+     */
+    public function textExportByUuidAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
+    {
+        return $this->textExport($decklist, $judge, $cardsData);
+    }
+
+    private function textExport(Decklist $decklist, Judge $judge, CardsData $cardsData)
     {
         $response = new Response();
         $response->setPublic();
@@ -840,7 +885,23 @@ public function textExportAction(Decklist $decklist, Judge $judge, CardsData $ca
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function octgnExportAction(Decklist $decklist)
+    public function octgnExportByIdAction(Decklist $decklist)
+    {
+        return $this->octgnExport($decklist);
+    }
+
+    /**
+     * @param Decklist $decklist
+     * @return Response
+     *
+     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
+     */
+    public function octgnExportByUuidAction(Decklist $decklist)
+    {
+        return $this->octgnExport($decklist);
+    }
+
+    private function octgnExport(Decklist $decklist)
     {
         $response = new Response();
         $response->setPublic();
@@ -872,23 +933,12 @@ public function octgnExportAction(Decklist $decklist)
             return new Response('no identity found');
         }
 
-        return $this->octgnExport("$name.o8d", $identity, $rd, $decklist->getRawdescription(), $response);
-    }
+        $filename = "$name.o8d";
 
-    /**
-     * @param string   $filename
-     * @param array   $identity
-     * @param array    $rd
-     * @param string   $description
-     * @param Response $response
-     * @return Response
-     */
-    public function octgnExport(string $filename, array $identity, array $rd, string $description, Response $response)
-    {
         $content = $this->renderView('/octgn.xml.twig', [
             "identity"    => $identity,
             "rd"          => $rd,
-            "description" => strip_tags($description),
+            "description" => strip_tags($decklist->getRawdescription()),
         ]);
 
         $response->headers->set('Content-Type', 'application/octgn');
@@ -911,7 +961,29 @@ public function octgnExport(string $filename, array $identity, array $rd, string
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function editAction(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
+    public function editByIdAction(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
+    {
+        return $this->edit($decklist, $request, $entityManager, $textProcessor, $moderationHelper);
+    }
+
+    /**
+     * @param Decklist $decklist
+     * @param Request                $request
+     * @param EntityManagerInterface $entityManager
+     * @param TextProcessor          $textProcessor
+     * @param ModerationHelper       $moderationHelper
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
+     */
+    public function editByUuidAction(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
+    {
+        return $this->edit($decklist, $request, $entityManager, $textProcessor, $moderationHelper);
+    }
+
+    private function edit(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
     {
         $user = $this->getUser();
 
@@ -951,8 +1023,8 @@ public function editAction(Decklist $decklist, Request $request, EntityManagerIn
         }
 
         // Note: We are doing the naive thing and just assuming we won't collide.
-		// If there is a collision, there will be an error returned to the user.
-		// Sorry, users!  v2 will be nicer to you!
+        // If there is a collision, there will be an error returned to the user.
+        // Sorry, users!  v2 will be nicer to you!
         if ($decklist->getUuid() == null) {
             $decklist->setUuid(Uuid::uuid4()->toString());
         }
@@ -969,8 +1041,8 @@ public function editAction(Decklist $decklist, Request $request, EntityManagerIn
 
         $entityManager->flush();
 
-        return $this->redirect($this->generateUrl('decklist_detail', [
-            'decklist_id'   => $decklist->getId(),
+        return $this->redirect($this->generateUrl('decklist_detail_by_uuid', [
+            'decklist_uuid'   => $decklist->getUuid(),
             'decklist_name' => $decklist->getPrettyname(),
         ]));
     }
@@ -984,7 +1056,26 @@ public function editAction(Decklist $decklist, Request $request, EntityManagerIn
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function deleteAction(Decklist $decklist, EntityManagerInterface $entityManager)
+    public function deleteByIdAction(Decklist $decklist, EntityManagerInterface $entityManager)
+    {
+		return $this->delete($decklist, $entityManager);
+    }
+
+    /**
+     * @param Decklist $decklist
+     * @param EntityManagerInterface $entityManager
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     *
+     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
+     */
+    public function deleteByUuidAction(Decklist $decklist, EntityManagerInterface $entityManager)
+    {
+		return $this->delete($decklist, $entityManager);
+    }
+
+    private function delete(Decklist $decklist, EntityManagerInterface $entityManager)
     {
         $user = $this->getUser();
 
@@ -1362,7 +1453,29 @@ public function activityAction(int $days, EntityManagerInterface $entityManager,
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
      */
-    public function moderateAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
+    public function moderateByIdAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
+    {
+		return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
+    }
+
+    /**
+     * @param Decklist $decklist
+     * @param int                    $status
+     * @param int|null               $modflag_id
+     * @param EntityManagerInterface $entityManager
+     * @param ModerationHelper       $moderationHelper
+     * @return JsonResponse
+     *
+     * @IsGranted("ROLE_MODERATOR")
+     *
+     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
+     */
+    public function moderateByUuidAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
+    {
+		return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
+    }
+
+    private function moderate(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
     {
         $response = new Response();
         $response->setPrivate();
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 345cba98..99ae80cb 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -242,24 +242,38 @@ deck_copy_by_uuid:
         _locale: \w\w
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-# XXX
 decklist_export_octgn:
     path: /decklist/export/octgn/{decklist_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:octgnExport
+        _controller: AppBundle:Social:octgnExportById
     requirements:
         decklist_id: \d+
 
-# XXX
+decklist_export_octgn_by_uuid:
+    path: /decklist/export/octgn/{decklist_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Social:octgnExportByUuid
+    requirements:
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decklist_export_text:
     path: /decklist/export/text/{decklist_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:textExport
+        _controller: AppBundle:Social:textExportById
     requirements:
         decklist_id: \d+
 
+decklist_export_text_by_uuid:
+    path: /decklist/export/text/{decklist_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Social:textExportByUuid
+    requirements:
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decklist_new:
     path: /{_locale}/deck/publish
     methods: [POST]
@@ -291,29 +305,48 @@ decklists_list:
         _locale: \w\w
         page: \d+
 
-# XXX
 decklist_detail:
     path: /{_locale}/decklist/{decklist_id}/{decklist_name}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:view
+        _controller: AppBundle:Social:viewById
         _locale: en
         decklist_name: null
     requirements:
         _locale: \w\w
         decklist_id: \d+
 
-# XXX
+decklist_detail_by_uuid:
+    path: /{_locale}/decklist/{decklist_uuid}/{decklist_name}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Social:viewByUuid
+        _locale: en
+        decklist_name: null
+    requirements:
+        _locale: \w\w
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decklist_detail_no_name:
     path: /{_locale}/decklist/{decklist_id}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:view
+        _controller: AppBundle:Social:viewById
         _locale: en
     requirements:
         _locale: \w\w
         decklist_id: \d+
 
+decklist_detail_no_name_by_uuid:
+    path: /{_locale}/decklist/{decklist_uuid}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Social:viewByUuid
+        _locale: en
+    requirements:
+        _locale: \w\w
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decklist_favorite:
     path: /user/favorite
     methods: [POST]
@@ -338,24 +371,38 @@ decklist_comment_hide:
     defaults:
         _controller: AppBundle:Social:hidecomment
 
-# XXX
 decklist_edit:
     path: /decklist/edit/{decklist_id}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Social:edit
+        _controller: AppBundle:Social:editById
     requirements:
         decklist_id: \d+
 
-# XXX
+decklist_edit:
+    path: /decklist/edit/{decklist_uuid}
+    methods: [POST]
+    defaults:
+        _controller: AppBundle:Social:editByUuid
+    requirements:
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decklist_delete:
     path: /decklist/delete/{decklist_id}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Social:delete
+        _controller: AppBundle:Social:deleteById
     requirements:
         decklist_id: \d+
 
+decklist_delete:
+    path: /decklist/delete/{decklist_uuid}
+    methods: [POST]
+    defaults:
+        _controller: AppBundle:Social:deleteByUuid
+    requirements:
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 decklists_diff:
     path: /{_locale}/decklists/diff/{decklist1_id}/{decklist2_id}
     methods: [GET]
@@ -870,17 +917,26 @@ cards_sets:
     requirements:
         _locale: \w\w
 
-# XXX
 decklist_moderate:
     path: /decklist/moderate/{decklist_id}/{status}/{modflag_id}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Social:moderate
+        _controller: AppBundle:Social:moderateById
         modflag_id: null
     requirements:
         decklist_id: \d+
         status: \d
 
+decklist_moderate:
+    path: /decklist/moderate/{decklist_uuid}/{status}/{modflag_id}
+    methods: [POST]
+    defaults:
+        _controller: AppBundle:Social:moderateByUuid
+        modflag_id: null
+    requirements:
+        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+        status: \d
+
 modflags_get:
     path: /modflags
     defaults:

From 8141d6479d2e60734f6c921464e59d6d83e3097e Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Fri, 21 Jan 2022 00:32:37 -0600
Subject: [PATCH 04/20] Use decklist_uuid or deck_uuid in route params.
 refactor deck view actions.

---
 .../Controller/BuilderController.php          | 80 +++++++------------
 .../Controller/PublicApi20Controller.php      |  8 +-
 src/AppBundle/Resources/config/routing.yml    | 10 +--
 3 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 266460ae..8b2f0b93 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -984,42 +984,22 @@ public function editByIdAction(int $deck_id, EntityManagerInterface $entityManag
     }
 
     public function viewByIdAction(int $deck_id, EntityManagerInterface $entityManager, Judge $judge) {
-        $dbh = $entityManager->getConnection();
-        $rows = $dbh->executeQuery("
-            SELECT
-              d.id,
-              d.name,
-              d.description,
-              m.code,
-              d.problem,
-              d.date_update,
-              s.name side_name,
-              c.code identity_code,
-              f.code faction_code,
-              CASE WHEN u.id=? THEN 1 ELSE 0 END is_owner
-            FROM deck d
-              LEFT JOIN mwl m  ON d.mwl_id=m.id
-              LEFT JOIN user u ON d.user_id=u.id
-              LEFT JOIN side s ON d.side_id=s.id
-              LEFT JOIN card c ON d.identity_id=c.id
-              LEFT JOIN faction f ON c.faction_id=f.id
-            WHERE d.id=?
-              AND (u.id=? OR u.share_decks=1)
-               ", [
-            $this->getUser() ? $this->getUser()->getId() : null,
-            $deck_id,
-            $this->getUser() ? $this->getUser()->getId() : null,
-        ])->fetchAll();
+        return $this->viewAction(["d.id = ?", $deck_id], $entityManager, $judge);
+    }
 
-        if (!count($rows)) {
-            throw $this->createNotFoundException();
-        }
-        return $this->viewAction($rows[0], $entityManager, $judge);
+    /**
+     * @param string                 $deck_uuid
+     * @param EntityManagerInterface $entityManager
+     * @param Judge                  $judge
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function viewByUuidAction(string $deck_uuid, EntityManagerInterface $entityManager, Judge $judge) {
+        return $this->viewAction(["d.uuid = ?", $deck_uuid], $entityManager, $judge);
     }
 
-    public function viewByUuidAction(string $uuid, EntityManagerInterface $entityManager, Judge $judge) {
-        $dbh = $entityManager->getConnection();
-        $rows = $dbh->executeQuery("
+    private function getViewQueryBase() {
+        return "
             SELECT
               d.id,
               d.name,
@@ -1037,30 +1017,26 @@ public function viewByUuidAction(string $uuid, EntityManagerInterface $entityMan
               LEFT JOIN side s ON d.side_id=s.id
               LEFT JOIN card c ON d.identity_id=c.id
               LEFT JOIN faction f ON c.faction_id=f.id
-            WHERE d.uuid=?
-              AND (u.id=? OR u.share_decks=1)
-               ", [
-            $this->getUser() ? $this->getUser()->getId() : null,
-            $uuid,
-            $this->getUser() ? $this->getUser()->getId() : null,
-        ])->fetchAll();
+            WHERE (u.id=? OR u.share_decks=1) AND ";
+    }
+
+    public function viewAction(array $query_elements, EntityManagerInterface $entityManager, Judge $judge)
+    {
+        $dbh = $entityManager->getConnection();
+        $rows = $dbh->executeQuery(
+            $this->getViewQueryBase() . $query_elements[0],
+            [
+                $this->getUser() ? $this->getUser()->getId() : null,
+                $this->getUser() ? $this->getUser()->getId() : null,
+                $query_elements[1],
+            ]
+        )->fetchAll();
 
         if (!count($rows)) {
             throw $this->createNotFoundException();
         }
-        return $this->viewAction($rows[0], $entityManager, $judge);
-    }
 
-    /**
-     * @param int                    $deck_id
-     * @param EntityManagerInterface $entityManager
-     * @param Judge                  $judge
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     */
-    public function viewAction(array $deck, EntityManagerInterface $entityManager, Judge $judge)
-    {
-        $dbh = $entityManager->getConnection();
+		$deck = $rows[0];
 
         $deck['side_name'] = mb_strtolower($deck['side_name']);
 
diff --git a/src/AppBundle/Controller/PublicApi20Controller.php b/src/AppBundle/Controller/PublicApi20Controller.php
index 102c13ef..bdc8eff5 100755
--- a/src/AppBundle/Controller/PublicApi20Controller.php
+++ b/src/AppBundle/Controller/PublicApi20Controller.php
@@ -419,10 +419,10 @@ public function decklistByIdAction(int $decklist_id, Request $request)
      * )
      *
      */
-    public function decklistByUuidAction(string $uuid, Request $request)
+    public function decklistByUuidAction(string $decklist_uuid, Request $request)
     {
-      return $this->getSingleEntityFromCache("public-api-decklist-" . $uuid, function() use ($uuid) {
-        return $this->entityManager->getRepository('AppBundle:Decklist')->findOneBy(['uuid' => $uuid]);
+      return $this->getSingleEntityFromCache("public-api-decklist-" . $decklist_uuid, function() use ($decklist_uuid) {
+        return $this->entityManager->getRepository('AppBundle:Decklist')->findOneBy(['uuid' => $decklist_uuid]);
       }, $request);
     }
 
@@ -493,7 +493,7 @@ public function deckByIdAction(Deck $deck, Request $request)
      *  },
      * )
      *
-     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"uuid": "uuid"}})
+     * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
      */
     public function deckByUuidAction(Deck $deck, Request $request)
     {
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 99ae80cb..1fa0cb09 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -65,14 +65,14 @@ deck_view:
         deck_id: \d+
 
 deck_view_by_uuid:
-    path: /{_locale}/deck/view/{uuid}
+    path: /{_locale}/deck/view/{deck_uuid}
     methods: [GET]
     defaults:
         _controller: AppBundle:Builder:viewByUuid
         _locale: en
     requirements:
         _locale: \w\w
-        uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+        deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 deck_duplicate:
     path: /{_locale}/deck/duplicate/{deck_id}
@@ -755,7 +755,7 @@ api_public_decklist:
         decklist_id: "\\d+"
 
 api_public_decklist_by_uuid:
-    path: /api/2.0/public/decklist/{uuid}
+    path: /api/2.0/public/decklist/{decklist_uuid}
     methods: [GET]
     defaults:
         _controller: AppBundle:PublicApi20:decklistByUuid
@@ -779,7 +779,7 @@ api_public_deck:
         deck_id: "\\d+"
 
 api_public_deck_by_uuid:
-    path: /api/2.0/public/deck/{uuid}
+    path: /api/2.0/public/deck/{deck_uuid}
     methods: [GET]
     defaults:
         _controller: AppBundle:PublicApi20:deckByUuid
@@ -813,7 +813,7 @@ api_private_deck_load_by_id:
         deck_id: "\\d+"
 
 api_private_deck_load_by_uuid:
-    path: /api/2.0/private/deck/{uuid}
+    path: /api/2.0/private/deck/{deck_uuid}
     methods: [GET]
     defaults:
         _controller: AppBundle:PrivateApi20:loadDeckByUuid

From 40c4cbea53d5ceba7940ed018f3251241920a976 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Fri, 21 Jan 2022 00:41:26 -0600
Subject: [PATCH 05/20] Update social controller to use uuids in generated urls

---
 src/AppBundle/Controller/SocialController.php | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 9093a332..b4b11c49 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -72,8 +72,8 @@ public function publishByUuidAction(Deck $deck, EntityManagerInterface $entityMa
                               ]);
         foreach ($old_decklists as $decklist) {
             if (json_encode($decklist->getContent()) == $new_content) {
-                $url = $this->generateUrl('decklist_detail', [
-                    'decklist_id'   => $decklist->getId(),
+                $url = $this->generateUrl('decklist_detail_by_uuid', [
+                    'decklist_uuid' => $decklist->getUuid(),
                     'decklist_name' => $decklist->getPrettyName(),
                 ]);
                 $response->setData([
@@ -133,8 +133,8 @@ public function publishByIdAction(Deck $deck, EntityManagerInterface $entityMana
                               ]);
         foreach ($old_decklists as $decklist) {
             if (json_encode($decklist->getContent()) == $new_content) {
-                $url = $this->generateUrl('decklist_detail', [
-                    'decklist_id'   => $decklist->getId(),
+                $url = $this->generateUrl('decklist_detail_by_uuid', [
+                    'decklist_uuid' => $decklist->getUuid(),
                     'decklist_name' => $decklist->getPrettyName(),
                 ]);
                 $response->setData([
@@ -251,9 +251,9 @@ public function newAction(Request $request, EntityManagerInterface $entityManage
 
         return $this->redirect(
             $this->generateUrl(
-                'decklist_detail',
+                'decklist_detail_by_uuid',
                 [
-                    'decklist_id'   => $decklist->getId(),
+                    'decklist_uuid' => $decklist->getUuid(),
                     'decklist_name' => $decklist->getPrettyname(),
                 ]
             )
@@ -638,7 +638,7 @@ public function commentAction(Request $request, EntityManagerInterface $entityMa
             $email_data = [
                 'username'      => $user->getUsername(),
                 'decklist_name' => $decklist->getName(),
-                'url'           => $this->generateUrl('decklist_detail', ['decklist_id' => $decklist->getId(), 'decklist_name' => $decklist->getPrettyname()], UrlGeneratorInterface::ABSOLUTE_URL) . '#' . $comment->getId(),
+                'url'           => $this->generateUrl('decklist_detail_by_uuid', ['decklist_uuid' => $decklist->getUuid(), 'decklist_name' => $decklist->getPrettyname()], UrlGeneratorInterface::ABSOLUTE_URL) . '#' . $comment->getId(),
                 'comment'       => $comment_html,
                 'profile'       => $this->generateUrl('user_profile', [], UrlGeneratorInterface::ABSOLUTE_URL),
             ];
@@ -652,8 +652,8 @@ public function commentAction(Request $request, EntityManagerInterface $entityMa
             }
         }
 
-        return $this->redirect($this->generateUrl('decklist_detail', [
-            'decklist_id'   => $decklist_id,
+        return $this->redirect($this->generateUrl('decklist_detail_by_uuid', [
+            'decklist_uuid' => $decklist_uuid,
             'decklist_name' => $decklist->getPrettyname(),
         ]));
     }
@@ -1058,7 +1058,7 @@ private function edit(Decklist $decklist, Request $request, EntityManagerInterfa
      */
     public function deleteByIdAction(Decklist $decklist, EntityManagerInterface $entityManager)
     {
-		return $this->delete($decklist, $entityManager);
+        return $this->delete($decklist, $entityManager);
     }
 
     /**
@@ -1072,7 +1072,7 @@ public function deleteByIdAction(Decklist $decklist, EntityManagerInterface $ent
      */
     public function deleteByUuidAction(Decklist $decklist, EntityManagerInterface $entityManager)
     {
-		return $this->delete($decklist, $entityManager);
+        return $this->delete($decklist, $entityManager);
     }
 
     private function delete(Decklist $decklist, EntityManagerInterface $entityManager)
@@ -1455,7 +1455,7 @@ public function activityAction(int $days, EntityManagerInterface $entityManager,
      */
     public function moderateByIdAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
     {
-		return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
+        return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
     }
 
     /**
@@ -1472,7 +1472,7 @@ public function moderateByIdAction(Decklist $decklist, int $status, int $modflag
      */
     public function moderateByUuidAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
     {
-		return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
+        return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
     }
 
     private function moderate(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)

From 3c24d9c40cd7a9380e82247187d70125d3a9263e Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 15:29:29 -0600
Subject: [PATCH 06/20] Update deck pages, controllers and js to use UUIDs.

---
 app/Resources/views/Builder/decks.html.twig   |  10 +-
 .../Default/publish_decklist_form.html.twig   |   6 +-
 .../Controller/BuilderController.php          |  45 +------
 src/AppBundle/Controller/ClaimsController.php |   1 +
 .../Controller/DecklistsController.php        |   1 +
 src/AppBundle/Controller/SocialController.php |   4 +-
 src/AppBundle/Controller/TagController.php    |  28 ++---
 src/AppBundle/Resources/config/routing.yml    |  15 +--
 src/AppBundle/Service/DeckManager.php         |   5 +-
 web/js/decks.js                               | 119 ++++++++----------
 web/js/publish_deck_form.js                   |   6 +-
 11 files changed, 92 insertions(+), 148 deletions(-)

diff --git a/app/Resources/views/Builder/decks.html.twig b/app/Resources/views/Builder/decks.html.twig
index 861f1068..26b06c24 100755
--- a/app/Resources/views/Builder/decks.html.twig
+++ b/app/Resources/views/Builder/decks.html.twig
@@ -103,7 +103,7 @@ var Identity = null,
 <div class="col-md-12">
 <div class="list-group" id="decks" data-sort-type="date_update" data-sort-order="1">
 {% for deck in decks %}
-<a href="#" class="list-group-item deck-list-group-item" id="deck_{{ deck.id }}" data-id="{{ deck.id }}" data-problem="{{ deck.problem }}" data-faction="{{ deck.faction_code }}">
+  <a href="#" class="list-group-item deck-list-group-item" id="deck_{{ deck.uuid }}" data-id="{{ deck.id }}" data-uuid="{{ deck.uuid }}" data-problem="{{ deck.problem }}" data-faction="{{ deck.faction_code }}">
     <div class="deck-list-identity-image hidden-xs" title="{{ deck.identity_title }}" style="background-image:url({{ asset('/card_image/small/'~deck.identity_code~'.jpg') }})"></div>
     <h4 class="decklist-name">{{ deck.name }}{% if deck.message %} <span class="glyphicon glyphicon-exclamation-sign text-danger" title="{{ deck.message }}"></span>{% endif %}</h4>
     <div>
@@ -245,7 +245,7 @@ var Identity = null,
         <div class="row">
           <div class="col-md-12">
             <form action="{{ path('deck_delete') }}" method="POST" enctype="application/x-www-form-urlencoded" id="delete-deck-form">
-              <input type="hidden" name="deck_id" id="delete-deck-id" value="">
+              <input type="hidden" name="deck_uuid" id="delete-deck-uuid" value="">
               <p>
               Are you sure that you want to delete the deck <b id="delete-deck-name"></b>?
               </p>
@@ -412,7 +412,7 @@ var Identity = null,
               <input class="form-control" type="text" name="tags" id="tag_add_tags" placeholder="a-tag another">
             </div>
             <div class="pull-right">
-              <input type="hidden" name="ids" id="tag_add_ids">
+              <input type="hidden" name="uuids" id="tag_add_uuids">
               <button type="submit" class="btn btn-success" onclick="$('#tagAddModal').modal('hide');tag_add_process(event)">Add</button>
               <button type="button" class="btn btn-default" onclick="$('#tagAddModal').modal('hide')">Cancel</button>
             </div>
@@ -442,7 +442,7 @@ var Identity = null,
               <input class="form-control" type="text" name="tags" id="tag_remove_tags" placeholder="a-tag another">
             </div>
             <div class="pull-right">
-              <input type="hidden" name="ids" id="tag_remove_ids">
+              <input type="hidden" name="uuids" id="tag_remove_uuids">
               <button type="submit" class="btn btn-success" onclick="$('#tagRemoveModal').modal('hide');tag_remove_process(event)">Remove</button>
               <button type="button" class="btn btn-default" onclick="$('#tagRemoveModal').modal('hide')">Cancel</button>
             </div>
@@ -471,7 +471,7 @@ var Identity = null,
               <label>Are you sure you want to clear all tags from the selected decks?</label>
             </div>
             <div class="pull-right">
-              <input type="hidden" name="ids" id="tag_clear_ids">
+              <input type="hidden" name="uuids" id="tag_clear_uuids">
               <button type="submit" class="btn btn-success" onclick="$('#tagClearModal').modal('hide');tag_clear_process(event)">Yes, clear</button>
               <button type="button" class="btn btn-default" onclick="$('#tagClearModal').modal('hide')">Cancel</button>
             </div>
diff --git a/app/Resources/views/Default/publish_decklist_form.html.twig b/app/Resources/views/Default/publish_decklist_form.html.twig
index f53dcd04..f66f68f9 100644
--- a/app/Resources/views/Default/publish_decklist_form.html.twig
+++ b/app/Resources/views/Default/publish_decklist_form.html.twig
@@ -9,9 +9,9 @@
       <div class="modal-body">
         <div class="row">
           <div class="col-md-12">
-            <form action="{% if decklist %}{{ path('decklist_edit', {decklist_id:decklist.id}) }}{% else %}{{ path('decklist_new') }}{% endif %}" method="POST" enctype="application/x-www-form-urlencoded" id="publish-decklist-form">
-              <input type="hidden" name="decklist_id" id="publish-decklist-id" value="{% if decklist %}{{ decklist.id }}{% endif %}">
-              <input type="hidden" name="deck_id" id="publish-deck-id">
+            <form action="{% if decklist %}{{ path('decklist_edit_by_uuid', {decklist_uuid:decklist.uuid}) }}{% else %}{{ path('decklist_new') }}{% endif %}" method="POST" enctype="application/x-www-form-urlencoded" id="publish-decklist-form">
+              <input type="hidden" name="decklist_uuid" id="publish-decklist-uuid" value="{% if decklist %}{{ decklist.uuid }}{% endif %}">
+              <input type="hidden" name="deck_uuid" id="publish-deck-uuid">
               <div class="form-group">
                 <label for="publish-decklist-name">Name</label>
                 <input type="text" class="form-control decklist-name" name="name" id="publish-decklist-name" maxlength="60" placeholder="Enter a name for this decklist" value="{% if decklist %}{{ decklist.name }}{% endif %}">
diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 8b2f0b93..055b14b8 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -722,8 +722,8 @@ public function saveAction(Request $request, EntityManagerInterface $entityManag
      */
     public function deleteAction(Request $request, EntityManagerInterface $entityManager)
     {
-        $deck_id = filter_var($request->get('deck_id'), FILTER_SANITIZE_NUMBER_INT);
-        $deck = $entityManager->getRepository('AppBundle:Deck')->find($deck_id);
+        $deck_uuid = $request->get('deck_uuid');
+        $deck = $entityManager->getRepository('AppBundle:Deck')->findOneBy(['uuid' => $request->get('deck_uuid')]);
         if (!$deck instanceof Deck) {
             return $this->redirect($this->generateUrl('decks_list'));
         }
@@ -1036,7 +1036,7 @@ public function viewAction(array $query_elements, EntityManagerInterface $entity
             throw $this->createNotFoundException();
         }
 
-		$deck = $rows[0];
+        $deck = $rows[0];
 
         $deck['side_name'] = mb_strtolower($deck['side_name']);
 
@@ -1211,44 +1211,7 @@ private function copy(Decklist $decklist)
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
      */
-    public function duplicateByUuidAction(Deck $deck)
-    {
-        if ($this->getUser()->getId() != $deck->getUser()->getId()) {
-            throw $this->createAccessDeniedException();
-        }
-
-        $content = [];
-        foreach ($deck->getSlots() as $slot) {
-            $content[$slot->getCard()->getCode()] = $slot->getQuantity();
-        }
-        $description = strlen($deck->getDescription()) > 0 ? ("Original deck notes:\n\n" . $deck->getDescription()) : '';
-
-        $mwl = $deck->getMwl();
-        if ($mwl instanceof Mwl) {
-            $mwl = $mwl->getCode();
-        }
-
-        return $this->forward(
-            'AppBundle:Builder:save',
-            [
-                'name'        => $deck->getName() . ' (copy)',
-                'content'     => json_encode($content),
-                'description' => $description,
-                'deck_id'     => $deck->getParent() ? $deck->getParent()->getId() : null,
-                'mwl_code'    => $mwl,
-            ]
-        );
-    }
-
-    /**
-     * @param Deck $deck
-     * @return Response
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
-     */
-    public function duplicateByIdAction(Deck $deck)
+    public function duplicateAction(Deck $deck)
     {
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
diff --git a/src/AppBundle/Controller/ClaimsController.php b/src/AppBundle/Controller/ClaimsController.php
index 404c4f22..026ba879 100644
--- a/src/AppBundle/Controller/ClaimsController.php
+++ b/src/AppBundle/Controller/ClaimsController.php
@@ -70,6 +70,7 @@ public function postAction(int $decklist_id, Request $request, EntityManagerInte
         $entityManager->flush();
 
         $jsend = $this->getJsendResponse('success', ['claim' => $claim]);
+        // TODO(plural): Update claims code with necro to send UUID
         $url = $this->generateUrl('app_claims_get', ['decklist_id' => $decklist_id, 'id' => $claim->getId()], UrlGeneratorInterface::ABSOLUTE_URL);
 
         return $this->createJsonResponse($jsend, 201, ['Location' => $url]);
diff --git a/src/AppBundle/Controller/DecklistsController.php b/src/AppBundle/Controller/DecklistsController.php
index 7010d68a..429b5661 100644
--- a/src/AppBundle/Controller/DecklistsController.php
+++ b/src/AppBundle/Controller/DecklistsController.php
@@ -300,6 +300,7 @@ private function searchForm(Request $request, EntityManagerInterface $entityMana
     public function diffAction(int $decklist1_id, int $decklist2_id, EntityManagerInterface $entityManager, DiffService $diffService)
     {
         if ($decklist1_id > $decklist2_id) {
+            // TODO(plural): Update decklists_diff to take deck UUIDs
             return $this->redirect($this->generateUrl('decklists_diff', ['decklist1_id' => $decklist2_id, 'decklist2_id' => $decklist1_id]));
         }
         $response = new Response();
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index b4b11c49..531fb0ba 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -167,9 +167,8 @@ public function publishByIdAction(Deck $deck, EntityManagerInterface $entityMana
      */
     public function newAction(Request $request, EntityManagerInterface $entityManager, DecklistManager $decklistManager, Judge $judge, TextProcessor $textProcessor, RotationService $rotationService)
     {
-        $deck_id = filter_var($request->request->get('deck_id'), FILTER_SANITIZE_NUMBER_INT);
         /** @var Deck $deck */
-        $deck = $entityManager->getRepository('AppBundle:Deck')->find($deck_id);
+        $deck = $entityManager->getRepository('AppBundle:Deck')->findOneBy(['uuid' => $request->request->get('deck_uuid')]);
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
         }
@@ -264,6 +263,7 @@ private function getViewQueryBase() {
         return 
             ["SELECT
                d.id,
+               d.uuid,
                d.date_update,
                d.name,
                d.prettyname,
diff --git a/src/AppBundle/Controller/TagController.php b/src/AppBundle/Controller/TagController.php
index fc6c2668..edc20349 100755
--- a/src/AppBundle/Controller/TagController.php
+++ b/src/AppBundle/Controller/TagController.php
@@ -20,9 +20,9 @@ class TagController extends Controller
      */
     public function addAction(Request $request, EntityManagerInterface $entityManager)
     {
-        $list_id = $request->get('ids');
-        if (!is_array($list_id)) {
-            $list_id = explode(' ', $list_id);
+        $list_uuid = $request->get('uuids');
+        if (!is_array($list_uuid)) {
+            $list_uuid = explode(' ', $list_uuid);
         }
         $list_tag = $request->get('tags');
         if (!is_array($list_tag)) {
@@ -35,9 +35,9 @@ public function addAction(Request $request, EntityManagerInterface $entityManage
 
         $response = ["success" => true];
 
-        foreach ($list_id as $id) {
+        foreach ($list_uuid as $uuid) {
             /** @var Deck $deck */
-            $deck = $entityManager->getRepository('AppBundle:Deck')->find($id);
+            $deck = $entityManager->getRepository('AppBundle:Deck')->findOneBy(["uuid" => $uuid]);
             if (!$deck) {
                 continue;
             }
@@ -47,7 +47,7 @@ public function addAction(Request $request, EntityManagerInterface $entityManage
             $tags = array_values(array_filter(array_unique(array_merge(explode(' ', $deck->getTags()), $list_tag)), function ($tag) {
                 return $tag != "";
             }));
-            $response['tags'][$deck->getId()] = $tags;
+            $response['tags'][$deck->getUuid()] = $tags;
             $deck->setTags(implode(' ', $tags));
         }
         $entityManager->flush();
@@ -64,14 +64,14 @@ public function addAction(Request $request, EntityManagerInterface $entityManage
      */
     public function removeAction(Request $request, EntityManagerInterface $entityManager)
     {
-        $list_id = $request->get('ids');
+        $list_uuid = $request->get('uuids');
         $list_tag = $request->get('tags');
 
         $response = ["success" => true];
 
-        foreach ($list_id as $id) {
+        foreach ($list_uuid as $uuid) {
             /** @var Deck $deck */
-            $deck = $entityManager->getRepository('AppBundle:Deck')->find($id);
+            $deck = $entityManager->getRepository('AppBundle:Deck')->findOneBy(["uuid" => $uuid]);
             if (!$deck) {
                 continue;
             }
@@ -79,7 +79,7 @@ public function removeAction(Request $request, EntityManagerInterface $entityMan
                 continue;
             }
             $tags = array_values(array_diff(explode(' ', $deck->getTags()), $list_tag));
-            $response['tags'][$deck->getId()] = $tags;
+            $response['tags'][$deck->getUuid()] = $tags;
             $deck->setTags(implode(' ', $tags));
         }
         $entityManager->flush();
@@ -96,20 +96,20 @@ public function removeAction(Request $request, EntityManagerInterface $entityMan
      */
     public function clearAction(Request $request, EntityManagerInterface $entityManager)
     {
-        $list_id = $request->get('ids');
+        $list_uuid = $request->get('uuids');
 
         $response = ["success" => true];
 
-        foreach ($list_id as $id) {
+        foreach ($list_uuid as $uuid) {
             /** @var Deck $deck */
-            $deck = $entityManager->getRepository('AppBundle:Deck')->find($id);
+            $deck = $entityManager->getRepository('AppBundle:Deck')->findOneBy(["uuid" => $uuid]);
             if (!$deck) {
                 continue;
             }
             if ($this->getUser()->getId() != $deck->getUser()->getId()) {
                 continue;
             }
-            $response['tags'][$deck->getId()] = [];
+            $response['tags'][$deck->getUuid()] = [];
             $deck->setTags('');
         }
         $entityManager->flush();
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 1fa0cb09..f39f2cbe 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -75,20 +75,10 @@ deck_view_by_uuid:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 deck_duplicate:
-    path: /{_locale}/deck/duplicate/{deck_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Builder:duplicateById
-        _locale: en
-    requirements:
-        _locale: \w\w
-        deck_id: \d+
-
-deck_duplicate_by_uuid:
     path: /{_locale}/deck/duplicate/{deck_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:duplicateByUuid
+        _controller: AppBundle:Builder:duplicate
         _locale: en
     requirements:
         _locale: \w\w
@@ -283,7 +273,6 @@ decklist_new:
     requirements:
         _locale: \w\w
 
-
 decklists_searchform:
     path: /{_locale}/decklists/search
     methods: [GET]
@@ -379,7 +368,7 @@ decklist_edit:
     requirements:
         decklist_id: \d+
 
-decklist_edit:
+decklist_edit_by_uuid:
     path: /decklist/edit/{decklist_uuid}
     methods: [POST]
     defaults:
diff --git a/src/AppBundle/Service/DeckManager.php b/src/AppBundle/Service/DeckManager.php
index 59a9c6a9..07db435b 100755
--- a/src/AppBundle/Service/DeckManager.php
+++ b/src/AppBundle/Service/DeckManager.php
@@ -45,6 +45,7 @@ public function getByUser(User $user, bool $decode_variation = false)
         $decks = $dbh->executeQuery("
             SELECT
               d.id,
+              d.uuid,
               d.name,
               DATE_FORMAT(d.date_creation, '%Y-%m-%dT%TZ') date_creation,
               DATE_FORMAT(d.date_update, '%Y-%m-%dT%TZ') date_update,
@@ -287,8 +288,8 @@ public function saveDeck(
         }
 
         // Note: We are doing the naive thing and just assuming we won't collide.
-		// If there is a collision, there will be an error returned to the user.
-		// Sorry, users!  v2 will be nicer to you!
+        // If there is a collision, there will be an error returned to the user.
+        // Sorry, users!  v2 will be nicer to you!
         if ($deck->getUuid() == null) {
           $deck->setUuid(Uuid::uuid4()->toString());
         }
diff --git a/web/js/decks.js b/web/js/decks.js
index 2db1d77a..4eaee1b7 100755
--- a/web/js/decks.js
+++ b/web/js/decks.js
@@ -59,13 +59,13 @@ function decks_upload_all() {
   $('#archiveModal').modal('show');
 }
 
-function do_diff(ids) {
-  if(ids.length < 2) return;
+function do_diff(uuids) {
+  if(uuids.length < 2) return;
 
   var contents = [];
   var names = [];
-  for(var decknum=0; decknum<ids.length; decknum++) {
-    var deck = _.find(Decks, function (adeck) { return adeck.id == ids[decknum] });
+  for(var decknum=0; decknum<uuids.length; decknum++) {
+    var deck = _.find(Decks, function (adeck) { return adeck.uuid == uuids[decknum] });
     var hash = {};
     for(var slotnum=0; slotnum<deck.cards.length; slotnum++) {
       var slot = deck.cards[slotnum];
@@ -105,14 +105,14 @@ function do_diff(ids) {
   $('#diffModal').modal('show');
 }
 
-function do_diff_collection(ids) {
-  if(ids.length < 2) return;
+function do_diff_collection(uuids) {
+  if(uuids.length < 2) return;
   var decks; decks = [];
 
   var ensembles; ensembles = [];
   var lengths; lengths = [];
-  for(var decknum=0; decknum<ids.length; decknum++) {
-    var deck = _.find(Decks, function (adeck) { return adeck.id == ids[decknum] });
+  for(var decknum=0; decknum<uuids.length; decknum++) {
+    var deck = _.find(Decks, function (adeck) { return adeck.uuid == uuids[decknum] });
     decks.push(deck);
     var cards = [];
     for(var slotnum=0; slotnum<deck.cards.length; slotnum++) {
@@ -214,19 +214,19 @@ function filter_decks() {
 function do_action_deck(event) {
   event.stopPropagation();
   if(event.shiftKey || event.altKey || event.ctrlKey || event.metaKey) return;
-  var deck_id = $(this).closest('.deck-list-group-item').data('id');
-  var deck = SelectedDeck = _.find(Decks, function (deck) { return deck.id == deck_id });
+  var deck_uuid = $(this).closest('.deck-list-group-item').data('uuid');
+  var deck = SelectedDeck = _.find(Decks, function (deck) { return deck.uuid == deck_uuid });
   if(!deck) return;
   var action_id = $(this).attr('id');
   if(!action_id) return;
   switch(action_id) {
-    case 'btn-view': location.href=Routing.generate('deck_view', {deck_id:deck.id,_locale:NRDB.locale}); break;
-    case 'btn-edit': location.href=Routing.generate('deck_edit', {deck_id:deck.id,_locale:NRDB.locale}); break;
-    case 'btn-publish': show_publish_deck_form(deck.id, deck.name, deck.description); break;
-    case 'btn-duplicate': location.href=Routing.generate('deck_duplicate', {deck_id:deck.id,_locale:NRDB.locale}); break;
+    case 'btn-view': location.href=Routing.generate('deck_view_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-edit': location.href=Routing.generate('deck_edit_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-publish': show_publish_deck_form(deck.uuid, deck.name, deck.description); break;
+    case 'btn-duplicate': location.href=Routing.generate('deck_duplicate', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
     case 'btn-delete': confirm_delete(deck); break;
-    case 'btn-download-text': location.href=Routing.generate('deck_export_text', {deck_id:deck.id,_locale:NRDB.locale}); break;
-    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn', {deck_id:deck.id,_locale:NRDB.locale}); break;
+    case 'btn-download-text': location.href=Routing.generate('deck_export_text_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
     case 'btn-export-bbcode': export_bbcode(deck); break;
     case 'btn-export-markdown': export_markdown(deck); break;
     case 'btn-export-plaintext': export_plaintext(deck); break;
@@ -238,18 +238,16 @@ function do_action_deck(event) {
 function do_action_selection(event) {
   event.stopPropagation();
   var action_id = $(this).attr('id');
-  var ids = [];
-  $('#decks a.deck-list-group-item.selected').each(function (index, elt) { ids.push($(elt).data('id')); });
-  if(!action_id || !ids.length) return;
+  var uuids = [];
+  $('#decks a.deck-list-group-item.selected').each(function (index, elt) { uuids.push($(elt).data('uuid')); });
+  if(!action_id || !uuids.length) return;
   switch(action_id) {
-    case 'btn-compare': do_diff(ids); break;
-    case 'btn-compare-collection': do_diff_collection(ids); break;
-    case 'btn-tag-add': tag_add(ids); break;
-    case 'btn-tag-remove-one': tag_remove(ids); break;
-    case 'btn-tag-remove-all': tag_clear(ids); break;
-    case 'btn-delete-selected': confirm_delete_all(ids); break;
-    case 'btn-download-text': download_text_selection(ids); break;
-    case 'btn-download-octgn': download_octgn_selection(ids); break;
+    case 'btn-compare': do_diff(uuids); break;
+    case 'btn-compare-collection': do_diff_collection(uuids); break;
+    case 'btn-tag-add': tag_add(uuids); break;
+    case 'btn-tag-remove-one': tag_remove(uuids); break;
+    case 'btn-tag-remove-all': tag_clear(uuids); break;
+    case 'btn-delete-selected': confirm_delete_all(uuids); break;
   }
   return false;
 }
@@ -269,16 +267,6 @@ function do_action_sort(event) {
   return false;
 }
 
-function download_text_selection(ids)
-{
-  window.location = Routing.generate('deck_export_text_list', { ids: ids });
-}
-
-function download_octgn_selection(ids)
-{
-  window.location = Routing.generate('deck_export_octgn_list', { ids: ids });
-}
-
 function sort_list(type)
 {
   var container = $('#decks');
@@ -307,7 +295,6 @@ function sort_list(type)
 
 function update_tag_toggles()
 {
-
   // tags is an object where key is tag and value is array of deck ids
   var tag_dict = Decks.reduce(function (p, c) {
     c.tags.forEach(function (t) {
@@ -327,16 +314,16 @@ function update_tag_toggles()
 
 }
 
-function set_tags(id, tags)
+function set_tags(uuid, tags)
 {
-  var elt = $('#deck_'+id);
+  var elt = $('#deck_'+uuid);
   var div = elt.find('.deck-list-tags').empty();
   tags.forEach(function (tag) {
     div.append($('<span class="label label-default tag-'+tag+'">'+tag+'</span>'));
   });
 
   for(var i=0; i<Decks.length; i++) {
-    if(Decks[i].id == id) {
+    if(Decks[i].uuid == uuid) {
       Decks[i].tags = tags;
       break;
     }
@@ -345,19 +332,20 @@ function set_tags(id, tags)
   update_tag_toggles();
 }
 
-function tag_add(ids) {
-    $('#tag_add_ids').val(ids);
+function tag_add(uuids) {
+  $('#tag_add_uuids').val(uuids);
   $('#tagAddModal').modal('show');
     setTimeout(function() { $('#tag_add_tags').focus(); }, 500);
 }
+
 function tag_add_process(event) {
     event.preventDefault();
-    var ids = $('#tag_add_ids').val().split(/,/);
+    var uuids = $('#tag_add_uuids').val().split(/,/);
     var tags = $('#tag_add_tags').val().split(/\s+/);
-    if(!ids.length || !tags.length) return;
+    if(!uuids.length || !tags.length) return;
   $.ajax(Routing.generate('tag_add'), {
     type: 'POST',
-    data: { ids: ids, tags: tags },
+    data: { uuids: uuids, tags: tags },
     dataType: 'json',
     success: function(data, textStatus, jqXHR) {
       var response = jqXHR.responseJSON;
@@ -365,8 +353,8 @@ function tag_add_process(event) {
         alert('An error occured while updating the tags.');
         return;
       }
-      $.each(response.tags, function (id, tags) {
-        set_tags(id, tags);
+      $.each(response.tags, function (uuid, tags) {
+        set_tags(uuid, tags);
       });
     },
     error: function(jqXHR, textStatus, errorThrown) {
@@ -376,19 +364,19 @@ function tag_add_process(event) {
   });
 }
 
-function tag_remove(ids) {
-    $('#tag_remove_ids').val(ids);
+function tag_remove(uuids) {
+  $('#tag_remove_uuids').val(uuids);
   $('#tagRemoveModal').modal('show');
     setTimeout(function() { $('#tag_remove_tags').focus(); }, 500);
 }
 function tag_remove_process(event) {
     event.preventDefault();
-    var ids = $('#tag_remove_ids').val().split(/,/);
+    var uuids = $('#tag_remove_uuids').val().split(/,/);
     var tags = $('#tag_remove_tags').val().split(/\s+/);
-    if(!ids.length || !tags.length) return;
+    if(!uuids.length || !tags.length) return;
   $.ajax(Routing.generate('tag_remove'), {
     type: 'POST',
-    data: { ids: ids, tags: tags },
+    data: { uuids: uuids, tags: tags },
     dataType: 'json',
     success: function(data, textStatus, jqXHR) {
       var response = jqXHR.responseJSON;
@@ -396,8 +384,8 @@ function tag_remove_process(event) {
         alert('An error occured while updating the tags.');
         return;
       }
-      $.each(response.tags, function (id, tags) {
-        set_tags(id, tags);
+      $.each(response.tags, function (uuid, tags) {
+        set_tags(uuid, tags);
       });
     },
     error: function(jqXHR, textStatus, errorThrown) {
@@ -407,17 +395,18 @@ function tag_remove_process(event) {
   });
 }
 
-function tag_clear(ids) {
-    $('#tag_clear_ids').val(ids);
+function tag_clear(uuids) {
+  $('#tag_clear_uuids').val(uuids);
   $('#tagClearModal').modal('show');
 }
+
 function tag_clear_process(event) {
     event.preventDefault();
-    var ids = $('#tag_clear_ids').val().split(/,/);
-    if(!ids.length) return;
+    var uuids = $('#tag_clear_uuids').val().split(/,/);
+    if(!uuids.length) return;
   $.ajax(Routing.generate('tag_clear'), {
     type: 'POST',
-    data: { ids: ids },
+    data: { uuids: uuids },
     dataType: 'json',
     success: function(data, textStatus, jqXHR) {
       var response = jqXHR.responseJSON;
@@ -425,8 +414,8 @@ function tag_clear_process(event) {
         alert('An error occured while updating the tags.');
         return;
       }
-      $.each(response.tags, function (id, tags) {
-        set_tags(id, tags);
+      $.each(response.tags, function (uuid, tags) {
+        set_tags(uuid, tags);
       });
     },
     error: function(jqXHR, textStatus, errorThrown) {
@@ -438,7 +427,7 @@ function tag_clear_process(event) {
 
 function confirm_delete(deck) {
   $('#delete-deck-name').text(deck.name);
-  $('#delete-deck-id').val(deck.id);
+  $('#delete-deck-uuid').val(deck.uuid);
   $('#deleteModal').modal('show');
 }
 
@@ -473,8 +462,8 @@ function show_deck() {
     NRDB.data.cards.updateById(slot.card_code, {indeck:parseInt(slot.qty,10)});
   }
   $('#deck-name').text(deck.name);
-  $('#btn-view').attr('href', Routing.generate('deck_view', {deck_id:deck.id,_locale:NRDB.locale}));
-  $('#btn-edit').attr('href', Routing.generate('deck_edit', {deck_id:deck.id,_locale:NRDB.locale}));
+  $('#btn-view').attr('href', Routing.generate('deck_view_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}));
+  $('#btn-edit').attr('href', Routing.generate('deck_edit_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}));
 
   var mwl_code = deck.mwl_code, mwl_record = mwl_code && NRDB.data.mwl.findById(mwl_code);
   if(mwl_record) {
diff --git a/web/js/publish_deck_form.js b/web/js/publish_deck_form.js
index 3c89013b..980b2d1a 100644
--- a/web/js/publish_deck_form.js
+++ b/web/js/publish_deck_form.js
@@ -45,10 +45,10 @@ function initialize_publish_deck_form_typeahead() {
 
 }
 
-function show_publish_deck_form(deck_id, deck_name, deck_description) {
+function show_publish_deck_form(deck_uuid, deck_name, deck_description) {
   $('#publish-form-warning').remove();
   $('#btn-publish-submit').text("Checking...").prop('disabled', true);
-  $.ajax(Routing.generate('deck_publish', {deck_id:deck_id}), {
+  $.ajax(Routing.generate('deck_publish_by_uuid', {deck_uuid:deck_uuid}), {
     success: function( response ) {
       var type = response.allowed ? 'warning' : 'danger';
       if(response.message) {
@@ -65,7 +65,7 @@ function show_publish_deck_form(deck_id, deck_name, deck_description) {
       $('#publish-decklist-form').prepend('<div id="publish-form-alert" class="alert alert-danger">'+jqXHR.responseText+'</div>');
     }
   });
-  $('#publish-deck-id').val(deck_id);
+  $('#publish-deck-uuid').val(deck_uuid);
   $('#publish-decklist-name').val(deck_name);
   $('#publish-decklist-description').val(deck_description);
   $('#publishModal').modal('show');

From 4e694a45a0e2ddc8a16655693b2266314305e2c0 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 15:55:43 -0600
Subject: [PATCH 07/20] Finish deck UUID changes.

---
 app/Resources/views/Builder/decks.html.twig   |  2 +-
 .../Controller/BuilderController.php          | 81 +------------------
 src/AppBundle/Resources/config/routing.yml    | 60 --------------
 web/js/decks.js                               | 53 ++++++------
 4 files changed, 30 insertions(+), 166 deletions(-)

diff --git a/app/Resources/views/Builder/decks.html.twig b/app/Resources/views/Builder/decks.html.twig
index 26b06c24..9bf16d77 100755
--- a/app/Resources/views/Builder/decks.html.twig
+++ b/app/Resources/views/Builder/decks.html.twig
@@ -274,7 +274,7 @@ var Identity = null,
         <div class="row">
           <div class="col-md-12">
             <form action="{{ path('deck_delete_list') }}" method="POST" enctype="application/x-www-form-urlencoded" id="delete-deck-list-form">
-              <input type="hidden" name="ids" id="delete-deck-list-id" value="">
+              <input type="hidden" name="uuids" id="delete-deck-list-uuid" value="">
               <p>
               Are you sure that you want to delete all the decks selected?
               </p>
diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 055b14b8..3a437507 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -416,21 +416,6 @@ public function textExportByUuidAction(Deck $deck, Judge $judge, CardsData $card
         return $this->textExport($deck, $judge, $cardsData);
     }
 
-    /**
-     * @param Deck $deck
-     * @param Judge $judge
-     * @param CardsData $cardsData
-     * @return Response
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
-     */
-    public function textExportByIdAction(Deck $deck, Judge $judge, CardsData $cardsData)
-    {
-        return $this->textExport($deck, $judge, $cardsData);
-    }
-
     /**
      * @param Deck $deck
      * @param Judge $judge
@@ -584,19 +569,6 @@ public function octgnExportByUuidAction(Deck $deck)
         return $this->octgnExport($deck);
     }
 
-    /**
-     * @param Deck $deck
-     * @return Response
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
-     */
-    public function octgnExportByIdAction(Deck $deck)
-    {
-        return $this->octgnExport($deck);
-    }
-
     /**
      * @param Deck $deck
      * @return Response
@@ -751,11 +723,11 @@ public function deleteAction(Request $request, EntityManagerInterface $entityMan
      */
     public function deleteListAction(Request $request, EntityManagerInterface $entityManager)
     {
-        $list_id = explode('-', $request->get('ids'));
+        $list_uuid = explode(',', $request->get('uuids'));
 
-        foreach ($list_id as $id) {
+        foreach ($list_uuid as $uuid) {
             /** @var Deck $deck */
-            $deck = $entityManager->getRepository('AppBundle:Deck')->find($id);
+            $deck = $entityManager->getRepository('AppBundle:Deck')->findOneBy(["uuid" => $uuid]);
             if (!$deck) {
                 continue;
             }
@@ -770,7 +742,7 @@ public function deleteListAction(Request $request, EntityManagerInterface $entit
         }
         $entityManager->flush();
 
-        $this->addFlash('notice', "DeckManager deleted.");
+        $this->addFlash('notice', "Decks deleted.");
 
         return $this->redirect($this->generateUrl('decks_list'));
     }
@@ -970,23 +942,6 @@ public function editByUuidAction(string $deck_uuid, EntityManagerInterface $enti
         return $this->edit($entityManager, [$this->editQueryBase() . " WHERE d.uuid = ?", [$deck_uuid]]);
     }
 
-    /**
-     * @param int                    $deck_id
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     */
-    public function editByIdAction(int $deck_id, EntityManagerInterface $entityManager)
-    {
-        return $this->edit($entityManager, [$this->editQueryBase() . " WHERE d.id= ?", [$deck_id]]);
-    }
-
-    public function viewByIdAction(int $deck_id, EntityManagerInterface $entityManager, Judge $judge) {
-        return $this->viewAction(["d.id = ?", $deck_id], $entityManager, $judge);
-    }
-
     /**
      * @param string                 $deck_uuid
      * @param EntityManagerInterface $entityManager
@@ -1158,19 +1113,6 @@ public function listAction(EntityManagerInterface $entityManager, DeckManager $d
         );
     }
 
-    /**
-     * @param Decklist $decklist
-     * @return Response
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
-     */
-    public function copyByIdAction(Decklist $decklist)
-    {
-        return $this->copy($decklist);
-    }
-
     /**
      * @param Decklist $decklist
      * @return Response
@@ -1335,21 +1277,6 @@ public function uploadallAction(Request $request, EntityManagerInterface $entity
         return $this->redirect($this->generateUrl('decks_list'));
     }
 
-    /**
-     * @param Deck $deck
-     * @param Request                $request
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
-     */
-    public function autosaveByIdAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
-    {
-        return $this->autosave($deck, $request, $entityManager);
-    }
-
     /**
      * @param Deck $deck
      * @param Request                $request
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index f39f2cbe..7ff559fa 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -34,16 +34,6 @@ deck_save:
     requirements:
         _locale: \w\w
 
-deck_edit:
-    path: /{_locale}/deck/edit/{deck_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Builder:editById
-        _locale: en
-    requirements:
-        _locale: \w\w
-        deck_id: \d+
-
 deck_edit_by_uuid:
     path: /{_locale}/deck/edit/{deck_uuid}
     methods: [GET]
@@ -54,16 +44,6 @@ deck_edit_by_uuid:
         _locale: \w\w
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_view:
-    path: /{_locale}/deck/view/{deck_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Builder:viewById
-        _locale: en
-    requirements:
-        _locale: \w\w
-        deck_id: \d+
-
 deck_view_by_uuid:
     path: /{_locale}/deck/view/{deck_uuid}
     methods: [GET]
@@ -93,14 +73,6 @@ decks_list:
     requirements:
         _locale: \w\w
 
-deck_publish:
-    path: /deck/can_publish/{deck_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Social:publishById
-    requirements:
-        deck_id: \d+
-
 deck_publish_by_uuid:
     path: /deck/can_publish/{deck_uuid}
     methods: [GET]
@@ -109,12 +81,6 @@ deck_publish_by_uuid:
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_autosave:
-    path: /deck/autosave/{deck_id}
-    methods: [POST]
-    defaults:
-        _controller: AppBundle:Builder:autosaveById
-
 deck_autosave_by_uuid:
     path: /deck/autosave/{deck_uuid}
     methods: [POST]
@@ -180,14 +146,6 @@ decks_upload_all:
     defaults:
         _controller: AppBundle:Builder:uploadall
 
-deck_export_octgn:
-    path: /deck/export/octgn/{deck_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Builder:octgnExportById
-    requirements:
-        deck_id: \d+
-
 deck_export_octgn_by_uuid:
     path: /deck/export/octgn/{deck_uuid}
     methods: [GET]
@@ -196,14 +154,6 @@ deck_export_octgn_by_uuid:
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_export_text:
-    path: /deck/export/text/{deck_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Builder:textExportById
-    requirements:
-        deck_id: \d+
-
 deck_export_text_by_uuid:
     path: /deck/export/text/{deck_uuid}
     methods: [GET]
@@ -212,16 +162,6 @@ deck_export_text_by_uuid:
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_copy:
-    path: /{_locale}/deck/copy/{decklist_id}
-    methods: [POST]
-    defaults:
-        _controller: AppBundle:Builder:copyById
-        _locale: en
-    requirements:
-        _locale: \w\w
-        decklist_id: \d+
-
 deck_copy_by_uuid:
     path: /{_locale}/deck/copy/{decklist_uuid}
     methods: [POST]
diff --git a/web/js/decks.js b/web/js/decks.js
index 4eaee1b7..a831dc34 100755
--- a/web/js/decks.js
+++ b/web/js/decks.js
@@ -200,13 +200,13 @@ function filter_decks() {
   var buttons = $('#tag_toggles button.active');
   var list_id = [];
   buttons.each(function (index, button) {
-    list_id = list_id.concat($(button).data('deck_id').split(/\s+/));
+    list_id = list_id.concat($(button).data('deck_uuid').split(/\s+/));
   });
   list_id = list_id.filter(function (itm,i,a) { return i==a.indexOf(itm); });
   $('#decks a.deck-list-group-item').each(function (index, elt) {
     $(elt).removeClass('selected');
-    var id = $(elt).attr('id').replace('deck_', '');
-    if(list_id.length && list_id.indexOf(id) === -1) $(elt).hide();
+    var uuid = $(elt).attr('id').replace('deck_', '');
+    if(list_id.length && list_id.indexOf(uuid) === -1) $(elt).hide();
     else $(elt).show();
   });
 }
@@ -267,39 +267,36 @@ function do_action_sort(event) {
   return false;
 }
 
-function sort_list(type)
-{
+function sort_list(type) {
   var container = $('#decks');
-    var current_sort = container.data('sort-type');
-    var current_order = container.data('sort-order');
-    var order = current_order || 1;
-    if(current_sort && current_sort == type) {
-        order = -order;
-    }
-    container.data('sort-type', type);
-    container.data('sort-order', order);
-    var sorted_list_id = Decks.sort(function (a, b) {
+  var current_sort = container.data('sort-type');
+  var current_order = container.data('sort-order');
+  var order = current_order || 1;
+  if (current_sort && current_sort == type) {
+    order = -order;
+  }
+  container.data('sort-type', type);
+  container.data('sort-order', order);
+  var sorted_list_id = Decks.sort(function (a, b) {
     return order * a[type].localeCompare(b[type]);
   }).map(function (deck) {
-    return deck.id;
+    return deck.uuid;
   });
   var deck_elt = $('#deck_'+sorted_list_id.shift());
 
   container.prepend(deck_elt);
-  sorted_list_id.forEach(function (deck_id) {
-    deck_elt = $('#deck_'+deck_id).insertAfter(deck_elt);
+  sorted_list_id.forEach(function (deck_uuid) {
+    deck_elt = $('#deck_'+deck_uuid).insertAfter(deck_elt);
   });
-
 }
 
 
-function update_tag_toggles()
-{
-  // tags is an object where key is tag and value is array of deck ids
+function update_tag_toggles() {
+  // tags is an object where key is tag and value is array of deck uuids
   var tag_dict = Decks.reduce(function (p, c) {
     c.tags.forEach(function (t) {
       if(!p[t]) p[t] = [];
-      p[t].push(c.id);
+      p[t].push(c.uuid);
     });
     return p;
   }, {});
@@ -309,7 +306,7 @@ function update_tag_toggles()
   }
   var container = $('#tag_toggles').empty();
   tags.sort().forEach(function (tag) {
-    $('<button type="button" class="btn btn-default btn-xs" data-toggle="button">'+tag+'</button>').data('deck_id', tag_dict[tag].join(' ')).appendTo(container);
+    $('<button type="button" class="btn btn-default btn-xs" data-toggle="button">'+tag+'</button>').data('deck_uuid', tag_dict[tag].join(' ')).appendTo(container);
   });
 
 }
@@ -431,8 +428,8 @@ function confirm_delete(deck) {
   $('#deleteModal').modal('show');
 }
 
-function confirm_delete_all(ids) {
-  $('#delete-deck-list-id').val(ids.join('-'));
+function confirm_delete_all(uuids) {
+  $('#delete-deck-list-uuid').val(uuids.join(','));
   $('#deleteListModal').modal('show');
 }
 
@@ -442,11 +439,11 @@ function hide_deck() {
 }
 
 function show_deck() {
-  var deck_id = $(LastClickedDeck).data('id');
-  var deck = _.find(Decks, function (deck) { return deck.id === deck_id });
+  var deck_uuid = $(LastClickedDeck).data('uuid');
+  var deck = _.find(Decks, function (deck) { return deck.uuid === deck_uuid });
   if(!deck) return;
 
-  var container = $('#deck_'+deck.id);
+  var container = $('#deck_'+deck.uuid);
   $('#deck').appendTo(container);
   $('#deck').show();
 

From e03999f1d3f90791c002b14ca3d1044fa695d835 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 16:15:56 -0600
Subject: [PATCH 08/20] Update DOTW on the homepage to use UUID

---
 app/Resources/views/Default/decklist_of_the_week.html.twig | 2 +-
 src/AppBundle/Controller/IndexController.php               | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Resources/views/Default/decklist_of_the_week.html.twig b/app/Resources/views/Default/decklist_of_the_week.html.twig
index 95ce384c..5fa7058e 100755
--- a/app/Resources/views/Default/decklist_of_the_week.html.twig
+++ b/app/Resources/views/Default/decklist_of_the_week.html.twig
@@ -2,7 +2,7 @@
 <div id="highlight" class="decklist">
 
 <h2 class="section">Decklist of the week </h2>
-<h3><a class="decklist-name" href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></h3>
+<h3><a class="decklist-name" href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></h3>
 
 <!-- Identity and Stats -->
 <div class="row">
diff --git a/src/AppBundle/Controller/IndexController.php b/src/AppBundle/Controller/IndexController.php
index 04be31d1..36c0ca53 100755
--- a/src/AppBundle/Controller/IndexController.php
+++ b/src/AppBundle/Controller/IndexController.php
@@ -28,6 +28,11 @@ public function indexAction(Request $request, EntityManagerInterface $entityMana
         $rows = $dbh->executeQuery("SELECT decklist FROM highlight WHERE id=?", [1])->fetchAll();
         $decklist = count($rows) ? json_decode($rows[0]['decklist']) : null;
 
+		// TODO(plural): Remove this lookup once the DOTW contains UUID by default.
+		if ($decklist != null) {
+	        $decklist_object = $entityManager->getRepository('AppBundle:Decklist')->find($decklist->{'id'});
+			$decklist->{'uuid'} = $decklist_object->getUuid();
+		}
         // recent decklists
         $decklists_recent = $decklistManager->recent(0, 10, false)['decklists'];
 

From c186108abe26de6a074a4dba2918dcede445310d Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 19:09:35 -0600
Subject: [PATCH 09/20] Update decklist templates and JS to use UUID.

---
 .../views/Activity/decklist_comment.html.twig |  2 +-
 .../views/Activity/decklist_publish.html.twig |  2 +-
 app/Resources/views/Builder/deck.html.twig    |  2 +-
 .../views/Builder/deckview.html.twig          |  4 +-
 .../Decklist/decklist-row-always-xs.html.twig |  2 +-
 .../views/Decklist/decklist-row.html.twig     |  4 +-
 .../views/Decklist/decklist.html.twig         |  8 +--
 .../views/Default/allcomments.html.twig       |  2 +-
 .../views/Default/usercomments.html.twig      |  2 +-
 .../views/Diff/decklistsDiff.html.twig        |  4 +-
 app/Resources/views/Faction/faction.html.twig |  2 +-
 .../Controller/BuilderController.php          |  5 ++
 .../Controller/DecklistsController.php        | 21 +++---
 src/AppBundle/Controller/SocialController.php | 43 ++----------
 src/AppBundle/Resources/config/routing.yml    | 69 +------------------
 src/AppBundle/Service/DecklistManager.php     | 13 ++++
 src/AppBundle/Service/ModerationHelper.php    |  6 +-
 web/js/decklist.js                            | 10 +--
 web/js/deckview.js                            |  2 +-
 19 files changed, 65 insertions(+), 138 deletions(-)

diff --git a/app/Resources/views/Activity/decklist_comment.html.twig b/app/Resources/views/Activity/decklist_comment.html.twig
index 93c542ef..93da1aae 100755
--- a/app/Resources/views/Activity/decklist_comment.html.twig
+++ b/app/Resources/views/Activity/decklist_comment.html.twig
@@ -1,4 +1,4 @@
-<a href="{{ path('decklist_detail', { 'decklist_id': item.comment.decklist.id, 'decklist_name': item.comment.decklist.prettyname|e('url') }) }}#comment-{{ item.comment.id }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
+<a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': item.comment.decklist.uuid, 'decklist_name': item.comment.decklist.prettyname|e('url') }) }}#comment-{{ item.comment.id }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
   <span class="glyphicon glyphicon-comment" style="margin-right:1em"></span>
   {% if item.comment.author.id != app.user.id %}
     <span class="username {{ item.comment.author.faction }}">{{ item.comment.author.username }}</span>
diff --git a/app/Resources/views/Activity/decklist_publish.html.twig b/app/Resources/views/Activity/decklist_publish.html.twig
index f9f419e4..1b886695 100755
--- a/app/Resources/views/Activity/decklist_publish.html.twig
+++ b/app/Resources/views/Activity/decklist_publish.html.twig
@@ -1,4 +1,4 @@
-<a href="{{ path('decklist_detail', { 'decklist_id': item.decklist.id, 'decklist_name': item.decklist.prettyname|e('url') }) }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
+<a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': item.decklist.uuid, 'decklist_name': item.decklist.prettyname|e('url') }) }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
   <span class="glyphicon glyphicon-list-alt" style="margin-right:1em"></span>
   {% if item.decklist.user.id != app.user.id %}
   <span class="username {{ item.decklist.user.faction }}">{{ item.decklist.user.username }}</span>
diff --git a/app/Resources/views/Builder/deck.html.twig b/app/Resources/views/Builder/deck.html.twig
index eb4de0ee..e00b1015 100755
--- a/app/Resources/views/Builder/deck.html.twig
+++ b/app/Resources/views/Builder/deck.html.twig
@@ -243,7 +243,7 @@ var Filters = {},
       {% if published_decklists|length %}
       {% for decklist in published_decklists %}
         <tr>
-          <td class="decklist-name"><a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+          <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
           <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
           <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
           <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
diff --git a/app/Resources/views/Builder/deckview.html.twig b/app/Resources/views/Builder/deckview.html.twig
index ba94f1d2..130f4376 100755
--- a/app/Resources/views/Builder/deckview.html.twig
+++ b/app/Resources/views/Builder/deckview.html.twig
@@ -170,7 +170,7 @@ var Identity = null,
   {% if published_decklists|length %}
   {% for decklist in published_decklists %}
     <tr>
-      <td class="decklist-name"><a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+      <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
       <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
       <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
       <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
@@ -191,7 +191,7 @@ var Identity = null,
       {% if parent_decklists|length %}
         {% for decklist in parent_decklists %}
             <tr>
-                <td class="decklist-name"><a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+                <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
                 <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
                 <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
                 <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
diff --git a/app/Resources/views/Decklist/decklist-row-always-xs.html.twig b/app/Resources/views/Decklist/decklist-row-always-xs.html.twig
index 40ff81a8..99981a9b 100755
--- a/app/Resources/views/Decklist/decklist-row-always-xs.html.twig
+++ b/app/Resources/views/Decklist/decklist-row-always-xs.html.twig
@@ -4,7 +4,7 @@
   </td>
   <td>
     <div>
-      <a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+      <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
     </div>
     <div class="small">
       <i>{{ decklist.lastpack }}</i>
diff --git a/app/Resources/views/Decklist/decklist-row.html.twig b/app/Resources/views/Decklist/decklist-row.html.twig
index a32434e5..dfef4147 100755
--- a/app/Resources/views/Decklist/decklist-row.html.twig
+++ b/app/Resources/views/Decklist/decklist-row.html.twig
@@ -1,6 +1,6 @@
 <div style="border-top: 1px solid #ddd;margin-bottom: 10px;padding-top: 10px;">
   <div class="visible-xs-block">
-    <a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+    <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
   </div>
   <div class="media" style="margin-top:0">
     <div class="media-left">
@@ -9,7 +9,7 @@
     <div class="media-body">
       <div class="row h4 hidden-xs">
         <div class="col-sm-9">
-          <a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+          <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
         </div>
         <div class="col-sm-3 small social">
           <span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}
diff --git a/app/Resources/views/Decklist/decklist.html.twig b/app/Resources/views/Decklist/decklist.html.twig
index d602dc89..856fed2d 100755
--- a/app/Resources/views/Decklist/decklist.html.twig
+++ b/app/Resources/views/Decklist/decklist.html.twig
@@ -49,7 +49,7 @@ NRDB.user.params.decklist_id = Decklist.id;
                 </a>
             </div>
             {% if duplicate %}
-            | <small>Duplicate of <a href="{{ path('decklist_detail', { 'decklist_id': duplicate.id, 'decklist_name': duplicate.prettyname|e('url') }) }}">{{ duplicate.name }}</a></small>
+            | <small>Duplicate of <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': duplicate.uuid, 'decklist_name': duplicate.prettyname|e('url') }) }}">{{ duplicate.name }}</a></small>
             {% endif %}
         </div>
     </div>
@@ -258,7 +258,7 @@ NRDB.user.params.decklist_id = Decklist.id;
 {% if precedent_decklists|length %}
 {% for decklist in precedent_decklists %}
 <tr>
-  <td class="decklist-name"><a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+  <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
   <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
   <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
   <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
@@ -279,7 +279,7 @@ NRDB.user.params.decklist_id = Decklist.id;
 {% if successor_decklists|length %}
 {% for decklist in successor_decklists %}
 <tr>
-  <td class="decklist-name"><a href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+  <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
   <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
   <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
   <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
@@ -385,7 +385,7 @@ NRDB.user.params.decklist_id = Decklist.id;
       <div class="modal-body">
         <div class="row">
           <div class="col-md-12">
-            <form action="{{ path('decklist_delete', {decklist_id:decklist.id}) }}" method="POST" enctype="application/x-www-form-urlencoded" id="delete-decklistform">
+            <form action="{{ path('decklist_delete', {decklist_uuid:decklist.uuid}) }}" method="POST" enctype="application/x-www-form-urlencoded" id="delete-decklistform">
               <input type="hidden" name="decklist_id" id="delete-decklist-id" value="{{ decklist.id }}">
               <p>Are you sure you want to delete this decklist?</p>
               <div class="pull-right">
diff --git a/app/Resources/views/Default/allcomments.html.twig b/app/Resources/views/Default/allcomments.html.twig
index 7e615d7a..25593b38 100755
--- a/app/Resources/views/Default/allcomments.html.twig
+++ b/app/Resources/views/Default/allcomments.html.twig
@@ -16,7 +16,7 @@
 
 <tr>
 <td>
-<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_detail', {decklist_id:comment.decklist_id,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>, by <a href="{{ path('user_profile_view', {user_id:comment.user_id,user_name:comment.author|e('url')}) }}" class="comment-author username">{{ comment.author }}</a>:</div>
+<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_detail_by_uuid', {decklist_uuid:comment.decklist_uuid,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>, by <a href="{{ path('user_profile_view', {user_id:comment.user_id,user_name:comment.author|e('url')}) }}" class="comment-author username">{{ comment.author }}</a>:</div>
 {{ comment.text|raw }}
 </td>
 </tr>
diff --git a/app/Resources/views/Default/usercomments.html.twig b/app/Resources/views/Default/usercomments.html.twig
index 301285d8..6362f08f 100755
--- a/app/Resources/views/Default/usercomments.html.twig
+++ b/app/Resources/views/Default/usercomments.html.twig
@@ -16,7 +16,7 @@
 
 <tr>
 <td>
-<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_detail', {decklist_id:comment.decklist_id,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>:</div>
+<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_detail_by_uuid', {decklist_uuid:comment.decklist_uuid,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>:</div>
 {{ comment.text|raw }}
 </td>
 </tr>
diff --git a/app/Resources/views/Diff/decklistsDiff.html.twig b/app/Resources/views/Diff/decklistsDiff.html.twig
index 6d5a89f4..b0da2ec0 100755
--- a/app/Resources/views/Diff/decklistsDiff.html.twig
+++ b/app/Resources/views/Diff/decklistsDiff.html.twig
@@ -8,7 +8,7 @@
 
 <div class="row">
 <div class="col-sm-4">
-<h3><a href="{{ path('decklist_detail', {'decklist_id': decklist1.id,'decklist_name':decklist1.prettyname}) }}">{{ decklist1.name }}</a></h3>
+<h3><a href="{{ path('decklist_detail_by_uuid', {'decklist_uuid': decklist1.uuid,'decklist_name':decklist1.prettyname}) }}">{{ decklist1.name }}</a></h3>
 {% for card in decklist1.content %}
 <div>
     {{ card.qty }}x
@@ -26,7 +26,7 @@
 {% endfor %}
 </div>
 <div class="col-sm-4">
-<h3><a href="{{ path('decklist_detail', {'decklist_id': decklist2.id,'decklist_name':decklist2.prettyname}) }}">{{ decklist2.name }}</a></h3>
+<h3><a href="{{ path('decklist_detail_by_uuid', {'decklist_uuid': decklist2.uuid,'decklist_name':decklist2.prettyname}) }}">{{ decklist2.name }}</a></h3>
 {% for card in decklist2.content %}
 <div>
     {{ card.qty }}x
diff --git a/app/Resources/views/Faction/faction.html.twig b/app/Resources/views/Faction/faction.html.twig
index f753ce3c..ca3ca696 100755
--- a/app/Resources/views/Faction/faction.html.twig
+++ b/app/Resources/views/Faction/faction.html.twig
@@ -42,7 +42,7 @@
         <span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}
         <span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}
       </small>
-      <a class="decklist-name" href="{{ path('decklist_detail', { 'decklist_id': decklist.id, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+      <a class="decklist-name" href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
     </h4>
     <h5>
       <time class="pull-right" datetime="{{ decklist.dateCreation|date('c') }}">{{ decklist.dateCreation|date('j M Y') }}</time>
diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 3a437507..05b059b6 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -880,6 +880,7 @@ private function edit(EntityManagerInterface $entityManager, array $queryWithArg
         $published_decklists = $dbh->executeQuery(
             "SELECT
                d.id,
+               d.uuid,
                d.name,
                d.prettyname,
                d.nbvotes,
@@ -899,6 +900,7 @@ private function edit(EntityManagerInterface $entityManager, array $queryWithArg
         $parent_decklists = $dbh->executeQuery(
             "SELECT
                d.id,
+               d.uuid,
                d.name,
                d.prettyname,
                d.nbvotes,
@@ -957,6 +959,7 @@ private function getViewQueryBase() {
         return "
             SELECT
               d.id,
+              d.uuid,
               d.name,
               d.description,
               m.code,
@@ -1014,6 +1017,7 @@ public function viewAction(array $query_elements, EntityManagerInterface $entity
         $published_decklists = $dbh->executeQuery("
             SELECT
               d.id,
+              d.uuid,
               d.name,
               d.prettyname,
               d.nbvotes,
@@ -1032,6 +1036,7 @@ public function viewAction(array $query_elements, EntityManagerInterface $entity
         $parent_decklists = $dbh->executeQuery("
             SELECT
               d.id,
+              d.uuid,
               d.name,
               d.prettyname,
               d.nbvotes,
diff --git a/src/AppBundle/Controller/DecklistsController.php b/src/AppBundle/Controller/DecklistsController.php
index 429b5661..1e38b172 100644
--- a/src/AppBundle/Controller/DecklistsController.php
+++ b/src/AppBundle/Controller/DecklistsController.php
@@ -291,26 +291,26 @@ private function searchForm(Request $request, EntityManagerInterface $entityMana
     }
 
     /**
-     * @param int                    $decklist1_id
-     * @param int                    $decklist2_id
+     * @param string                    $decklist1_uuid
+     * @param string                    $decklist2_uuid
      * @param EntityManagerInterface $entityManager
      * @param DiffService            $diffService
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
-    public function diffAction(int $decklist1_id, int $decklist2_id, EntityManagerInterface $entityManager, DiffService $diffService)
+    public function diffAction(string $decklist1_uuid, string $decklist2_uuid, EntityManagerInterface $entityManager, DiffService $diffService)
     {
-        if ($decklist1_id > $decklist2_id) {
-            // TODO(plural): Update decklists_diff to take deck UUIDs
-            return $this->redirect($this->generateUrl('decklists_diff', ['decklist1_id' => $decklist2_id, 'decklist2_id' => $decklist1_id]));
-        }
+#        if ($decklist1_id > $decklist2_id) {
+#            // TODO(plural): Update decklists_diff to take deck UUIDs
+#            return $this->redirect($this->generateUrl('decklists_diff', ['decklist1_id' => $decklist2_id, 'decklist2_id' => $decklist1_id]));
+#        }
         $response = new Response();
         $response->setPublic();
         $response->setMaxAge($this->getParameter('short_cache'));
 
         /** @var Decklist $d1 */
-        $d1 = $entityManager->getRepository('AppBundle:Decklist')->find($decklist1_id);
+        $d1 = $entityManager->getRepository('AppBundle:Decklist')->findOneBy(["uuid" => $decklist1_uuid]);
         /** @var Decklist $d2 */
-        $d2 = $entityManager->getRepository('AppBundle:Decklist')->find($decklist2_id);
+        $d2 = $entityManager->getRepository('AppBundle:Decklist')->findOneBy(["uuid" => $decklist2_uuid]);
 
         if (!$d1 || !$d2) {
             throw $this->createNotFoundException();
@@ -356,7 +356,6 @@ public function diffAction(int $decklist1_id, int $decklist2_id, EntityManagerIn
             }
         }
 
-
         return $this->render(
             '/Diff/decklistsDiff.html.twig',
             [
@@ -364,6 +363,7 @@ public function diffAction(int $decklist1_id, int $decklist2_id, EntityManagerIn
                     'faction_code' => $d1->getFaction()->getCode(),
                     'name'         => $d1->getName(),
                     'id'           => $d1->getId(),
+                    'uuid'         => $d1->getUuid(),
                     'prettyname'   => $d1->getPrettyname(),
                     'content'      => $content1,
                 ],
@@ -371,6 +371,7 @@ public function diffAction(int $decklist1_id, int $decklist2_id, EntityManagerIn
                     'faction_code' => $d2->getFaction()->getCode(),
                     'name'         => $d2->getName(),
                     'id'           => $d2->getId(),
+                    'uuid'         => $d2->getUuid(),
                     'prettyname'   => $d2->getPrettyname(),
                     'content'      => $content2,
                 ],
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 531fb0ba..54a52405 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -386,6 +386,7 @@ private function view(array $rows, EntityManagerInterface $entityManager)
         $precedent_decklists = $dbh->executeQuery(
             "SELECT
                d.id,
+               d.uuid,
                d.name,
                d.prettyname,
                d.nbvotes,
@@ -403,6 +404,7 @@ private function view(array $rows, EntityManagerInterface $entityManager)
         $successor_decklists = $dbh->executeQuery(
             "SELECT
                d.id,
+               d.uuid,
                d.name,
                d.prettyname,
                d.nbvotes,
@@ -420,6 +422,7 @@ private function view(array $rows, EntityManagerInterface $entityManager)
         $duplicate = $dbh->executeQuery(
             "SELECT
                d.id,
+               d.uuid,
                d.name,
                d.prettyname
              FROM decklist d
@@ -574,8 +577,8 @@ public function commentAction(Request $request, EntityManagerInterface $entityMa
     {
         $user = $this->getUser();
 
-        $decklist_id = filter_var($request->get('id'), FILTER_SANITIZE_NUMBER_INT);
-        $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
+        $decklist_uuid = $request->get('uuid');
+        $decklist = $entityManager->getRepository('AppBundle:Decklist')->findOneBy(["uuid" => $decklist_uuid]);
         if (!$decklist instanceof Decklist) {
             throw $this->createNotFoundException();
         }
@@ -949,23 +952,6 @@ private function octgnExport(Decklist $decklist)
         return $response;
     }
 
-    /**
-     * @param Decklist $decklist
-     * @param Request                $request
-     * @param EntityManagerInterface $entityManager
-     * @param TextProcessor          $textProcessor
-     * @param ModerationHelper       $moderationHelper
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
-     */
-    public function editByIdAction(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
-    {
-        return $this->edit($decklist, $request, $entityManager, $textProcessor, $moderationHelper);
-    }
-
     /**
      * @param Decklist $decklist
      * @param Request                $request
@@ -1260,6 +1246,7 @@ public function usercommentsAction(int $page, Request $request, EntityManagerInt
                c.text,
                c.date_creation,
                d.id decklist_id,
+               d.uuid decklist_uuid,
                d.name decklist_name,
                d.prettyname decklist_prettyname
                from comment c
@@ -1339,6 +1326,7 @@ public function commentsAction(int $page, Request $request, EntityManagerInterfa
                c.text,
                c.date_creation,
                d.id decklist_id,
+               d.uuid decklist_uuid,
                d.name decklist_name,
                d.prettyname decklist_prettyname,
                u.id user_id,
@@ -1441,23 +1429,6 @@ public function activityAction(int $days, EntityManagerInterface $entityManager,
         ], $response);
     }
 
-    /**
-     * @param Decklist $decklist
-     * @param int                    $status
-     * @param int|null               $modflag_id
-     * @param EntityManagerInterface $entityManager
-     * @param ModerationHelper       $moderationHelper
-     * @return JsonResponse
-     *
-     * @IsGranted("ROLE_MODERATOR")
-     *
-     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
-     */
-    public function moderateByIdAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
-    {
-        return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
-    }
-
     /**
      * @param Decklist $decklist
      * @param int                    $status
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 7ff559fa..8c2cf0ee 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -172,14 +172,6 @@ deck_copy_by_uuid:
         _locale: \w\w
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-decklist_export_octgn:
-    path: /decklist/export/octgn/{decklist_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Social:octgnExportById
-    requirements:
-        decklist_id: \d+
-
 decklist_export_octgn_by_uuid:
     path: /decklist/export/octgn/{decklist_uuid}
     methods: [GET]
@@ -188,14 +180,6 @@ decklist_export_octgn_by_uuid:
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-decklist_export_text:
-    path: /decklist/export/text/{decklist_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Social:textExportById
-    requirements:
-        decklist_id: \d+
-
 decklist_export_text_by_uuid:
     path: /decklist/export/text/{decklist_uuid}
     methods: [GET]
@@ -234,17 +218,6 @@ decklists_list:
         _locale: \w\w
         page: \d+
 
-decklist_detail:
-    path: /{_locale}/decklist/{decklist_id}/{decklist_name}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Social:viewById
-        _locale: en
-        decklist_name: null
-    requirements:
-        _locale: \w\w
-        decklist_id: \d+
-
 decklist_detail_by_uuid:
     path: /{_locale}/decklist/{decklist_uuid}/{decklist_name}
     methods: [GET]
@@ -256,16 +229,6 @@ decklist_detail_by_uuid:
         _locale: \w\w
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-decklist_detail_no_name:
-    path: /{_locale}/decklist/{decklist_id}
-    methods: [GET]
-    defaults:
-        _controller: AppBundle:Social:viewById
-        _locale: en
-    requirements:
-        _locale: \w\w
-        decklist_id: \d+
-
 decklist_detail_no_name_by_uuid:
     path: /{_locale}/decklist/{decklist_uuid}
     methods: [GET]
@@ -300,14 +263,6 @@ decklist_comment_hide:
     defaults:
         _controller: AppBundle:Social:hidecomment
 
-decklist_edit:
-    path: /decklist/edit/{decklist_id}
-    methods: [POST]
-    defaults:
-        _controller: AppBundle:Social:editById
-    requirements:
-        decklist_id: \d+
-
 decklist_edit_by_uuid:
     path: /decklist/edit/{decklist_uuid}
     methods: [POST]
@@ -316,14 +271,6 @@ decklist_edit_by_uuid:
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-decklist_delete:
-    path: /decklist/delete/{decklist_id}
-    methods: [POST]
-    defaults:
-        _controller: AppBundle:Social:deleteById
-    requirements:
-        decklist_id: \d+
-
 decklist_delete:
     path: /decklist/delete/{decklist_uuid}
     methods: [POST]
@@ -333,15 +280,15 @@ decklist_delete:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 decklists_diff:
-    path: /{_locale}/decklists/diff/{decklist1_id}/{decklist2_id}
+    path: /{_locale}/decklists/diff/{decklist1_uuid}/{decklist2_uuid}
     methods: [GET]
     defaults:
         _controller: AppBundle:Decklists:diff
         _locale: en
     requirements:
         _locale: \w\w
-        decklist1_id: \d+
-        decklist2_id: \d+
+        decklist1_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+        decklist2_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 prebuilt_view:
     path: /{_locale}/prebuilt/{prebuilt_code}
@@ -846,16 +793,6 @@ cards_sets:
     requirements:
         _locale: \w\w
 
-decklist_moderate:
-    path: /decklist/moderate/{decklist_id}/{status}/{modflag_id}
-    methods: [POST]
-    defaults:
-        _controller: AppBundle:Social:moderateById
-        modflag_id: null
-    requirements:
-        decklist_id: \d+
-        status: \d
-
 decklist_moderate:
     path: /decklist/moderate/{decklist_uuid}/{status}/{modflag_id}
     methods: [POST]
diff --git a/src/AppBundle/Service/DecklistManager.php b/src/AppBundle/Service/DecklistManager.php
index ec272639..c83d89f4 100755
--- a/src/AppBundle/Service/DecklistManager.php
+++ b/src/AppBundle/Service/DecklistManager.php
@@ -36,6 +36,7 @@ public function favorites(int $user_id, int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -95,6 +96,7 @@ public function by_author(int $user_id, int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -148,6 +150,7 @@ public function popular(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -199,6 +202,7 @@ public function dotw(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery("
             SELECT SQL_CALC_FOUND_ROWS
               d.id,
+              d.uuid,
               d.name,
               d.prettyname,
               d.date_creation,
@@ -248,6 +252,7 @@ public function halloffame(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -298,6 +303,7 @@ public function hottopics(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -349,6 +355,7 @@ public function tournaments(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -399,6 +406,7 @@ public function faction(string $faction_code, int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -453,6 +461,7 @@ public function lastpack(string $pack_code, int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -508,6 +517,7 @@ public function recent(int $start = 0, int $limit = 30, bool $includeEmptyDesc =
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -559,6 +569,7 @@ public function trashed(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -608,6 +619,7 @@ public function restored(int $start = 0, int $limit = 30)
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
@@ -794,6 +806,7 @@ public function find(int $start = 0, int $limit = 30, Request $request, $cardsDa
         $rows = $dbh->executeQuery(
             "SELECT SQL_CALC_FOUND_ROWS
                 d.id,
+                d.uuid,
                 d.name,
                 d.prettyname,
                 d.date_creation,
diff --git a/src/AppBundle/Service/ModerationHelper.php b/src/AppBundle/Service/ModerationHelper.php
index cd6694aa..3995336d 100644
--- a/src/AppBundle/Service/ModerationHelper.php
+++ b/src/AppBundle/Service/ModerationHelper.php
@@ -75,7 +75,7 @@ public function changeStatus(User $user, Decklist $decklist, int $status, int $m
             }
             $decklist->setModflag($modflag);
         } else {
-            if ($status != Decklist::MODERATION_PUBLISHED && $status != Decklist::MODERATION_RESTORED) {
+            if ($status != Decklist::MODERATION_DELETED && $status != Decklist::MODERATION_PUBLISHED && $status != Decklist::MODERATION_RESTORED) {
                 throw new \RuntimeException("modflag_id required");
             }
         }
@@ -109,9 +109,9 @@ public function sendEmail(Decklist $decklist)
         $name = "/Emails/decklist-moderation-$status.html.twig";
 
         $url = $this->router->generate(
-            'decklist_detail',
+            'decklist_detail_by_uuid',
             [
-                'decklist_id'   => $decklist->getId(),
+                'decklist_uuid' => $decklist->getUuid(),
                 'decklist_name' => $decklist->getPrettyname(),
             ],
             UrlGeneratorInterface::ABSOLUTE_URL
diff --git a/web/js/decklist.js b/web/js/decklist.js
index 44c85fc6..66c7f4d0 100755
--- a/web/js/decklist.js
+++ b/web/js/decklist.js
@@ -67,7 +67,7 @@ function setup_moderation(moderation_status, moderation_reason, is_moderator) {
 
 function setup_comment_form() {
 
-    var form = $('<form method="POST" action="' + Routing.generate('decklist_comment') + '"><input type="hidden" name="id" value="' + Decklist.id + '"><div class="form-group">'
+    var form = $('<form method="POST" action="' + Routing.generate('decklist_comment') + '"><input type="hidden" name="uuid" value="' + Decklist.uuid + '"><div class="form-group">'
             + '<textarea id="comment-form-text" class="form-control" maxlength="10000" rows="4" name="comment" placeholder="Enter your comment in Markdown format. Type # to enter a card name. Type $ to enter a symbol. Type @ to enter a user name."></textarea>'
             + '</div><div class="well text-muted" id="comment-form-preview"><small>Preview. Look <a href="http://daringfireball.net/projects/markdown/dingus">here</a> for a Markdown syntax reference.</small></div>'
             + '<div class="form-group small"><span class="help-block">By submitting content, you agree to the <a href="'+Routing.generate('cards_about')+'#code-of-conduct">Code of Conduct</a> of the website.</span></div>'
@@ -262,10 +262,10 @@ function do_action_decklist(event) {
         return;
     switch(action_id) {
         case 'btn-download-text':
-            location.href = Routing.generate('decklist_export_text', {decklist_id: Decklist.id});
+            location.href = Routing.generate('decklist_export_text_by_uuid', {decklist_uuid: Decklist.uuid});
             break;
         case 'btn-download-octgn':
-            location.href = Routing.generate('decklist_export_octgn', {decklist_id: Decklist.id});
+            location.href = Routing.generate('decklist_export_octgn_by_uuid', {decklist_uuid: Decklist.uuid});
             break;
     }
 }
@@ -341,7 +341,7 @@ $(function () {
 });
 
 function copy_decklist() {
-    $.ajax(Routing.generate('deck_copy', {decklist_id: Decklist.id}), {
+    $.ajax(Routing.generate('deck_copy_by_uuid', {decklist_uuid: Decklist.uuid}), {
         type: 'POST',
         success: function (data, textStatus, jqXHR) {
             alert("Decklist copied");
@@ -534,7 +534,7 @@ function show_modflag_modal(data) {
 
 function change_moderation_status(status, modflag_id) {
     var url = Routing.generate('decklist_moderate', {
-        decklist_id: Decklist.id,
+        decklist_uuid: Decklist.uuid,
         status: status,
         modflag_id: modflag_id
     });
diff --git a/web/js/deckview.js b/web/js/deckview.js
index 9c536444..f338751e 100755
--- a/web/js/deckview.js
+++ b/web/js/deckview.js
@@ -29,7 +29,7 @@ function do_action_deck(event) {
   var action_id = $(this).attr('id');
   if(!action_id || !SelectedDeck) return;
   switch(action_id) {
-    case 'btn-edit': location.href=Routing.generate('deck_edit', {deck_id:SelectedDeck.id}); break;
+    case 'btn-edit': location.href=Routing.generate('deck_edit_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
     case 'btn-publish': show_publish_deck_form(SelectedDeck.id, SelectedDeck.name, SelectedDeck.description); break;
     case 'btn-delete': confirm_delete(); break;
     case 'btn-download-text': location.href=Routing.generate('deck_export_text', {deck_id:SelectedDeck.id}); break;

From d94450cc9f2c7920585abbd78a63998a0721e7e7 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 20:39:11 -0600
Subject: [PATCH 10/20] Remove final (i believe) id instead of UUID usage for
 deck and decklist code.

---
 .../views/Builder/deckview.html.twig          |  2 +-
 src/AppBundle/Controller/SocialController.php | 19 ++++++------
 web/js/decklist.js                            | 29 +++++++------------
 web/js/deckview.js                            |  8 ++---
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/app/Resources/views/Builder/deckview.html.twig b/app/Resources/views/Builder/deckview.html.twig
index 130f4376..e0837be7 100755
--- a/app/Resources/views/Builder/deckview.html.twig
+++ b/app/Resources/views/Builder/deckview.html.twig
@@ -272,7 +272,7 @@ var Identity = null,
         <div class="row">
           <div class="col-md-12">
             <form action="{{ path('deck_delete') }}" method="POST" enctype="application/x-www-form-urlencoded" id="delete-deck-form">
-              <input type="hidden" name="deck_id" id="delete-deck-id" value="">
+              <input type="hidden" name="deck_uuid" id="delete-deck-uuid" value="">
               <p>
               Are you sure that you want to delete the deck <b id="delete-deck-name"></b>?
               </p>
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 54a52405..f2af1be5 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -524,10 +524,10 @@ public function favoriteAction(Request $request, EntityManagerInterface $entityM
     {
         $user = $this->getUser();
 
-        $decklist_id = filter_var($request->get('id'), FILTER_SANITIZE_NUMBER_INT);
+        $decklist_uuid = $request->get('uuid');
 
         /** @var Decklist $decklist */
-        $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
+        $decklist = $entityManager->getRepository('AppBundle:Decklist')->findOneBy(["uuid" => $decklist_uuid]);
         if (!$decklist) {
             throw $this->createNotFoundException();
         }
@@ -540,11 +540,10 @@ public function favoriteAction(Request $request, EntityManagerInterface $entityM
                FROM decklist d
                JOIN favorite f ON f.decklist_id=d.id
                WHERE f.user_id=?
-               AND d.id=?", [
+               AND d.uuid=?", [
             $user->getId(),
-            $decklist_id,
-        ])
-                           ->fetch(\PDO::FETCH_NUM)[0];
+            $decklist_uuid,
+        ])->fetch(\PDO::FETCH_NUM)[0];
 
         if ($is_favorite) {
             $decklist->setNbfavorites($decklist->getNbfavorites() - 1);
@@ -696,10 +695,10 @@ public function voteAction(Request $request, EntityManagerInterface $entityManag
     {
         $user = $this->getUser();
 
-        $decklist_id = filter_var($request->get('id'), FILTER_SANITIZE_NUMBER_INT);
+        $decklist_uuid = $request->get('uuid');
 
         /** @var Decklist $decklist */
-        $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
+        $decklist = $entityManager->getRepository('AppBundle:Decklist')->findOneBy(["uuid" => $decklist_uuid]);
 
         if ($decklist->getUser()->getId() != $user->getId()) {
             $query = $entityManager
@@ -707,9 +706,9 @@ public function voteAction(Request $request, EntityManagerInterface $entityManag
                         ->select('d')
                         ->from(Decklist::class, 'd')
                         ->innerJoin('d.votes', 'u')
-                        ->where('d.id = :decklist_id')
+                        ->where('d.uuid = :decklist_uuid')
                         ->andWhere('u.id = :user_id')
-                        ->setParameter('decklist_id', $decklist_id)
+                        ->setParameter('decklist_uuid', $decklist_uuid)
                         ->setParameter('user_id', $user->getId())
                         ->getQuery();
 
diff --git a/web/js/decklist.js b/web/js/decklist.js
index 66c7f4d0..e9255af4 100755
--- a/web/js/decklist.js
+++ b/web/js/decklist.js
@@ -354,23 +354,16 @@ function copy_decklist() {
 }
 
 function compare_submit() {
-    var url = $('#decklist2_url').val();
-    var id = null;
-    if(url.match(/^\d+$/)) {
-        id = parseInt(url, 10);
-    } else if(url.match(/decklist\/(\d+)\//)) {
-        id = parseInt(RegExp.$1, 10);
+    var input = $('#decklist2_url').val();
+    var uuid = null;
+    var match = input.match('/decklist/(.*?)(/.*)*$')
+    if (match) {
+        uuid = match[1];
+    } else if (input.match('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$')) {
+        uuid = input;
     }
-    if(id) {
-        var id1, id2;
-        if(Decklist.id < id) {
-            id1 = Decklist.id;
-            id2 = id;
-        } else {
-            id1 = id;
-            id2 = Decklist.id;
-        }
-        location.href = Routing.generate('decklists_diff', {decklist1_id: id1, decklist2_id: id2});
+    if (uuid) {
+        location.href = Routing.generate('decklists_diff', {decklist1_uuid: Decklist.uuid, decklist2_uuid: uuid});
     }
 }
 
@@ -436,7 +429,7 @@ function delete_form() {
 function send_like() {
     var obj = $(this);
     $.post(Routing.generate('decklist_like'), {
-        id: Decklist.id
+        uuid: Decklist.uuid
     }, function (data, textStatus, jqXHR) {
         obj.find('.num').text(data);
     });
@@ -445,7 +438,7 @@ function send_like() {
 function send_favorite() {
     var obj = $(this);
     $.post(Routing.generate('decklist_favorite'), {
-        id: Decklist.id
+        uuid: Decklist.uuid
     }, function (data, textStatus, jqXHR) {
         obj.find('.num').text(data);
         var title = obj.data('original-tooltip');
diff --git a/web/js/deckview.js b/web/js/deckview.js
index f338751e..d2c90575 100755
--- a/web/js/deckview.js
+++ b/web/js/deckview.js
@@ -30,10 +30,10 @@ function do_action_deck(event) {
   if(!action_id || !SelectedDeck) return;
   switch(action_id) {
     case 'btn-edit': location.href=Routing.generate('deck_edit_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
-    case 'btn-publish': show_publish_deck_form(SelectedDeck.id, SelectedDeck.name, SelectedDeck.description); break;
+    case 'btn-publish': show_publish_deck_form(SelectedDeck.uuid, SelectedDeck.name, SelectedDeck.description); break;
     case 'btn-delete': confirm_delete(); break;
-    case 'btn-download-text': location.href=Routing.generate('deck_export_text', {deck_id:SelectedDeck.id}); break;
-    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn', {deck_id:SelectedDeck.id}); break;
+    case 'btn-download-text': location.href=Routing.generate('deck_export_text_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
+    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
     case 'btn-print': window.print(); break;
     case 'btn-sort-type': DisplaySort = 'type'; DisplaySortSecondary = null; switch_to_web_view(); break;
     case 'btn-sort-number': DisplaySort = 'number'; DisplaySortSecondary = null; switch_to_web_view(); break;
@@ -69,7 +69,7 @@ $(function() {
 
 function confirm_delete() {
   $('#delete-deck-name').text(SelectedDeck.name);
-  $('#delete-deck-id').val(SelectedDeck.id);
+  $('#delete-deck-uuid').val(SelectedDeck.uuid);
   $('#deleteModal').modal('show');
 }
 

From a8e81d695476bf409baff3b7e604c25143d8ed3f Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 22:18:06 -0600
Subject: [PATCH 11/20] Tidy up deck routes to have uuid be implicit.

Add a legacy /deck/view route that is a 301 to the UUID version.

Fix autosave route and code to use UUID.
---
 app/Resources/views/Builder/deck.html.twig    |   2 +-
 .../Controller/BuilderController.php          | 104 ++++++----------
 src/AppBundle/Controller/SocialController.php | 116 ------------------
 src/AppBundle/Resources/config/routing.yml    |  34 +++--
 web/js/deck.js                                |   6 +-
 web/js/decklist.js                            |   2 +-
 web/js/decks.js                               |  12 +-
 web/js/deckview.js                            |   6 +-
 8 files changed, 73 insertions(+), 209 deletions(-)

diff --git a/app/Resources/views/Builder/deck.html.twig b/app/Resources/views/Builder/deck.html.twig
index e00b1015..f832d2e8 100755
--- a/app/Resources/views/Builder/deck.html.twig
+++ b/app/Resources/views/Builder/deck.html.twig
@@ -25,7 +25,7 @@ var Filters = {},
         MWL_global_penalty = false,
   Deck = {{ deck.slots|json_encode|raw }},
   Side = {{ deck.side_name|json_encode|raw }},
-  Deck_id = {{ deck.id|json_encode|raw }},
+  Deck_uuid = {{ deck.uuid|json_encode|raw }},
   History = {{ deck.history|json_encode|raw }},
   Url_FactionImage = '{{  asset('/images/factions/16px/xxx.png') }}',
   Url_TypeImage = '{{ asset('/images/types/xxx.png') }}',
diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 05b059b6..27350ba5 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -411,20 +411,7 @@ public function meteorimportAction(Request $request, EntityManagerInterface $ent
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
      */
-    public function textExportByUuidAction(Deck $deck, Judge $judge, CardsData $cardsData)
-    {
-        return $this->textExport($deck, $judge, $cardsData);
-    }
-
-    /**
-     * @param Deck $deck
-     * @param Judge $judge
-     * @param CardsData $cardsData
-     * @return Response
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     */
-    public function textExport(Deck $deck, Judge $judge, CardsData $cardsData)
+    public function textExportAction(Deck $deck, Judge $judge, CardsData $cardsData)
     {
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
@@ -564,16 +551,7 @@ public function textExport(Deck $deck, Judge $judge, CardsData $cardsData)
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
      */
-    public function octgnExportByUuidAction(Deck $deck)
-    {
-        return $this->octgnExport($deck);
-    }
-
-    /**
-     * @param Deck $deck
-     * @return Response
-     */
-    public function octgnExport(Deck $deck)
+    public function octgnExportAction(Deck $deck)
     {
         if ($this->getUser()->getId() != $deck->getUser()->getId()) {
             throw $this->createAccessDeniedException();
@@ -747,10 +725,21 @@ public function deleteListAction(Request $request, EntityManagerInterface $entit
         return $this->redirect($this->generateUrl('decks_list'));
     }
 
-    private function editQueryBase() {
-        return "
+    /**
+     * @param string                    $deck_uuid
+     * @param EntityManagerInterface    $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     *
+     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
+     */
+    public function editAction(string $deck_uuid, EntityManagerInterface $entityManager)
+    {
+        $dbh = $entityManager->getConnection();
+        $rows = $dbh->executeQuery("
             SELECT
               d.id,
+              d.uuid,
               d.name,
               m.code mwl_code,
               DATE_FORMAT(d.date_creation, '%Y-%m-%dT%TZ') date_creation,
@@ -764,14 +753,8 @@ private function editQueryBase() {
               LEFT JOIN mwl m ON d.mwl_id=m.id
               LEFT JOIN user u ON d.user_id=u.id
               LEFT JOIN side s ON d.side_id=s.id
-        ";
-    }
-
-    private function edit(EntityManagerInterface $entityManager, array $queryWithArgs)
-    {
-        $dbh = $entityManager->getConnection();
-        $rows = $dbh->executeQuery($queryWithArgs[0], $queryWithArgs[1])->fetchAll();
-
+            WHERE
+              d.uuid = ?", [$deck_uuid])->fetchAll();
         $deck = $rows[0];
 
         if ($this->getUser()->getId() != $deck['user_id']) {
@@ -932,16 +915,22 @@ private function edit(EntityManagerInterface $entityManager, array $queryWithArg
     }
 
     /**
-     * @param string                    $deck_uuid
-     * @param EntityManagerInterface    $entityManager
+     * @param int                    $deck_id
+     * @param EntityManagerInterface $entityManager
+     * @param Judge                  $judge
      * @return Response
      * @throws \Doctrine\DBAL\DBALException
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
      */
-    public function editByUuidAction(string $deck_uuid, EntityManagerInterface $entityManager)
-    {
-        return $this->edit($entityManager, [$this->editQueryBase() . " WHERE d.uuid = ?", [$deck_uuid]]);
+    public function legacyViewAction(int $deck_id, EntityManagerInterface $entityManager) {
+      // TODO(plural): Only redirect if $deck_id is < configured $max_visible_deck_id
+      $deck = $entityManager->getRepository('AppBundle:Deck')->find($deck_id);
+      if ($deck) {
+        return $this->redirect(
+            $this->generateUrl('deck_view', ['deck_uuid' => $deck->getUuid()]),
+            301);
+      } else {
+        throw $this->createNotFoundException();
+      }
     }
 
     /**
@@ -951,12 +940,9 @@ public function editByUuidAction(string $deck_uuid, EntityManagerInterface $enti
      * @return Response
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function viewByUuidAction(string $deck_uuid, EntityManagerInterface $entityManager, Judge $judge) {
-        return $this->viewAction(["d.uuid = ?", $deck_uuid], $entityManager, $judge);
-    }
-
-    private function getViewQueryBase() {
-        return "
+    public function viewAction(string $deck_uuid, EntityManagerInterface $entityManager, Judge $judge) {
+        $dbh = $entityManager->getConnection();
+        $rows = $dbh->executeQuery("
             SELECT
               d.id,
               d.uuid,
@@ -975,18 +961,11 @@ private function getViewQueryBase() {
               LEFT JOIN side s ON d.side_id=s.id
               LEFT JOIN card c ON d.identity_id=c.id
               LEFT JOIN faction f ON c.faction_id=f.id
-            WHERE (u.id=? OR u.share_decks=1) AND ";
-    }
-
-    public function viewAction(array $query_elements, EntityManagerInterface $entityManager, Judge $judge)
-    {
-        $dbh = $entityManager->getConnection();
-        $rows = $dbh->executeQuery(
-            $this->getViewQueryBase() . $query_elements[0],
+            WHERE (u.id=? OR u.share_decks=1) AND d.uuid = ?",
             [
                 $this->getUser() ? $this->getUser()->getId() : null,
                 $this->getUser() ? $this->getUser()->getId() : null,
-                $query_elements[1],
+                $deck_uuid,
             ]
         )->fetchAll();
 
@@ -1126,12 +1105,7 @@ public function listAction(EntityManagerInterface $entityManager, DeckManager $d
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
      */
-    public function copyByUuidAction(Decklist $decklist)
-    {
-        return $this->copy($decklist);
-    }
-
-    private function copy(Decklist $decklist)
+    public function copyAction(Decklist $decklist)
     {
         $content = [];
         foreach ($decklist->getSlots() as $slot) {
@@ -1292,12 +1266,8 @@ public function uploadallAction(Request $request, EntityManagerInterface $entity
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
      */
-    public function autosaveByUuidAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
+    public function autosaveAction(Deck $deck, Request $request, EntityManagerInterface $entityManager)
     {
-        return $this->autosave($deck, $request, $entityManager);
-    }
-
-    private function autosave(Deck $deck, Request $request, EntityManagerInterface $entityManager) {
         $user = $this->getUser();
 
         if ($user->getId() != $deck->getUser()->getId()) {
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index f2af1be5..0e743274 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -93,67 +93,6 @@ public function publishByUuidAction(Deck $deck, EntityManagerInterface $entityMa
         return $response;
     }
 
-    /**
-     * This function is used to check if a deck can be published from the deck list page.
-     *
-     * @param Deck $deck
-     * @param EntityManagerInterface $entityManager
-     * @param Judge                  $judge
-     * @return JsonResponse
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("deck", class="AppBundle:Deck", options={"id" = "deck_id"})
-     */
-    public function publishByIdAction(Deck $deck, EntityManagerInterface $entityManager, Judge $judge)
-    {
-        $response = new JsonResponse();
-
-        if ($this->getUser()->getId() != $deck->getUser()->getId()) {
-            throw $this->createAccessDeniedException();
-        }
-
-        $analyse = $judge->analyse($deck->getSlots()->toArray());
-
-        if (isset($analyse['problem'])) {
-            $response->setData([
-                'allowed' => false,
-                'message' => $judge->problem($analyse),
-            ]);
-
-            return $response;
-        }
-
-        $new_content = json_encode($deck->getContent());
-        $new_signature = md5($new_content);
-        $old_decklists = $entityManager
-                              ->getRepository('AppBundle:Decklist')
-                              ->findBy([
-                                  'signature' => $new_signature,
-                              ]);
-        foreach ($old_decklists as $decklist) {
-            if (json_encode($decklist->getContent()) == $new_content) {
-                $url = $this->generateUrl('decklist_detail_by_uuid', [
-                    'decklist_uuid' => $decklist->getUuid(),
-                    'decklist_name' => $decklist->getPrettyName(),
-                ]);
-                $response->setData([
-                    'allowed' => true,
-                    'message' => 'This deck is <a href="' . $url . '">already published</a>. Are you sure you want to publish a duplicate?',
-                ]);
-
-                return $response;
-            }
-        }
-
-        $response->setData([
-            'allowed' => true,
-            'message' => '',
-        ]);
-
-        return $response;
-    }
-
     /**
      * @param Request                $request
      * @param EntityManagerInterface $entityManager
@@ -296,23 +235,6 @@ private function getViewQueryBase() {
              "AND d.moderation_status IN (0,1,2)"];
     }
 
-    /**
-     * @param int                    $decklist_id
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     */
-    public function viewByIdAction(int $decklist_id, EntityManagerInterface $entityManager)
-    {
-        $dbh = $entityManager->getConnection();
-        $viewQueryBase = $this->getViewQueryBase();
-        $rows = $dbh->executeQuery(
-            $viewQueryBase[0] . " d.id = ?" . $viewQueryBase[1], [$decklist_id]
-        )->fetchAll();
-
-        return $this->view($rows, $entityManager);
-    }
-
     /**
      * @param string                    $decklist_uuid
      * @param EntityManagerInterface $entityManager
@@ -725,19 +647,6 @@ public function voteAction(Request $request, EntityManagerInterface $entityManag
         return new Response($decklist->getVotes()->count());
     }
 
-    /**
-     * @param Decklist $decklist
-     * @param Judge $judge
-     * @param CardsData $cardsData
-     * @return Response
-     *
-     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
-     */
-    public function textExportByIdAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
-    {
-        return $this->textExport($decklist, $judge, $cardsData);
-    }
-
     /**
      * @param Decklist $decklist
      * @param Judge $judge
@@ -881,17 +790,6 @@ private function textExport(Decklist $decklist, Judge $judge, CardsData $cardsDa
         return $response;
     }
 
-    /**
-     * @param Decklist $decklist
-     * @return Response
-     *
-     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
-     */
-    public function octgnExportByIdAction(Decklist $decklist)
-    {
-        return $this->octgnExport($decklist);
-    }
-
     /**
      * @param Decklist $decklist
      * @return Response
@@ -1032,20 +930,6 @@ private function edit(Decklist $decklist, Request $request, EntityManagerInterfa
         ]));
     }
 
-    /**
-     * @param Decklist $decklist
-     * @param EntityManagerInterface $entityManager
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     *
-     * @IsGranted("IS_AUTHENTICATED_REMEMBERED")
-     *
-     * @ParamConverter("decklist", class="AppBundle:Decklist", options={"id" = "decklist_id"})
-     */
-    public function deleteByIdAction(Decklist $decklist, EntityManagerInterface $entityManager)
-    {
-        return $this->delete($decklist, $entityManager);
-    }
-
     /**
      * @param Decklist $decklist
      * @param EntityManagerInterface $entityManager
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index 8c2cf0ee..f9910178 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -34,21 +34,31 @@ deck_save:
     requirements:
         _locale: \w\w
 
-deck_edit_by_uuid:
+deck_edit:
     path: /{_locale}/deck/edit/{deck_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:editByUuid
+        _controller: AppBundle:Builder:edit
         _locale: en
     requirements:
         _locale: \w\w
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_view_by_uuid:
+deck_view_legacy:
+    path: /{_locale}/deck/view/{deck_id}
+    methods: [GET]
+    defaults:
+        _controller: AppBundle:Builder:legacyView
+        _locale: en
+    requirements:
+        _locale: \w\w
+        deck_id: "\\d+"
+
+deck_view:
     path: /{_locale}/deck/view/{deck_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:viewByUuid
+        _controller: AppBundle:Builder:view
         _locale: en
     requirements:
         _locale: \w\w
@@ -81,11 +91,11 @@ deck_publish_by_uuid:
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_autosave_by_uuid:
+deck_autosave:
     path: /deck/autosave/{deck_uuid}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Builder:autosaveByUuid
+        _controller: AppBundle:Builder:autosave
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
@@ -146,27 +156,27 @@ decks_upload_all:
     defaults:
         _controller: AppBundle:Builder:uploadall
 
-deck_export_octgn_by_uuid:
+deck_export_octgn:
     path: /deck/export/octgn/{deck_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:octgnExportByUuid
+        _controller: AppBundle:Builder:octgnExport
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_export_text_by_uuid:
+deck_export_text:
     path: /deck/export/text/{deck_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Builder:textExportByUuid
+        _controller: AppBundle:Builder:textExport
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-deck_copy_by_uuid:
+deck_copy:
     path: /{_locale}/deck/copy/{decklist_uuid}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Builder:copyByUuid
+        _controller: AppBundle:Builder:copy
         _locale: en
     requirements:
         _locale: \w\w
diff --git a/web/js/deck.js b/web/js/deck.js
index edcecf2d..c77d2649 100755
--- a/web/js/deck.js
+++ b/web/js/deck.js
@@ -460,7 +460,7 @@ $(function() {
 });
 function autosave_interval() {
   if(Autosave_running) return;
-  if(Autosave_timer < 0 && Deck_id) Autosave_timer = Autosave_period;
+  if(Autosave_timer < 0 && Deck_uuid) Autosave_timer = Autosave_period;
   if(Autosave_timer === 0) {
     deck_autosave();
   }
@@ -513,7 +513,7 @@ function load_snapshot(event) {
 }
 function deck_autosave() {
   // check if deck has been modified since last autosave
-  if(!Deck_changed_since_last_autosave || !Deck_id) return;
+  if(!Deck_changed_since_last_autosave || !Deck_uuid) return;
   // compute diff between last snapshot and current deck
   var last_snapshot = Snapshots[Snapshots.length-1].content;
   var current_deck = get_deck_content();
@@ -525,7 +525,7 @@ function deck_autosave() {
   // send diff to autosave
   $('#tab-header-history').html("Autosave...");
   Autosave_running = true;
-  $.ajax(Routing.generate('deck_autosave', {deck_id:Deck_id}), {
+  $.ajax(Routing.generate('deck_autosave', {deck_uuid:Deck_uuid}), {
     data: {diff:diff},
     type: 'POST',
     success: function(data, textStatus, jqXHR) {
diff --git a/web/js/decklist.js b/web/js/decklist.js
index e9255af4..b2877680 100755
--- a/web/js/decklist.js
+++ b/web/js/decklist.js
@@ -341,7 +341,7 @@ $(function () {
 });
 
 function copy_decklist() {
-    $.ajax(Routing.generate('deck_copy_by_uuid', {decklist_uuid: Decklist.uuid}), {
+    $.ajax(Routing.generate('deck_copy', {decklist_uuid: Decklist.uuid}), {
         type: 'POST',
         success: function (data, textStatus, jqXHR) {
             alert("Decklist copied");
diff --git a/web/js/decks.js b/web/js/decks.js
index a831dc34..07a9ce9e 100755
--- a/web/js/decks.js
+++ b/web/js/decks.js
@@ -220,13 +220,13 @@ function do_action_deck(event) {
   var action_id = $(this).attr('id');
   if(!action_id) return;
   switch(action_id) {
-    case 'btn-view': location.href=Routing.generate('deck_view_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
-    case 'btn-edit': location.href=Routing.generate('deck_edit_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-view': location.href=Routing.generate('deck_view', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-edit': location.href=Routing.generate('deck_edit', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
     case 'btn-publish': show_publish_deck_form(deck.uuid, deck.name, deck.description); break;
     case 'btn-duplicate': location.href=Routing.generate('deck_duplicate', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
     case 'btn-delete': confirm_delete(deck); break;
-    case 'btn-download-text': location.href=Routing.generate('deck_export_text_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
-    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-download-text': location.href=Routing.generate('deck_export_text', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
+    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn', {deck_uuid:deck.uuid,_locale:NRDB.locale}); break;
     case 'btn-export-bbcode': export_bbcode(deck); break;
     case 'btn-export-markdown': export_markdown(deck); break;
     case 'btn-export-plaintext': export_plaintext(deck); break;
@@ -459,8 +459,8 @@ function show_deck() {
     NRDB.data.cards.updateById(slot.card_code, {indeck:parseInt(slot.qty,10)});
   }
   $('#deck-name').text(deck.name);
-  $('#btn-view').attr('href', Routing.generate('deck_view_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}));
-  $('#btn-edit').attr('href', Routing.generate('deck_edit_by_uuid', {deck_uuid:deck.uuid,_locale:NRDB.locale}));
+  $('#btn-view').attr('href', Routing.generate('deck_view', {deck_uuid:deck.uuid,_locale:NRDB.locale}));
+  $('#btn-edit').attr('href', Routing.generate('deck_edit', {deck_uuid:deck.uuid,_locale:NRDB.locale}));
 
   var mwl_code = deck.mwl_code, mwl_record = mwl_code && NRDB.data.mwl.findById(mwl_code);
   if(mwl_record) {
diff --git a/web/js/deckview.js b/web/js/deckview.js
index d2c90575..5fbb4f3e 100755
--- a/web/js/deckview.js
+++ b/web/js/deckview.js
@@ -29,11 +29,11 @@ function do_action_deck(event) {
   var action_id = $(this).attr('id');
   if(!action_id || !SelectedDeck) return;
   switch(action_id) {
-    case 'btn-edit': location.href=Routing.generate('deck_edit_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
+    case 'btn-edit': location.href=Routing.generate('deck_edit', {deck_uuid:SelectedDeck.uuid}); break;
     case 'btn-publish': show_publish_deck_form(SelectedDeck.uuid, SelectedDeck.name, SelectedDeck.description); break;
     case 'btn-delete': confirm_delete(); break;
-    case 'btn-download-text': location.href=Routing.generate('deck_export_text_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
-    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn_by_uuid', {deck_uuid:SelectedDeck.uuid}); break;
+    case 'btn-download-text': location.href=Routing.generate('deck_export_text', {deck_uuid:SelectedDeck.uuid}); break;
+    case 'btn-download-octgn': location.href=Routing.generate('deck_export_octgn', {deck_uuid:SelectedDeck.uuid}); break;
     case 'btn-print': window.print(); break;
     case 'btn-sort-type': DisplaySort = 'type'; DisplaySortSecondary = null; switch_to_web_view(); break;
     case 'btn-sort-number': DisplaySort = 'number'; DisplaySortSecondary = null; switch_to_web_view(); break;

From 5ea204649e063e120a8156a0b55e511d821a0039 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 22:31:22 -0600
Subject: [PATCH 12/20] Add a legacy decklist view route and 301 it to the new
 UUID version.

Tidy up view code in SocialController.
---
 .../Controller/BuilderController.php          |  1 -
 src/AppBundle/Controller/SocialController.php | 25 ++++++++++++++-----
 src/AppBundle/Resources/config/routing.yml    | 15 +++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 27350ba5..145562c5 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -917,7 +917,6 @@ public function editAction(string $deck_uuid, EntityManagerInterface $entityMana
     /**
      * @param int                    $deck_id
      * @param EntityManagerInterface $entityManager
-     * @param Judge                  $judge
      * @return Response
      * @throws \Doctrine\DBAL\DBALException
      */
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 0e743274..c9b0f4a4 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -235,13 +235,31 @@ private function getViewQueryBase() {
              "AND d.moderation_status IN (0,1,2)"];
     }
 
+    /**
+     * @param int                    $deck_id
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function legacyViewAction(int $decklist_id, EntityManagerInterface $entityManager) {
+      // TODO(plural): Only redirect if $decklist_id is < configured $max_visible_decklist_id
+      $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
+      if ($decklist) {
+        return $this->redirect(
+            $this->generateUrl('decklist_detail_by_uuid', ['decklist_uuid' => $decklist->getUuid()]),
+            301);
+      } else {
+        throw $this->createNotFoundException();
+      }
+    }
+
     /**
      * @param string                    $decklist_uuid
      * @param EntityManagerInterface $entityManager
      * @return Response
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function viewByUuidAction(string $decklist_uuid, EntityManagerInterface $entityManager)
+    public function viewAction(string $decklist_uuid, EntityManagerInterface $entityManager)
     {
         $dbh = $entityManager->getConnection();
         $viewQueryBase = $this->getViewQueryBase();
@@ -249,11 +267,6 @@ public function viewByUuidAction(string $decklist_uuid, EntityManagerInterface $
             $viewQueryBase[0] . " d.uuid = ?" . $viewQueryBase[1], [$decklist_uuid]
         )->fetchAll();
 
-        return $this->view($rows, $entityManager);
-    }
-
-    private function view(array $rows, EntityManagerInterface $entityManager)
-    {
         $response = new Response();
         $response->setPublic();
         $response->setMaxAge($this->getParameter('short_cache'));
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index f9910178..d1bdb3c7 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -228,23 +228,24 @@ decklists_list:
         _locale: \w\w
         page: \d+
 
-decklist_detail_by_uuid:
-    path: /{_locale}/decklist/{decklist_uuid}/{decklist_name}
+legacy_decklist:
+    path: /{_locale}/decklist/{decklist_id}/{decklist_name}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:viewByUuid
+        _controller: AppBundle:Social:legacyView
         _locale: en
         decklist_name: null
     requirements:
         _locale: \w\w
-        decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+        decklist_id: "\\d+"
 
-decklist_detail_no_name_by_uuid:
-    path: /{_locale}/decklist/{decklist_uuid}
+decklist_detail_by_uuid:
+    path: /{_locale}/decklist/{decklist_uuid}/{decklist_name}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:viewByUuid
+        _controller: AppBundle:Social:view
         _locale: en
+        decklist_name: null
     requirements:
         _locale: \w\w
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'

From 74b278ef9cc124e9ffa7e3d145029973565ae1e6 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 22:35:15 -0600
Subject: [PATCH 13/20] rename decklist_details routes to decklist_view

---
 .../views/Activity/decklist_comment.html.twig        |  2 +-
 .../views/Activity/decklist_publish.html.twig        |  2 +-
 app/Resources/views/Builder/deck.html.twig           |  2 +-
 app/Resources/views/Builder/deckview.html.twig       |  4 ++--
 .../views/Decklist/decklist-row-always-xs.html.twig  |  2 +-
 app/Resources/views/Decklist/decklist-row.html.twig  |  4 ++--
 app/Resources/views/Decklist/decklist.html.twig      |  6 +++---
 app/Resources/views/Default/allcomments.html.twig    |  2 +-
 .../views/Default/decklist_of_the_week.html.twig     |  2 +-
 app/Resources/views/Default/usercomments.html.twig   |  2 +-
 app/Resources/views/Diff/decklistsDiff.html.twig     |  4 ++--
 app/Resources/views/Faction/faction.html.twig        |  2 +-
 src/AppBundle/Controller/SocialController.php        | 12 ++++++------
 src/AppBundle/Resources/config/routing.yml           |  2 +-
 src/AppBundle/Service/ModerationHelper.php           |  2 +-
 15 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/Resources/views/Activity/decklist_comment.html.twig b/app/Resources/views/Activity/decklist_comment.html.twig
index 93da1aae..d8424305 100755
--- a/app/Resources/views/Activity/decklist_comment.html.twig
+++ b/app/Resources/views/Activity/decklist_comment.html.twig
@@ -1,4 +1,4 @@
-<a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': item.comment.decklist.uuid, 'decklist_name': item.comment.decklist.prettyname|e('url') }) }}#comment-{{ item.comment.id }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
+<a href="{{ path('decklist_view', { 'decklist_uuid': item.comment.decklist.uuid, 'decklist_name': item.comment.decklist.prettyname|e('url') }) }}#comment-{{ item.comment.id }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
   <span class="glyphicon glyphicon-comment" style="margin-right:1em"></span>
   {% if item.comment.author.id != app.user.id %}
     <span class="username {{ item.comment.author.faction }}">{{ item.comment.author.username }}</span>
diff --git a/app/Resources/views/Activity/decklist_publish.html.twig b/app/Resources/views/Activity/decklist_publish.html.twig
index 1b886695..6d581432 100755
--- a/app/Resources/views/Activity/decklist_publish.html.twig
+++ b/app/Resources/views/Activity/decklist_publish.html.twig
@@ -1,4 +1,4 @@
-<a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': item.decklist.uuid, 'decklist_name': item.decklist.prettyname|e('url') }) }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
+<a href="{{ path('decklist_view', { 'decklist_uuid': item.decklist.uuid, 'decklist_name': item.decklist.prettyname|e('url') }) }}" class="list-group-item{% if item.unchecked %} list-group-item-warning{% endif %}">
   <span class="glyphicon glyphicon-list-alt" style="margin-right:1em"></span>
   {% if item.decklist.user.id != app.user.id %}
   <span class="username {{ item.decklist.user.faction }}">{{ item.decklist.user.username }}</span>
diff --git a/app/Resources/views/Builder/deck.html.twig b/app/Resources/views/Builder/deck.html.twig
index f832d2e8..711cc5ba 100755
--- a/app/Resources/views/Builder/deck.html.twig
+++ b/app/Resources/views/Builder/deck.html.twig
@@ -243,7 +243,7 @@ var Filters = {},
       {% if published_decklists|length %}
       {% for decklist in published_decklists %}
         <tr>
-          <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+          <td class="decklist-name"><a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
           <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
           <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
           <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
diff --git a/app/Resources/views/Builder/deckview.html.twig b/app/Resources/views/Builder/deckview.html.twig
index e0837be7..1267c07e 100755
--- a/app/Resources/views/Builder/deckview.html.twig
+++ b/app/Resources/views/Builder/deckview.html.twig
@@ -170,7 +170,7 @@ var Identity = null,
   {% if published_decklists|length %}
   {% for decklist in published_decklists %}
     <tr>
-      <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+      <td class="decklist-name"><a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
       <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
       <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
       <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
@@ -191,7 +191,7 @@ var Identity = null,
       {% if parent_decklists|length %}
         {% for decklist in parent_decklists %}
             <tr>
-                <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+                <td class="decklist-name"><a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
                 <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
                 <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
                 <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
diff --git a/app/Resources/views/Decklist/decklist-row-always-xs.html.twig b/app/Resources/views/Decklist/decklist-row-always-xs.html.twig
index 99981a9b..8afb613d 100755
--- a/app/Resources/views/Decklist/decklist-row-always-xs.html.twig
+++ b/app/Resources/views/Decklist/decklist-row-always-xs.html.twig
@@ -4,7 +4,7 @@
   </td>
   <td>
     <div>
-      <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+      <a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
     </div>
     <div class="small">
       <i>{{ decklist.lastpack }}</i>
diff --git a/app/Resources/views/Decklist/decklist-row.html.twig b/app/Resources/views/Decklist/decklist-row.html.twig
index dfef4147..45d1b75e 100755
--- a/app/Resources/views/Decklist/decklist-row.html.twig
+++ b/app/Resources/views/Decklist/decklist-row.html.twig
@@ -1,6 +1,6 @@
 <div style="border-top: 1px solid #ddd;margin-bottom: 10px;padding-top: 10px;">
   <div class="visible-xs-block">
-    <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+    <a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
   </div>
   <div class="media" style="margin-top:0">
     <div class="media-left">
@@ -9,7 +9,7 @@
     <div class="media-body">
       <div class="row h4 hidden-xs">
         <div class="col-sm-9">
-          <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+          <a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
         </div>
         <div class="col-sm-3 small social">
           <span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}
diff --git a/app/Resources/views/Decklist/decklist.html.twig b/app/Resources/views/Decklist/decklist.html.twig
index 856fed2d..ea0c4e81 100755
--- a/app/Resources/views/Decklist/decklist.html.twig
+++ b/app/Resources/views/Decklist/decklist.html.twig
@@ -49,7 +49,7 @@ NRDB.user.params.decklist_id = Decklist.id;
                 </a>
             </div>
             {% if duplicate %}
-            | <small>Duplicate of <a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': duplicate.uuid, 'decklist_name': duplicate.prettyname|e('url') }) }}">{{ duplicate.name }}</a></small>
+            | <small>Duplicate of <a href="{{ path('decklist_view', { 'decklist_uuid': duplicate.uuid, 'decklist_name': duplicate.prettyname|e('url') }) }}">{{ duplicate.name }}</a></small>
             {% endif %}
         </div>
     </div>
@@ -258,7 +258,7 @@ NRDB.user.params.decklist_id = Decklist.id;
 {% if precedent_decklists|length %}
 {% for decklist in precedent_decklists %}
 <tr>
-  <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+  <td class="decklist-name"><a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
   <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
   <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
   <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
@@ -279,7 +279,7 @@ NRDB.user.params.decklist_id = Decklist.id;
 {% if successor_decklists|length %}
 {% for decklist in successor_decklists %}
 <tr>
-  <td class="decklist-name"><a href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
+  <td class="decklist-name"><a href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></td>
   <td class="social"><span class="glyphicon glyphicon-heart social-icon-like"></span> {{ decklist.nbvotes }}</td>
   <td class="social"><span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}</td>
   <td class="social"><span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}</td>
diff --git a/app/Resources/views/Default/allcomments.html.twig b/app/Resources/views/Default/allcomments.html.twig
index 25593b38..1c0a77a9 100755
--- a/app/Resources/views/Default/allcomments.html.twig
+++ b/app/Resources/views/Default/allcomments.html.twig
@@ -16,7 +16,7 @@
 
 <tr>
 <td>
-<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_detail_by_uuid', {decklist_uuid:comment.decklist_uuid,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>, by <a href="{{ path('user_profile_view', {user_id:comment.user_id,user_name:comment.author|e('url')}) }}" class="comment-author username">{{ comment.author }}</a>:</div>
+<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_view', {decklist_uuid:comment.decklist_uuid,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>, by <a href="{{ path('user_profile_view', {user_id:comment.user_id,user_name:comment.author|e('url')}) }}" class="comment-author username">{{ comment.author }}</a>:</div>
 {{ comment.text|raw }}
 </td>
 </tr>
diff --git a/app/Resources/views/Default/decklist_of_the_week.html.twig b/app/Resources/views/Default/decklist_of_the_week.html.twig
index 5fa7058e..89fe7a6f 100755
--- a/app/Resources/views/Default/decklist_of_the_week.html.twig
+++ b/app/Resources/views/Default/decklist_of_the_week.html.twig
@@ -2,7 +2,7 @@
 <div id="highlight" class="decklist">
 
 <h2 class="section">Decklist of the week </h2>
-<h3><a class="decklist-name" href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></h3>
+<h3><a class="decklist-name" href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a></h3>
 
 <!-- Identity and Stats -->
 <div class="row">
diff --git a/app/Resources/views/Default/usercomments.html.twig b/app/Resources/views/Default/usercomments.html.twig
index 6362f08f..ada0925d 100755
--- a/app/Resources/views/Default/usercomments.html.twig
+++ b/app/Resources/views/Default/usercomments.html.twig
@@ -16,7 +16,7 @@
 
 <tr>
 <td>
-<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_detail_by_uuid', {decklist_uuid:comment.decklist_uuid,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>:</div>
+<div>{{ comment.date_creation|date('j M Y') }} on <a href="{{ path('decklist_view', {decklist_uuid:comment.decklist_uuid,decklist_name:comment.decklist_prettyname}) }}#{{ comment.id }}">{{ comment.decklist_name }}</a>:</div>
 {{ comment.text|raw }}
 </td>
 </tr>
diff --git a/app/Resources/views/Diff/decklistsDiff.html.twig b/app/Resources/views/Diff/decklistsDiff.html.twig
index b0da2ec0..fc9357a6 100755
--- a/app/Resources/views/Diff/decklistsDiff.html.twig
+++ b/app/Resources/views/Diff/decklistsDiff.html.twig
@@ -8,7 +8,7 @@
 
 <div class="row">
 <div class="col-sm-4">
-<h3><a href="{{ path('decklist_detail_by_uuid', {'decklist_uuid': decklist1.uuid,'decklist_name':decklist1.prettyname}) }}">{{ decklist1.name }}</a></h3>
+<h3><a href="{{ path('decklist_view', {'decklist_uuid': decklist1.uuid,'decklist_name':decklist1.prettyname}) }}">{{ decklist1.name }}</a></h3>
 {% for card in decklist1.content %}
 <div>
     {{ card.qty }}x
@@ -26,7 +26,7 @@
 {% endfor %}
 </div>
 <div class="col-sm-4">
-<h3><a href="{{ path('decklist_detail_by_uuid', {'decklist_uuid': decklist2.uuid,'decklist_name':decklist2.prettyname}) }}">{{ decklist2.name }}</a></h3>
+<h3><a href="{{ path('decklist_view', {'decklist_uuid': decklist2.uuid,'decklist_name':decklist2.prettyname}) }}">{{ decklist2.name }}</a></h3>
 {% for card in decklist2.content %}
 <div>
     {{ card.qty }}x
diff --git a/app/Resources/views/Faction/faction.html.twig b/app/Resources/views/Faction/faction.html.twig
index ca3ca696..3fd55015 100755
--- a/app/Resources/views/Faction/faction.html.twig
+++ b/app/Resources/views/Faction/faction.html.twig
@@ -42,7 +42,7 @@
         <span class="glyphicon glyphicon-star social-icon-favorite"></span> {{ decklist.nbfavorites }}
         <span class="glyphicon glyphicon-comment social-icon-comment"></span> {{ decklist.nbcomments }}
       </small>
-      <a class="decklist-name" href="{{ path('decklist_detail_by_uuid', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
+      <a class="decklist-name" href="{{ path('decklist_view', { 'decklist_uuid': decklist.uuid, 'decklist_name': decklist.prettyname|e('url') }) }}">{{ decklist.name }}</a>
     </h4>
     <h5>
       <time class="pull-right" datetime="{{ decklist.dateCreation|date('c') }}">{{ decklist.dateCreation|date('j M Y') }}</time>
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index c9b0f4a4..734235f1 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -72,7 +72,7 @@ public function publishByUuidAction(Deck $deck, EntityManagerInterface $entityMa
                               ]);
         foreach ($old_decklists as $decklist) {
             if (json_encode($decklist->getContent()) == $new_content) {
-                $url = $this->generateUrl('decklist_detail_by_uuid', [
+                $url = $this->generateUrl('decklist_view', [
                     'decklist_uuid' => $decklist->getUuid(),
                     'decklist_name' => $decklist->getPrettyName(),
                 ]);
@@ -189,7 +189,7 @@ public function newAction(Request $request, EntityManagerInterface $entityManage
 
         return $this->redirect(
             $this->generateUrl(
-                'decklist_detail_by_uuid',
+                'decklist_view',
                 [
                     'decklist_uuid' => $decklist->getUuid(),
                     'decklist_name' => $decklist->getPrettyname(),
@@ -246,7 +246,7 @@ public function legacyViewAction(int $decklist_id, EntityManagerInterface $entit
       $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
       if ($decklist) {
         return $this->redirect(
-            $this->generateUrl('decklist_detail_by_uuid', ['decklist_uuid' => $decklist->getUuid()]),
+            $this->generateUrl('decklist_view', ['decklist_uuid' => $decklist->getUuid()]),
             301);
       } else {
         throw $this->createNotFoundException();
@@ -575,7 +575,7 @@ public function commentAction(Request $request, EntityManagerInterface $entityMa
             $email_data = [
                 'username'      => $user->getUsername(),
                 'decklist_name' => $decklist->getName(),
-                'url'           => $this->generateUrl('decklist_detail_by_uuid', ['decklist_uuid' => $decklist->getUuid(), 'decklist_name' => $decklist->getPrettyname()], UrlGeneratorInterface::ABSOLUTE_URL) . '#' . $comment->getId(),
+                'url'           => $this->generateUrl('decklist_view', ['decklist_uuid' => $decklist->getUuid(), 'decklist_name' => $decklist->getPrettyname()], UrlGeneratorInterface::ABSOLUTE_URL) . '#' . $comment->getId(),
                 'comment'       => $comment_html,
                 'profile'       => $this->generateUrl('user_profile', [], UrlGeneratorInterface::ABSOLUTE_URL),
             ];
@@ -589,7 +589,7 @@ public function commentAction(Request $request, EntityManagerInterface $entityMa
             }
         }
 
-        return $this->redirect($this->generateUrl('decklist_detail_by_uuid', [
+        return $this->redirect($this->generateUrl('decklist_view', [
             'decklist_uuid' => $decklist_uuid,
             'decklist_name' => $decklist->getPrettyname(),
         ]));
@@ -937,7 +937,7 @@ private function edit(Decklist $decklist, Request $request, EntityManagerInterfa
 
         $entityManager->flush();
 
-        return $this->redirect($this->generateUrl('decklist_detail_by_uuid', [
+        return $this->redirect($this->generateUrl('decklist_view', [
             'decklist_uuid'   => $decklist->getUuid(),
             'decklist_name' => $decklist->getPrettyname(),
         ]));
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index d1bdb3c7..e14d5d5d 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -239,7 +239,7 @@ legacy_decklist:
         _locale: \w\w
         decklist_id: "\\d+"
 
-decklist_detail_by_uuid:
+decklist_view:
     path: /{_locale}/decklist/{decklist_uuid}/{decklist_name}
     methods: [GET]
     defaults:
diff --git a/src/AppBundle/Service/ModerationHelper.php b/src/AppBundle/Service/ModerationHelper.php
index 3995336d..c1d80480 100644
--- a/src/AppBundle/Service/ModerationHelper.php
+++ b/src/AppBundle/Service/ModerationHelper.php
@@ -109,7 +109,7 @@ public function sendEmail(Decklist $decklist)
         $name = "/Emails/decklist-moderation-$status.html.twig";
 
         $url = $this->router->generate(
-            'decklist_detail_by_uuid',
+            'decklist_view',
             [
                 'decklist_uuid' => $decklist->getUuid(),
                 'decklist_name' => $decklist->getPrettyname(),

From 32f4430427610c4f4532dcbeee9ae0dee9c0e357 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 22:48:32 -0600
Subject: [PATCH 14/20] remove last by-uuid method scaffolding

---
 .../Default/publish_decklist_form.html.twig   |  2 +-
 src/AppBundle/Controller/SocialController.php | 37 +++----------------
 src/AppBundle/Resources/config/routing.yml    | 20 +++++-----
 web/js/decklist.js                            |  4 +-
 web/js/publish_deck_form.js                   |  2 +-
 5 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/app/Resources/views/Default/publish_decklist_form.html.twig b/app/Resources/views/Default/publish_decklist_form.html.twig
index f66f68f9..9bdba11e 100644
--- a/app/Resources/views/Default/publish_decklist_form.html.twig
+++ b/app/Resources/views/Default/publish_decklist_form.html.twig
@@ -9,7 +9,7 @@
       <div class="modal-body">
         <div class="row">
           <div class="col-md-12">
-            <form action="{% if decklist %}{{ path('decklist_edit_by_uuid', {decklist_uuid:decklist.uuid}) }}{% else %}{{ path('decklist_new') }}{% endif %}" method="POST" enctype="application/x-www-form-urlencoded" id="publish-decklist-form">
+            <form action="{% if decklist %}{{ path('decklist_edit', {decklist_uuid:decklist.uuid}) }}{% else %}{{ path('decklist_new') }}{% endif %}" method="POST" enctype="application/x-www-form-urlencoded" id="publish-decklist-form">
               <input type="hidden" name="decklist_uuid" id="publish-decklist-uuid" value="{% if decklist %}{{ decklist.uuid }}{% endif %}">
               <input type="hidden" name="deck_uuid" id="publish-deck-uuid">
               <div class="form-group">
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index 734235f1..d66d8297 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -44,7 +44,7 @@ class SocialController extends Controller
      *
      * @ParamConverter("deck", class="AppBundle:Deck", options={"mapping": {"deck_uuid": "uuid"}})
      */
-    public function publishByUuidAction(Deck $deck, EntityManagerInterface $entityManager, Judge $judge)
+    public function publishAction(Deck $deck, EntityManagerInterface $entityManager, Judge $judge)
     {
         $response = new JsonResponse();
 
@@ -668,12 +668,7 @@ public function voteAction(Request $request, EntityManagerInterface $entityManag
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
      */
-    public function textExportByUuidAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
-    {
-        return $this->textExport($decklist, $judge, $cardsData);
-    }
-
-    private function textExport(Decklist $decklist, Judge $judge, CardsData $cardsData)
+    public function textExportAction(Decklist $decklist, Judge $judge, CardsData $cardsData)
     {
         $response = new Response();
         $response->setPublic();
@@ -809,12 +804,7 @@ private function textExport(Decklist $decklist, Judge $judge, CardsData $cardsDa
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
      */
-    public function octgnExportByUuidAction(Decklist $decklist)
-    {
-        return $this->octgnExport($decklist);
-    }
-
-    private function octgnExport(Decklist $decklist)
+    public function octgnExportAction(Decklist $decklist)
     {
         $response = new Response();
         $response->setPublic();
@@ -874,12 +864,7 @@ private function octgnExport(Decklist $decklist)
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
      */
-    public function editByUuidAction(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
-    {
-        return $this->edit($decklist, $request, $entityManager, $textProcessor, $moderationHelper);
-    }
-
-    private function edit(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
+    public function editAction(Decklist $decklist, Request $request, EntityManagerInterface $entityManager, TextProcessor $textProcessor, ModerationHelper $moderationHelper)
     {
         $user = $this->getUser();
 
@@ -952,12 +937,7 @@ private function edit(Decklist $decklist, Request $request, EntityManagerInterfa
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
      */
-    public function deleteByUuidAction(Decklist $decklist, EntityManagerInterface $entityManager)
-    {
-        return $this->delete($decklist, $entityManager);
-    }
-
-    private function delete(Decklist $decklist, EntityManagerInterface $entityManager)
+    public function deleteAction(Decklist $decklist, EntityManagerInterface $entityManager)
     {
         $user = $this->getUser();
 
@@ -1337,12 +1317,7 @@ public function activityAction(int $days, EntityManagerInterface $entityManager,
      *
      * @ParamConverter("decklist", class="AppBundle:Decklist", options={"mapping": {"decklist_uuid": "uuid"}})
      */
-    public function moderateByUuidAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
-    {
-        return $this->moderate($decklist, $status, $modflag_id, $entityManager, $moderationHelper);
-    }
-
-    private function moderate(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
+    public function moderateAction(Decklist $decklist, int $status, int $modflag_id = null, EntityManagerInterface $entityManager, ModerationHelper $moderationHelper)
     {
         $response = new Response();
         $response->setPrivate();
diff --git a/src/AppBundle/Resources/config/routing.yml b/src/AppBundle/Resources/config/routing.yml
index e14d5d5d..113d5133 100755
--- a/src/AppBundle/Resources/config/routing.yml
+++ b/src/AppBundle/Resources/config/routing.yml
@@ -83,11 +83,11 @@ decks_list:
     requirements:
         _locale: \w\w
 
-deck_publish_by_uuid:
+deck_publish:
     path: /deck/can_publish/{deck_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:publishByUuid
+        _controller: AppBundle:Social:publish
     requirements:
         deck_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
@@ -182,19 +182,19 @@ deck_copy:
         _locale: \w\w
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-decklist_export_octgn_by_uuid:
+decklist_octgn_export:
     path: /decklist/export/octgn/{decklist_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:octgnExportByUuid
+        _controller: AppBundle:Social:octgnExport
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-decklist_export_text_by_uuid:
+decklist_text_export:
     path: /decklist/export/text/{decklist_uuid}
     methods: [GET]
     defaults:
-        _controller: AppBundle:Social:textExportByUuid
+        _controller: AppBundle:Social:textExport
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
@@ -274,11 +274,11 @@ decklist_comment_hide:
     defaults:
         _controller: AppBundle:Social:hidecomment
 
-decklist_edit_by_uuid:
+decklist_edit:
     path: /decklist/edit/{decklist_uuid}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Social:editByUuid
+        _controller: AppBundle:Social:edit
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
@@ -286,7 +286,7 @@ decklist_delete:
     path: /decklist/delete/{decklist_uuid}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Social:deleteByUuid
+        _controller: AppBundle:Social:delete
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
@@ -808,7 +808,7 @@ decklist_moderate:
     path: /decklist/moderate/{decklist_uuid}/{status}/{modflag_id}
     methods: [POST]
     defaults:
-        _controller: AppBundle:Social:moderateByUuid
+        _controller: AppBundle:Social:moderate
         modflag_id: null
     requirements:
         decklist_uuid: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
diff --git a/web/js/decklist.js b/web/js/decklist.js
index b2877680..b44a8d90 100755
--- a/web/js/decklist.js
+++ b/web/js/decklist.js
@@ -262,10 +262,10 @@ function do_action_decklist(event) {
         return;
     switch(action_id) {
         case 'btn-download-text':
-            location.href = Routing.generate('decklist_export_text_by_uuid', {decklist_uuid: Decklist.uuid});
+            location.href = Routing.generate('decklist_text_export', {decklist_uuid: Decklist.uuid});
             break;
         case 'btn-download-octgn':
-            location.href = Routing.generate('decklist_export_octgn_by_uuid', {decklist_uuid: Decklist.uuid});
+            location.href = Routing.generate('decklist_octgn_export', {decklist_uuid: Decklist.uuid});
             break;
     }
 }
diff --git a/web/js/publish_deck_form.js b/web/js/publish_deck_form.js
index 980b2d1a..43c5e6f3 100644
--- a/web/js/publish_deck_form.js
+++ b/web/js/publish_deck_form.js
@@ -48,7 +48,7 @@ function initialize_publish_deck_form_typeahead() {
 function show_publish_deck_form(deck_uuid, deck_name, deck_description) {
   $('#publish-form-warning').remove();
   $('#btn-publish-submit').text("Checking...").prop('disabled', true);
-  $.ajax(Routing.generate('deck_publish_by_uuid', {deck_uuid:deck_uuid}), {
+  $.ajax(Routing.generate('deck_publish', {deck_uuid:deck_uuid}), {
     success: function( response ) {
       var type = response.allowed ? 'warning' : 'danger';
       if(response.message) {

From db65aa122278ad05145e09df4c63c87674d89c2c Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 22:49:50 -0600
Subject: [PATCH 15/20] remove TODO for limiting deck ids.  We can just rate
 limit instead.

---
 src/AppBundle/Controller/BuilderController.php | 1 -
 src/AppBundle/Controller/SocialController.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index 145562c5..f65cb2c2 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -921,7 +921,6 @@ public function editAction(string $deck_uuid, EntityManagerInterface $entityMana
      * @throws \Doctrine\DBAL\DBALException
      */
     public function legacyViewAction(int $deck_id, EntityManagerInterface $entityManager) {
-      // TODO(plural): Only redirect if $deck_id is < configured $max_visible_deck_id
       $deck = $entityManager->getRepository('AppBundle:Deck')->find($deck_id);
       if ($deck) {
         return $this->redirect(
diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index d66d8297..d4334517 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -242,7 +242,6 @@ private function getViewQueryBase() {
      * @throws \Doctrine\DBAL\DBALException
      */
     public function legacyViewAction(int $decklist_id, EntityManagerInterface $entityManager) {
-      // TODO(plural): Only redirect if $decklist_id is < configured $max_visible_decklist_id
       $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
       if ($decklist) {
         return $this->redirect(

From 90614e27c43c12276875c236b7aea052ba955669 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 22:56:27 -0600
Subject: [PATCH 16/20] Fix error on initial deck builder from missing UUID

---
 src/AppBundle/Controller/BuilderController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/AppBundle/Controller/BuilderController.php b/src/AppBundle/Controller/BuilderController.php
index f65cb2c2..be0a2be8 100755
--- a/src/AppBundle/Controller/BuilderController.php
+++ b/src/AppBundle/Controller/BuilderController.php
@@ -125,6 +125,7 @@ public function initbuildAction(string $card_code, EntityManagerInterface $entit
                     "description" => "",
                     "tags"        => $card->getFaction()->getCode(),
                     "id"          => "",
+                    "uuid"        => "",
                     "history"     => [],
                     "unsaved"     => 0,
                     "mwl_code"    => $active_mwl ? $active_mwl->getCode() : null,

From cd80a467dde7054f336161f536ac9d2a34b7b0a8 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 23:27:27 -0600
Subject: [PATCH 17/20] Lazily "version" the js files that change for the UUID
 support.

---
 app/Resources/views/Builder/deck.html.twig               | 2 +-
 app/Resources/views/Builder/decks.html.twig              | 4 ++--
 app/Resources/views/Builder/deckview.html.twig           | 4 ++--
 app/Resources/views/Decklist/decklist.html.twig          | 4 ++--
 web/js/{deck.js => deck.v2.js}                           | 0
 web/js/{decklist.js => decklist.v2.js}                   | 0
 web/js/{decks.js => decks.v2.js}                         | 0
 web/js/{deckview.js => deckview.v2.js}                   | 0
 web/js/{publish_deck_form.js => publish_deck_form.v2.js} | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename web/js/{deck.js => deck.v2.js} (100%)
 rename web/js/{decklist.js => decklist.v2.js} (100%)
 rename web/js/{decks.js => decks.v2.js} (100%)
 rename web/js/{deckview.js => deckview.v2.js} (100%)
 rename web/js/{publish_deck_form.js => publish_deck_form.v2.js} (100%)

diff --git a/app/Resources/views/Builder/deck.html.twig b/app/Resources/views/Builder/deck.html.twig
index 711cc5ba..bc1e5a88 100755
--- a/app/Resources/views/Builder/deck.html.twig
+++ b/app/Resources/views/Builder/deck.html.twig
@@ -8,7 +8,7 @@
 <script src="{{ asset('/js/nrdb.smart_filter.js') }}"></script>
 <script src="{{ asset('/js/nrdb.suggestions.js') }}"></script>
 <script src="{{ asset('/js/nrdb.diff.js') }}"></script>
-<script src="{{ asset('/js/deck.js') }}"></script>
+<script src="{{ asset('/js/deck.v2.js') }}"></script>
 <script type="text/javascript">
 
 var Filters = {},
diff --git a/app/Resources/views/Builder/decks.html.twig b/app/Resources/views/Builder/decks.html.twig
index 9bf16d77..9f2ccfae 100755
--- a/app/Resources/views/Builder/decks.html.twig
+++ b/app/Resources/views/Builder/decks.html.twig
@@ -3,8 +3,8 @@
 {% block head %}
 <script src="{{ asset('/js/nrdb.card_modal.js') }}"></script>
 <script src="{{ asset('/js/nrdb.diff.js') }}"></script>
-<script src="{{ asset('/js/publish_deck_form.js') }}"></script>
-<script src="{{ asset('/js/decks.js') }}"></script>
+<script src="{{ asset('/js/publish_deck_form.v2.js') }}"></script>
+<script src="{{ asset('/js/decks.v2.js') }}"></script>
 <script type="text/javascript">
 var Identity = null,
   LastClickedDeck = null,
diff --git a/app/Resources/views/Builder/deckview.html.twig b/app/Resources/views/Builder/deckview.html.twig
index 1267c07e..4151239b 100755
--- a/app/Resources/views/Builder/deckview.html.twig
+++ b/app/Resources/views/Builder/deckview.html.twig
@@ -5,8 +5,8 @@
 <script src="{{ asset('/js/nrdb.deck_gallery.js') }}"></script>
 <script src="{{ asset('/js/nrdb.draw_simulator.js') }}"></script>
 <script src="{{ asset('/js/nrdb.card_modal.js') }}"></script>
-<script src="{{ asset('/js/publish_deck_form.js') }}"></script>
-<script src="{{ asset('/js/deckview.js') }}"></script>
+<script src="{{ asset('/js/publish_deck_form.v2.js') }}"></script>
+<script src="{{ asset('/js/deckview.v2.js') }}"></script>
 <script type="text/javascript">
 
 var Identity = null,
diff --git a/app/Resources/views/Decklist/decklist.html.twig b/app/Resources/views/Decklist/decklist.html.twig
index ea0c4e81..8e2519c3 100755
--- a/app/Resources/views/Decklist/decklist.html.twig
+++ b/app/Resources/views/Decklist/decklist.html.twig
@@ -3,8 +3,8 @@
 {% block head %}
 <script src="{{ asset('/js/nrdb.draw_simulator.js') }}"></script>
 <script src="{{ asset('/js/nrdb.card_modal.js') }}"></script>
-<script src="{{ asset('/js/publish_deck_form.js') }}"></script>
-<script src="{{ asset('/js/decklist.js') }}"></script>
+<script src="{{ asset('/js/publish_deck_form.v2.js') }}"></script>
+<script src="{{ asset('/js/decklist.v2.js') }}"></script>
 <script type="text/javascript">
 
 var Identity = null,
diff --git a/web/js/deck.js b/web/js/deck.v2.js
similarity index 100%
rename from web/js/deck.js
rename to web/js/deck.v2.js
diff --git a/web/js/decklist.js b/web/js/decklist.v2.js
similarity index 100%
rename from web/js/decklist.js
rename to web/js/decklist.v2.js
diff --git a/web/js/decks.js b/web/js/decks.v2.js
similarity index 100%
rename from web/js/decks.js
rename to web/js/decks.v2.js
diff --git a/web/js/deckview.js b/web/js/deckview.v2.js
similarity index 100%
rename from web/js/deckview.js
rename to web/js/deckview.v2.js
diff --git a/web/js/publish_deck_form.js b/web/js/publish_deck_form.v2.js
similarity index 100%
rename from web/js/publish_deck_form.js
rename to web/js/publish_deck_form.v2.js

From 88f5cb5d62bdc340112825176b7501688711f99d Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 23:34:21 -0600
Subject: [PATCH 18/20] remove leftover commented code and TODO

---
 src/AppBundle/Controller/DecklistsController.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/AppBundle/Controller/DecklistsController.php b/src/AppBundle/Controller/DecklistsController.php
index 1e38b172..bd965fc6 100644
--- a/src/AppBundle/Controller/DecklistsController.php
+++ b/src/AppBundle/Controller/DecklistsController.php
@@ -299,10 +299,6 @@ private function searchForm(Request $request, EntityManagerInterface $entityMana
      */
     public function diffAction(string $decklist1_uuid, string $decklist2_uuid, EntityManagerInterface $entityManager, DiffService $diffService)
     {
-#        if ($decklist1_id > $decklist2_id) {
-#            // TODO(plural): Update decklists_diff to take deck UUIDs
-#            return $this->redirect($this->generateUrl('decklists_diff', ['decklist1_id' => $decklist2_id, 'decklist2_id' => $decklist1_id]));
-#        }
         $response = new Response();
         $response->setPublic();
         $response->setMaxAge($this->getParameter('short_cache'));

From da68fb4fa6a2402fd9afee3a9eecd42a1253db71 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 23:35:11 -0600
Subject: [PATCH 19/20] remove leftover tabs

---
 src/AppBundle/Controller/IndexController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/AppBundle/Controller/IndexController.php b/src/AppBundle/Controller/IndexController.php
index 36c0ca53..c01f8a5f 100755
--- a/src/AppBundle/Controller/IndexController.php
+++ b/src/AppBundle/Controller/IndexController.php
@@ -28,11 +28,11 @@ public function indexAction(Request $request, EntityManagerInterface $entityMana
         $rows = $dbh->executeQuery("SELECT decklist FROM highlight WHERE id=?", [1])->fetchAll();
         $decklist = count($rows) ? json_decode($rows[0]['decklist']) : null;
 
-		// TODO(plural): Remove this lookup once the DOTW contains UUID by default.
-		if ($decklist != null) {
-	        $decklist_object = $entityManager->getRepository('AppBundle:Decklist')->find($decklist->{'id'});
-			$decklist->{'uuid'} = $decklist_object->getUuid();
-		}
+        // TODO(plural): Remove this lookup once the DOTW contains UUID by default.
+        if ($decklist != null) {
+            $decklist_object = $entityManager->getRepository('AppBundle:Decklist')->find($decklist->{'id'});
+            $decklist->{'uuid'} = $decklist_object->getUuid();
+        }
         // recent decklists
         $decklists_recent = $decklistManager->recent(0, 10, false)['decklists'];
 

From 75011de089bd02a12df336c61d15ccddafe87168 Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Sun, 23 Jan 2022 23:43:02 -0600
Subject: [PATCH 20/20] inline leftover migration scaffolding function

---
 src/AppBundle/Controller/SocialController.php | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/AppBundle/Controller/SocialController.php b/src/AppBundle/Controller/SocialController.php
index d4334517..7bd2a250 100755
--- a/src/AppBundle/Controller/SocialController.php
+++ b/src/AppBundle/Controller/SocialController.php
@@ -198,9 +198,34 @@ public function newAction(Request $request, EntityManagerInterface $entityManage
         );
     }
 
-    private function getViewQueryBase() {
-        return 
-            ["SELECT
+    /**
+     * @param int                    $deck_id
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function legacyViewAction(int $decklist_id, EntityManagerInterface $entityManager) {
+      $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
+      if ($decklist) {
+        return $this->redirect(
+            $this->generateUrl('decklist_view', ['decklist_uuid' => $decklist->getUuid()]),
+            301);
+      } else {
+        throw $this->createNotFoundException();
+      }
+    }
+
+    /**
+     * @param string                    $decklist_uuid
+     * @param EntityManagerInterface $entityManager
+     * @return Response
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function viewAction(string $decklist_uuid, EntityManagerInterface $entityManager)
+    {
+        $dbh = $entityManager->getConnection();
+        $rows = $dbh->executeQuery(
+            "SELECT
                d.id,
                d.uuid,
                d.date_update,
@@ -231,39 +256,10 @@ private function getViewQueryBase() {
                JOIN card c ON d.identity_id=c.id
                JOIN faction f ON d.faction_id=f.id
                LEFT JOIN tournament t ON d.tournament_id=t.id
-             WHERE ",
-             "AND d.moderation_status IN (0,1,2)"];
-    }
-
-    /**
-     * @param int                    $deck_id
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     */
-    public function legacyViewAction(int $decklist_id, EntityManagerInterface $entityManager) {
-      $decklist = $entityManager->getRepository('AppBundle:Decklist')->find($decklist_id);
-      if ($decklist) {
-        return $this->redirect(
-            $this->generateUrl('decklist_view', ['decklist_uuid' => $decklist->getUuid()]),
-            301);
-      } else {
-        throw $this->createNotFoundException();
-      }
-    }
-
-    /**
-     * @param string                    $decklist_uuid
-     * @param EntityManagerInterface $entityManager
-     * @return Response
-     * @throws \Doctrine\DBAL\DBALException
-     */
-    public function viewAction(string $decklist_uuid, EntityManagerInterface $entityManager)
-    {
-        $dbh = $entityManager->getConnection();
-        $viewQueryBase = $this->getViewQueryBase();
-        $rows = $dbh->executeQuery(
-            $viewQueryBase[0] . " d.uuid = ?" . $viewQueryBase[1], [$decklist_uuid]
+             WHERE
+                d.uuid = ?
+                AND d.moderation_status IN (0,1,2)",
+            [$decklist_uuid]
         )->fetchAll();
 
         $response = new Response();