♻️ Always set component-file-id, even in local file

This commit is contained in:
Andrés Moya 2020-12-04 15:31:03 +01:00 committed by Andrey Antukh
parent 53b5d78cdc
commit baec7838b4
24 changed files with 284 additions and 258 deletions

View file

@ -112,7 +112,7 @@
(create-file [conn owner-id project-id index]
(let [id (mk-uuid "file" project-id index)
name (str "file" index)
data (cp/make-file-data)]
data (cp/make-file-data id)]
(log/info "create file" id)
(db/insert! conn :file
{:id id
@ -186,7 +186,7 @@
id (mk-uuid "file" "draft" owner-id index)
name (str "file" index)
project-id (:default-project-id owner)
data (cp/make-file-data)]
data (cp/make-file-data id)]
(log/info "create draft file" id)
(db/insert! conn :file

View file

@ -63,7 +63,7 @@
:or {is-shared false}
:as params}]
(let [id (or id (uuid/next))
data (cp/make-file-data)
data (cp/make-file-data id)
file (db/insert! conn :file
{:id id
:project-id project-id
@ -276,6 +276,7 @@
changes (:changes params)
file (-> file
(update :data blob/decode)
(update :data assoc :id (:id file))
(update :data pmg/migrate-data)
(update :data cp/process-changes changes)
(update :data blob/encode)

View file

@ -67,6 +67,7 @@
(db/with-atomic [conn db/pool]
(let [mobjs (map :id (db/query conn :media-object {:file-id id}))
data (-> (blob/decode data)
(assoc :id id)
(pmg/migrate-data))
used (collect-used-media data)