3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-19 18:16:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Make the update-profile operation atomic with prop update

Browse source
This commit is contained in:
Andrey Antukh 2022-04-04 15:41:31 +02:00
parent 5e7e055539
commit 1205bdcaae
1 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

64
backend/src/app/rpc/mutations/profile.clj
View file

@ -6,6 +6,7 @@
(ns app.rpc.mutations.profile (ns app.rpc.mutations.profile
(:require (:require
[app.common.data :as d]
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.spec :as us] [app.common.spec :as us]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
@ -30,7 +31,7 @@
(s/def ::email ::us/email) (s/def ::email ::us/email)
(s/def ::fullname ::us/not-empty-string) (s/def ::fullname ::us/not-empty-string)
(s/def ::lang (s/nilable ::us/not-empty-string)) (s/def ::lang ::us/string)
(s/def ::path ::us/string) (s/def ::path ::us/string)
(s/def ::profile-id ::us/uuid) (s/def ::profile-id ::us/uuid)
(s/def ::password ::us/not-empty-string) (s/def ::password ::us/not-empty-string)
@ -342,40 +343,41 @@
;; --- MUTATION: Update Profile (own) ;; --- MUTATION: Update Profile (own)
(defn- update-profile-newsletter-subscribed (s/def ::newsletter-subscribed ::us/boolean)
[conn profile-id newsletter-subscribed]
(let [profile (profile/retrieve-profile-data conn profile-id)
props (:props profile)
props (assoc props :newsletter-subscribed newsletter-subscribed)
]
(db/update! conn :profile
{:props (db/tjson props)}
{:id profile-id})))
(defn- update-profile
[conn {:keys [id fullname lang theme newsletter-subscribed] :as params}]
(let [profile (db/update! conn :profile
{:fullname fullname
:lang lang
:theme theme}
{:id id})
profile (if (some? newsletter-subscribed)
(update-profile-newsletter-subscribed conn id newsletter-subscribed)
profile)]
(-> profile
(profile/decode-profile-row)
(profile/strip-private-attrs))))
(s/def ::update-profile (s/def ::update-profile
(s/keys :req-un [::id ::fullname] (s/keys :req-un [::fullname ::profile-id]
:opt-un [::lang ::theme])) :opt-un [::lang ::theme ::newsletter-subscribed]))
(sv/defmethod ::update-profile (sv/defmethod ::update-profile
[{:keys [pool] :as cfg} params] [{:keys [pool] :as cfg} {:keys [profile-id fullname lang theme newsletter-subscribed] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [profile (update-profile conn params)] ;; NOTE: we need to retrieve the profile independently if we use
(with-meta profile ;; it or not for explicit locking and avoid concurrent updates of
;; the same row/object.
(let [profile (-> (db/get-by-id conn :profile profile-id {:for-update true})
(profile/decode-profile-row))
;; Update the profile map with direct params
profile (-> profile
(assoc :fullname fullname)
(assoc :lang lang)
(assoc :theme theme))
;; Update profile props if the indirect prop is coming in
;; the params map and update the profile props data
;; acordingly.
profile (cond-> profile
(some? newsletter-subscribed)
(update :props assoc :newsletter-subscribed newsletter-subscribed))]
(db/update! conn :profile
{:fullname fullname
:lang lang
:theme theme
:props (db/tjson (:props profile))}
{:id profile-id})
(with-meta (-> profile profile/strip-private-attrs d/without-nils)
{::audit/props (audit/profile->props profile)})))) {::audit/props (audit/profile->props profile)}))))
;; --- MUTATION: Update Password ;; --- MUTATION: Update Password