Merge pull request #1971 from metabase/fix-duplicate-delete-events

when deleting a card make sure it exists first, otherwise throw a 404.

src/metabase/api/card.clj

@@ -101,10 +101,11 @@
   "Delete a `Card`."
   [id]
   (write-check Card id)
-  (let [card (sel :one Card :id id)
-        result (cascade-delete Card :id id)]
-    (events/publish-event :card-delete (assoc card :actor_id *current-user-id*))
-    result))
+  (let-404 [card (sel :one Card :id id)]
+    (write-check card)
+    (let [result (cascade-delete Card :id id)]
+      (events/publish-event :card-delete (assoc card :actor_id *current-user-id*))
+      result)))
 
 (defendpoint GET "/:id/favorite"
   "Has current user favorited this `Card`?"

test/metabase/api/card_test.clj

@@ -199,6 +199,9 @@
     ((user->client :rasta) :delete 204 (format "card/%d" id))
     (Card id)))
 
+;; deleting a card that doesn't exist should return a 404 (#1957)
+(expect "Not found."
+  ((user->client :crowberto) :delete 404 "card/12345"))
 
 ;; # CARD FAVORITE STUFF