From ae79ee435e62559213d9823e653d1084861208ad Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 12 Dec 2022 13:26:08 +0100 Subject: [PATCH] :tada: Add many rpc calls to webhooks registry --- backend/src/app/rpc/commands/files.clj | 18 ++++++++------ backend/src/app/rpc/commands/files/create.clj | 6 +++-- backend/src/app/rpc/mutations/fonts.clj | 24 ++++++++++--------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/backend/src/app/rpc/commands/files.clj b/backend/src/app/rpc/commands/files.clj index 9b3a6bbc9..27df59f4e 100644 --- a/backend/src/app/rpc/commands/files.clj +++ b/backend/src/app/rpc/commands/files.clj @@ -17,6 +17,7 @@ [app.common.types.shape-tree :as ctt] [app.db :as db] [app.db.sql :as sql] + [app.loggers.webhooks :as-alias webhooks] [app.rpc.commands.files.thumbnails :as-alias thumbs] [app.rpc.cond :as-alias cond] [app.rpc.doc :as-alias doc] @@ -762,7 +763,8 @@ (s/keys :req-un [::profile-id ::name ::id])) (sv/defmethod ::rename-file - {::doc/added "1.17"} + {::doc/added "1.17" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}] (db/with-atomic [conn pool] (check-edition-permissions! conn profile-id id) @@ -806,7 +808,8 @@ (s/keys :req-un [::profile-id ::id ::is-shared])) (sv/defmethod ::set-file-shared - {::doc/added "1.17"} + {::doc/added "1.17" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [id profile-id is-shared] :as params}] (db/with-atomic [conn pool] (check-edition-permissions! conn profile-id id) @@ -829,14 +832,14 @@ (s/keys :req-un [::id ::profile-id])) (sv/defmethod ::delete-file - {::doc/added "1.17"} + {::doc/added "1.17" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}] (db/with-atomic [conn pool] (check-edition-permissions! conn profile-id id) (absorb-library conn params) (mark-file-deleted conn params))) - ;; --- MUTATION COMMAND: link-file-to-library (def sql:link-file-to-library @@ -852,7 +855,8 @@ (s/keys :req-un [::profile-id ::file-id ::library-id])) (sv/defmethod ::link-file-to-library - {::doc/added "1.17"} + {::doc/added "1.17" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [profile-id file-id library-id] :as params}] (when (= file-id library-id) (ex/raise :type :validation @@ -863,7 +867,6 @@ (check-edition-permissions! conn profile-id library-id) (link-file-to-library conn params))) - ;; --- MUTATION COMMAND: unlink-file-from-library (defn unlink-file-from-library @@ -876,7 +879,8 @@ (s/keys :req-un [::profile-id ::file-id ::library-id])) (sv/defmethod ::unlink-file-from-library - {::doc/added "1.17"} + {::doc/added "1.17" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [profile-id file-id] :as params}] (db/with-atomic [conn pool] (check-edition-permissions! conn profile-id file-id) diff --git a/backend/src/app/rpc/commands/files/create.clj b/backend/src/app/rpc/commands/files/create.clj index eb5ebe675..d0283abca 100644 --- a/backend/src/app/rpc/commands/files/create.clj +++ b/backend/src/app/rpc/commands/files/create.clj @@ -11,7 +11,8 @@ [app.common.types.file :as ctf] [app.common.uuid :as uuid] [app.db :as db] - [app.loggers.audit :as audit] + [app.loggers.audit :as-alias audit] + [app.loggers.webhooks :as-alias webhooks] [app.rpc.commands.files :as files] [app.rpc.doc :as-alias doc] [app.rpc.permissions :as perms] @@ -75,7 +76,8 @@ ::files/features])) (sv/defmethod ::create-file - {::doc/added "1.17"} + {::doc/added "1.17" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [profile-id project-id] :as params}] (db/with-atomic [conn pool] (proj/check-edition-permissions! conn profile-id project-id) diff --git a/backend/src/app/rpc/mutations/fonts.clj b/backend/src/app/rpc/mutations/fonts.clj index 674254df3..b92a3fc86 100644 --- a/backend/src/app/rpc/mutations/fonts.clj +++ b/backend/src/app/rpc/mutations/fonts.clj @@ -12,6 +12,7 @@ [app.common.uuid :as uuid] [app.db :as db] [app.loggers.audit :as-alias audit] + [app.loggers.webhooks :as-alias webhooks] [app.media :as media] [app.rpc.climit :as-alias climit] [app.rpc.doc :as-alias doc] @@ -43,6 +44,8 @@ ::font-id ::font-family ::font-weight ::font-style])) (sv/defmethod ::create-font-variant + {::doc/added "1.3" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [team-id profile-id] :as params}] (let [cfg (update cfg :storage media/configure-assets-storage)] (teams/check-edition-permissions! pool profile-id team-id) @@ -119,19 +122,16 @@ (s/def ::update-font (s/keys :req-un [::profile-id ::team-id ::id ::name])) -(def sql:update-font - "update team_font_variant - set font_family = ? - where team_id = ? - and font_id = ?") - (sv/defmethod ::update-font - {::climit/queue :process-font} + {::doc/added "1.3" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [team-id profile-id id name] :as params}] (db/with-atomic [conn pool] (teams/check-edition-permissions! conn profile-id team-id) - (db/exec-one! conn [sql:update-font name team-id id]) - nil)) + (db/update! conn :team-font-variant + {:font-family name} + {:font-id id + :team-id team-id}))) ;; --- DELETE FONT @@ -139,10 +139,11 @@ (s/keys :req-un [::profile-id ::team-id ::id])) (sv/defmethod ::delete-font + {::doc/added "1.3" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [id team-id profile-id] :as params}] (db/with-atomic [conn pool] (teams/check-edition-permissions! conn profile-id team-id) - (db/update! conn :team-font-variant {:deleted-at (dt/now)} {:font-id id :team-id team-id}) @@ -154,7 +155,8 @@ (s/keys :req-un [::profile-id ::team-id ::id])) (sv/defmethod ::delete-font-variant - {::doc/added "1.3"} + {::doc/added "1.3" + ::webhooks/event? true} [{:keys [pool] :as cfg} {:keys [id team-id profile-id] :as params}] (db/with-atomic [conn pool] (teams/check-edition-permissions! conn profile-id team-id)