From 925f2dc30f807f567b48d436f34320012d0236f2 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 24 Nov 2023 10:38:18 +0100
Subject: [PATCH] :sparkles: Remove duplicated rpc method for creating file
 object thumbnails

---
 .../src/app/rpc/commands/files_thumbnails.clj | 41 ++-----------------
 .../app/main/data/workspace/thumbnails.cljs   |  2 +-
 frontend/src/app/main/repo.cljs               |  8 ++--
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/backend/src/app/rpc/commands/files_thumbnails.clj b/backend/src/app/rpc/commands/files_thumbnails.clj
index b90af0d0d..0b3fa372f 100644
--- a/backend/src/app/rpc/commands/files_thumbnails.clj
+++ b/backend/src/app/rpc/commands/files_thumbnails.clj
@@ -236,7 +236,8 @@
   "insert into file_tagged_object_thumbnail(file_id, object_id, media_id, tag)
    values (?, ?, ?, ?)
        on conflict(file_id, tag, object_id) do
-          update set media_id = ?;")
+          update set media_id = ?
+   returning *;")
 
 (defn- create-file-object-thumbnail!
   [{:keys [::db/conn ::sto/storage]} file-id object-id media tag]
@@ -280,8 +281,7 @@
       (-> cfg
           (update ::sto/storage media/configure-assets-storage)
           (assoc ::db/conn conn)
-          (create-file-object-thumbnail! file-id object-id media (or tag "frame")))
-      nil)))
+          (create-file-object-thumbnail! file-id object-id media (or tag "frame"))))))
 
 ;; --- MUTATION COMMAND: delete-file-object-thumbnail
 
@@ -320,41 +320,6 @@
           (delete-file-object-thumbnail! file-id object-id))
       nil)))
 
-;; --- MUTATION COMMAND: upsert-file-object-thumbnail
-
-(def ^:private schema:upsert-file-object-thumbnail
-  [:map {:title "upsert-file-object-thumbnail"}
-   [:file-id ::sm/uuid]
-   [:object-id :string]
-   [:media ::media/upload]
-   [:tag {:optional true} :string]])
-
-(defn- upsert-file-object-thumbnail!
-  [cfg file-id object-id media tag]
-  (delete-file-object-thumbnail! cfg file-id object-id)
-  (create-file-object-thumbnail! cfg file-id object-id media (or tag "frame")))
-
-(sv/defmethod ::upsert-file-object-thumbnail
-  {::doc/added "1.20"
-   ::doc/module :files
-   ::climit/id :file-thumbnail-ops
-   ::climit/key-fn ::rpc/profile-id
-   ::audit/skip true
-   ::sm/params schema:upsert-file-object-thumbnail}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id object-id media tag]}]
-
-  (db/with-atomic [conn pool]
-    (files/check-edition-permissions! conn profile-id file-id)
-    (media/validate-media-type! media)
-    (media/validate-media-size! media)
-
-    (when-not (db/read-only? conn)
-      (-> cfg
-          (update ::sto/storage media/configure-assets-storage)
-          (assoc ::db/conn conn)
-          (upsert-file-object-thumbnail! file-id object-id media tag))
-      nil)))
-
 ;; --- MUTATION COMMAND: create-file-thumbnail
 
 (def ^:private sql:create-file-thumbnail
diff --git a/frontend/src/app/main/data/workspace/thumbnails.cljs b/frontend/src/app/main/data/workspace/thumbnails.cljs
index 057f21c91..f4a8927d1 100644
--- a/frontend/src/app/main/data/workspace/thumbnails.cljs
+++ b/frontend/src/app/main/data/workspace/thumbnails.cljs
@@ -164,7 +164,7 @@
                                                            :object-id object-id
                                                            :media blob
                                                            :tag (or tag "frame")}]
-                                               (rp/cmd! :upsert-file-object-thumbnail params))))
+                                               (rp/cmd! :create-file-object-thumbnail params))))
                                 (rx/catch rx/empty)
                                 (rx/ignore)))))
              (rx/catch (fn [cause]
diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs
index 44205ff74..e8b5f8f01 100644
--- a/frontend/src/app/main/repo.cljs
+++ b/frontend/src/app/main/repo.cljs
@@ -47,10 +47,10 @@
 (def default-options
   {:update-file {:query-params [:id]}
    :get-raw-file {:rename-to :get-file :raw-transit? true}
-   :upsert-file-object-thumbnail {:query-params [:file-id :object-id :tag]
-                                  :form-data? true}
-   :create-file-object-thumbnail {:query-params [:file-id :object-id :tag]
-                                  :form-data? true}
+
+   :create-file-object-thumbnail
+   {:query-params [:file-id :object-id :tag]
+    :form-data? true}
 
    :create-file-thumbnail
    {:query-params [:file-id :revn]