✨ Complete backend behavior when duplicate and move

backend/src/app/rpc/mutations/files.clj

@@ -16,6 +16,7 @@
    [app.common.uuid :as uuid]
    [app.config :as cfg]
    [app.db :as db]
+   [app.rpc.permissions :as perms]
    [app.rpc.queries.files :as files]
    [app.rpc.queries.projects :as proj]
    [app.tasks :as tasks]
@@ -47,14 +48,13 @@
     (proj/check-edition-permissions! conn profile-id project-id)
     (create-file conn params)))
 
-(defn- create-file-profile
+
-  [conn {:keys [profile-id file-id] :as params}]
+(defn create-file-role
-  (db/insert! conn :file-profile-rel
+  [conn {:keys [file-id profile-id role]}]
-              {:profile-id profile-id
+  (let [params {:file-id file-id
-               :file-id file-id
+                :profile-id profile-id}]
-               :is-owner true
+    (->> (perms/assign-role-flags params role)
-               :is-admin true
+         (db/insert! conn :file-profile-rel))))
-               :can-edit true}))
 
 (defn create-file
   [conn {:keys [id name project-id is-shared]
@@ -68,8 +68,8 @@
                           :name name
                           :is-shared is-shared
                           :data (blob/encode data)})]
-    (->> (assoc params :file-id id)
+    (->> (assoc params :file-id id :role :owner)
-         (create-file-profile conn))
+         (create-file-role conn))
     (assoc file :data data)))
 
 

backend/src/app/rpc/mutations/management.clj

@@ -16,10 +16,12 @@
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
    [app.db :as db]
+   [app.rpc.mutations.projects :refer [create-project-role create-project]]
    [app.rpc.queries.projects :as proj]
    [app.rpc.queries.teams :as teams]
    [app.util.blob :as blob]
    [app.util.services :as sv]
+   [app.util.time :as dt]
    [clojure.spec.alpha :as s]
    [clojure.walk :as walk]))
 
@@ -28,7 +30,7 @@
 (s/def ::project-id ::us/uuid)
 (s/def ::file-id ::us/uuid)
 (s/def ::team-id ::us/uuid)
-(s/def ::new-name ::us/string)
+(s/def ::name ::us/string)
 
 (defn- remap-id
   [item index key]
@@ -38,15 +40,24 @@
 
 (defn- process-file
   [file index]
-  (letfn [;; A function responsible to analize all file data and
+  (letfn [(process-form [form]
+            (cond-> form
+              ;; Relink Components
+              (and (map? form)
+                   (uuid? (:component-file form)))
+              (update :component-file #(get index % %))
+
+              ;; Relink Image Shapes
+              (and (map? form)
+                   (map? (:metadata form))
+                   (= :image (:type form)))
+              (update-in [:metadata :id] #(get index % %))))
+
+          ;; A function responsible to analize all file data and
           ;; replace the old :component-file reference with the new
           ;; ones, using the provided file-index
-          (relink-components [data]
+          (relink-shapes [data]
-            (walk/postwalk (fn [form]
+            (walk/postwalk process-form data))
-                             (cond-> form
-                               (and (map? form) (uuid? (:component-file form)))
-                               (update :component-file #(get index % %))))
-                           data))
 
           ;; A function responsible of process the :media attr of file
           ;; data and remap the old ids with the new ones.
@@ -65,45 +76,59 @@
             (fn [data]
               (-> data
                   (blob/decode)
+                  (assoc :id (:id file))
                   (pmg/migrate-data)
-                  (update :pages-index relink-components)
+                  (update :pages-index relink-shapes)
-                  (update :components relink-components)
+                  (update :components relink-shapes)
                   (update :media relink-media)
                   (d/without-nils)
                   (blob/encode))))))
 
-(defn- duplicate-file
+(defn duplicate-file
-  [conn {:keys [profile-id file index project-id new-name]} {:keys [reset-shared-flag] :as opts}]
+  [conn {:keys [profile-id file index project-id name]} {:keys [reset-shared-flag] :as opts}]
-  (let [flibs  (db/query conn :file-library-rel {:file-id (:id file)})
+  (let [flibs    (db/query conn :file-library-rel {:file-id (:id file)})
-        fmeds  (db/query conn :file-media-object {:file-id (:id file)})
+        fmeds    (db/query conn :file-media-object {:file-id (:id file)})
 
-        ;; Remap all file-librar-rel rows to the new file id
+        ;; memo uniform creation/modification date
-        flibs  (map #(remap-id % index :file-id) flibs)
+        now      (dt/now)
+        ignore   (dt/plus now (dt/duration {:seconds 5}))
 
-        ;; Add to the index all non-local file media objects
+        ;; add to the index all file media objects.
-        index  (reduce #(assoc %1 (:id %2) (uuid/next))
+        index  (reduce #(assoc %1 (:id %2) (uuid/next)) index fmeds)
-                       index
-                       (remove :is-local fmeds))
 
-        ;; Remap all file-media-object rows and assing correct new id
+        flibs-xf (comp
-        ;; to each row
+                  (map #(remap-id % index :file-id))
-        fmeds  (->> fmeds
+                  (map #(remap-id % index :library-file-id))
-                    (map #(assoc % :id (or (get index (:id %)) (uuid/next))))
+                  (map #(assoc % :synced-at now))
-                    (map #(remap-id % index :file-id)))
+                  (map #(assoc % :created-at now)))
 
-        file   (cond-> file
+        ;; remap all file-library-rel row
-                 (some? project-id)
+        flibs    (sequence flibs-xf flibs)
-                 (assoc :project-id project-id)
 
-                 (some? new-name)
+        fmeds-xf (comp
-                 (assoc :name new-name)
+                  (map #(assoc % :id (get index (:id %))))
+                  (map #(assoc % :created-at now))
+                  (map #(remap-id % index :file-id)))
 
-                 (true? reset-shared-flag)
+        ;; remap all file-media-object rows
-                 (assoc :is-shared false))
+        fmeds   (sequence fmeds-xf fmeds)
 
-        file   (-> file
+        file    (cond-> file
-                 (update :id #(get index %))
+                  (some? project-id)
-                 (process-file index))]
+                  (assoc :project-id project-id)
+
+                  (some? name)
+                  (assoc :name name)
+
+                  (true? reset-shared-flag)
+                  (assoc :is-shared false))
+
+        file    (-> file
+                    (assoc :created-at now)
+                    (assoc :modified-at now)
+                    (assoc :ignore-sync-until ignore)
+                    (update :id #(get index %))
+                    (process-file index))]
 
     (db/insert! conn :file file)
     (db/insert! conn :file-profile-rel
@@ -128,15 +153,16 @@
 
 (s/def ::duplicate-file
   (s/keys :req-un [::profile-id ::file-id]
-          :opt-un [::new-name]))
+          :opt-un [::name]))
 
 (sv/defmethod ::duplicate-file
-  [{:keys [pool] :as cfg} {:keys [profile-id file-id new-name] :as params}]
+  [{:keys [pool] :as cfg} {:keys [profile-id file-id name] :as params}]
   (db/with-atomic [conn pool]
     (let [file   (db/get-by-id conn :file file-id)
           index  {file-id (uuid/next)}
           params (assoc params :index index :file file)]
       (proj/check-edition-permissions! conn profile-id (:project-id file))
+
       (-> (duplicate-file conn params {:reset-shared-flag true})
           (update :data blob/decode)))))
 
@@ -147,53 +173,73 @@
 
 (s/def ::duplicate-project
   (s/keys :req-un [::profile-id ::project-id]
-          :opt-un [::new-name]))
+          :opt-un [::name]))
 
 (sv/defmethod ::duplicate-project
-  [{:keys [pool] :as cfg} {:keys [profile-id project-id new-name] :as params}]
+  [{:keys [pool] :as cfg} {:keys [profile-id project-id name] :as params}]
   (db/with-atomic [conn pool]
     (let [project (db/get-by-id conn :project project-id)]
       (teams/check-edition-permissions! conn profile-id (:team-id project))
       (duplicate-project conn (assoc params :project project)))))
 
 (defn duplicate-project
-  [conn {:keys [profile-id project new-name] :as params}]
+  [conn {:keys [profile-id project name] :as params}]
   (let [files   (db/query conn :file
                           {:project-id (:id project)}
                           {:columns [:id]})
 
-        index   (reduce #(assoc %1 (:id %2) (uuid/next)) {} files)
         project (cond-> project
-                  new-name
+                  (string? name)
-                  (assoc :name new-name)
+                  (assoc :name name)
 
                   :always
-                  (assoc :id (uuid/next)))
+                  (assoc :id (uuid/next)))]
-        params  (assoc params
-                       :project-id (:id project)
-                       :index index)]
 
-    (db/insert! conn :project project)
+    ;; create the duplicated project and assign the current profile as
-    (db/insert! conn :project-profile-rel {:project-id (:id project)
+    ;; a project owner
-                                           :profile-id profile-id
+    (create-project conn project)
-                                           :is-owner true
+    (create-project-role conn {:project-id (:id project)
-                                           :is-admin true
+                               :profile-id profile-id
-                                           :can-edit true})
+                               :role :owner})
-    (doseq [{:keys [id]} files]
+
-      (let [file   (db/get-by-id conn :file id)
+    ;; duplicate all files
-            params (-> params
+    (let [index  (reduce #(assoc %1 (:id %2) (uuid/next)) {} files)
-                       (assoc :file file)
+          params (-> params
-                       (dissoc :new-name))]
+                     (dissoc :name)
-        (duplicate-file conn params {:reset-shared-flag false
+                     (assoc :project-id (:id project))
-                                     :remap-libraries true})))
+                     (assoc :index index))]
+      (doseq [{:keys [id]} files]
+        (let [file   (db/get-by-id conn :file id)
+              params (assoc params :file file)
+              opts   {:reset-shared-flag false}]
+          (duplicate-file conn params opts))))
+
+    ;; return the created project
     project))
 
 
 ;; --- MUTATION: Move file
 
-(declare sql:retrieve-files)
+(def sql:retrieve-files
-(declare sql:move-files)
+  "select id, project_id from file where id = ANY(?)")
-(declare sql:delete-broken-relations)
+
+(def sql:move-files
+  "update file set project_id = ? where id = ANY(?)")
+
+(def sql:delete-broken-relations
+  "with broken as (
+     (select * from file_library_rel as flr
+       inner join file as f on (flr.file_id = f.id)
+       inner join project as p on (f.project_id = p.id)
+       inner join file as lf on (flr.library_file_id = lf.id)
+       inner join project as lp on (lf.project_id = lp.id)
+       where p.id = ANY(?)
+         and lp.team_id != p.team_id)
+   )
+   delete from file_library_rel as rel
+    using broken as br
+    where rel.file_id = br.file_id
+      and rel.library_file_id = br.library_file_id")
 
 (s/def ::ids (s/every ::us/uuid :kind set?))
 (s/def ::move-files
@@ -228,27 +274,6 @@
 
       nil)))
 
-(def sql:retrieve-files
-  "select id, project_id from file where id = ANY(?)")
-
-(def sql:move-files
-  "update file set project_id = ? where id = ANY(?)")
-
-(def sql:delete-broken-relations
-  "with broken as (
-     (select * from file_library_rel as flr
-       inner join file as f on (flr.file_id = f.id)
-       inner join project as p on (f.project_id = p.id)
-       inner join file as lf on (flr.library_file_id = lf.id)
-       inner join project as lp on (lf.project_id = lp.id)
-       where p.id = ANY(?)
-         and lp.team_id != p.team_id)
-   )
-   delete from file_library_rel as rel
-    using broken as br
-    where rel.file_id = br.file_id
-      and rel.library_file_id = br.library_file_id")
-
 
 ;; --- MUTATION: Move project
 

backend/src/app/rpc/mutations/profile.clj

@@ -196,21 +196,25 @@
 
 (defn create-profile-relations
   [conn profile]
-  (let [team (teams/create-team conn {:profile-id (:id profile)
+  (let [team    (teams/create-team conn {:profile-id (:id profile)
-                                      :name "Default"
+                                         :name "Default"
-                                      :default? true})
+                                         :is-default true})
-        proj (projects/create-project conn {:profile-id (:id profile)
+        project (projects/create-project conn {:profile-id (:id profile)
-                                            :team-id (:id team)
+                                               :team-id (:id team)
-                                            :name "Drafts"
+                                               :name "Drafts"
-                                            :default? true})]
+                                               :is-default true})
-    (teams/create-team-profile conn {:team-id (:id team)
+        params  {:team-id (:id team)
-                                     :profile-id (:id profile)})
+                 :profile-id (:id profile)
-    (projects/create-project-profile conn {:project-id (:id proj)
+                 :project-id (:id project)
-                                           :profile-id (:id profile)})
+                 :role :owner}]
 
-    (merge (profile/strip-private-attrs profile)
+    (teams/create-team-role conn params)
-           {:default-team-id (:id team)
+    (projects/create-project-role conn params)
-            :default-project-id (:id proj)})))
+
+    (-> profile
+        (profile/strip-private-attrs)
+        (assoc :default-team-id (:id team))
+        (assoc :default-project-id (:id project)))))
 
 ;; --- Mutation: Login
 

backend/src/app/rpc/mutations/projects.clj

@@ -13,6 +13,7 @@
    [app.common.uuid :as uuid]
    [app.config :as cfg]
    [app.db :as db]
+   [app.rpc.permissions :as perms]
    [app.rpc.queries.projects :as proj]
    [app.rpc.queries.teams :as teams]
    [app.tasks :as tasks]
@@ -30,7 +31,7 @@
 ;; --- Mutation: Create Project
 
 (declare create-project)
-(declare create-project-profile)
+(declare create-project-role)
 (declare create-team-project-profile)
 
 (s/def ::team-id ::us/uuid)
@@ -43,30 +44,31 @@
   (db/with-atomic [conn pool]
     (teams/check-edition-permissions! conn profile-id team-id)
     (let [project (create-project conn params)
-          params  (assoc params :project-id (:id project))]
+          params  (assoc params
-      (create-project-profile conn params)
+                         :project-id (:id project)
+                         :role :owner)]
+      (create-project-role conn params)
       (create-team-project-profile conn params)
       (assoc project :is-pinned true))))
 
 (defn create-project
-  [conn {:keys [id team-id name default?] :as params}]
+  [conn {:keys [id team-id name is-default] :as params}]
-  (let [id (or id (uuid/next))
+  (let [id         (or id (uuid/next))
-        default? (if (boolean? default?) default? false)]
+        is-default (if (boolean? is-default) is-default false)]
     (db/insert! conn :project
                 {:id id
-                 :team-id team-id
                  :name name
-                 :is-default default?})))
+                 :team-id team-id
+                 :is-default is-default})))
 
-(defn create-project-profile
+(defn create-project-role
-  [conn {:keys [project-id profile-id] :as params}]
+  [conn {:keys [project-id profile-id role]}]
-  (db/insert! conn :project-profile-rel
+  (let [params {:project-id project-id
-              {:project-id project-id
+                :profile-id profile-id}]
-               :profile-id profile-id
+    (->> (perms/assign-role-flags params role)
-               :is-owner true
+         (db/insert! conn :project-profile-rel))))
-               :is-admin true
-               :can-edit true}))
 
+;; TODO: pending to be refactored
 (defn create-team-project-profile
   [conn {:keys [team-id project-id profile-id] :as params}]
   (db/insert! conn :team-project-profile-rel

backend/src/app/rpc/mutations/teams.clj

@@ -18,6 +18,7 @@
    [app.emails :as emails]
    [app.media :as media]
    [app.rpc.mutations.projects :as projects]
+   [app.rpc.permissions :as perms]
    [app.rpc.queries.profile :as profile]
    [app.rpc.queries.teams :as teams]
    [app.storage :as sto]
@@ -36,7 +37,7 @@
 ;; --- Mutation: Create Team
 
 (declare create-team)
-(declare create-team-profile)
+(declare create-team-role)
 (declare create-team-default-project)
 
 (s/def ::create-team
@@ -47,37 +48,39 @@
   [{:keys [pool] :as cfg} params]
   (db/with-atomic [conn pool]
     (let [team   (create-team conn params)
-          params (assoc params :team-id (:id team))]
+          params (assoc params
-      (create-team-profile conn params)
+                        :team-id (:id team)
+                        :role :owner)]
+      (create-team-role conn params)
       (create-team-default-project conn params)
       team)))
 
 (defn create-team
-  [conn {:keys [id name default?] :as params}]
+  [conn {:keys [id name is-default] :as params}]
-  (let [id (or id (uuid/next))
+  (let [id         (or id (uuid/next))
-        default? (if (boolean? default?) default? false)]
+        is-default (if (boolean? is-default) is-default false)]
     (db/insert! conn :team
                 {:id id
                  :name name
-                 :is-default default?})))
+                 :is-default is-default})))
 
-(defn create-team-profile
+(defn create-team-role
-  [conn {:keys [team-id profile-id] :as params}]
+  [conn {:keys [team-id profile-id role] :as params}]
-  (db/insert! conn :team-profile-rel
+  (let [params {:team-id team-id
-              {:team-id team-id
+                :profile-id profile-id}]
-               :profile-id profile-id
+    (->> (perms/assign-role-flags params role)
-               :is-owner true
+         (db/insert! conn :team-profile-rel))))
-               :is-admin true
-               :can-edit true}))
 
 (defn create-team-default-project
   [conn {:keys [team-id profile-id] :as params}]
-  (let [proj (projects/create-project conn {:team-id team-id
+  (let [project {:id (uuid/next)
-                                            :name "Drafts"
+                 :team-id team-id
-                                            :default? true})]
+                 :name "Drafts"
-    (projects/create-project-profile conn {:project-id (:id proj)
+                 :is-default true}]
-                                           :profile-id profile-id})))
+    (projects/create-project conn project)
-
+    (projects/create-project-role conn {:project-id (:id project)
+                                        :profile-id profile-id
+                                        :role :owner})))
 
 ;; --- Mutation: Update Team
 

backend/src/app/rpc/permissions.clj

@@ -11,7 +11,34 @@
   "A permission checking helper factories."
   (:require
    [app.common.exceptions :as ex]
-   [app.common.spec :as us]))
+   [app.common.spec :as us]
+   [clojure.spec.alpha :as s]))
+
+(s/def ::role #{:admin :owner :editor :viewer})
+
+(defn assign-role-flags
+  [params role]
+  (us/verify ::role role)
+  (cond-> params
+    (= role :owner)
+    (assoc :is-owner true
+           :is-admin true
+           :can-edit true)
+
+    (= role :admin)
+    (assoc :is-owner false
+           :is-admin true
+           :can-edit true)
+
+    (= role :editor)
+    (assoc :is-owner false
+           :is-admin false
+           :can-edit true)
+
+    (= role :viewer)
+    (assoc :is-owner false
+           :is-admin false
+           :can-edit false)))
 
 (defn make-edition-check-fn
   "A simple factory for edition permission check functions."

backend/src/app/setup/initial_data.clj

@@ -10,16 +10,12 @@
 (ns app.setup.initial-data
   (:refer-clojure :exclude [load])
   (:require
-   [app.common.data :as d]
-   [app.common.pages.migrations :as pmg]
    [app.common.uuid :as uuid]
    [app.config :as cfg]
    [app.db :as db]
-   [app.rpc.mutations.projects :as projects]
+   [app.rpc.mutations.management :refer [duplicate-file]]
-   [app.rpc.queries.profile :as profile]
+   [app.rpc.mutations.projects :refer [create-project create-project-role]]
-   [app.util.blob :as blob]
+   [app.rpc.queries.profile :as profile]))
-   [app.util.time :as dt]
-   [clojure.walk :as walk]))
 
 ;; --- DUMP GENERATION
 
@@ -62,58 +58,6 @@
 
 ;; --- DUMP LOADING
 
-(defn- process-file
-  [file index]
-  (letfn [(process-form [form]
-            (cond-> form
-              ;; Relink Components
-              (and (map? form)
-                   (uuid? (:component-file form)))
-              (update :component-file #(get index % %))
-
-              ;; Relink Image Shapes
-              (and (map? form)
-                   (map? (:metadata form))
-                   (= :image (:type form)))
-              (update-in [:metadata :id] #(get index % %))))
-
-          ;; A function responsible to analize all file data and
-          ;; replace the old :component-file reference with the new
-          ;; ones, using the provided file-index
-          (relink-shapes [data]
-            (walk/postwalk process-form data))
-
-          ;; A function responsible of process the :media attr of file
-          ;; data and remap the old ids with the new ones.
-          (relink-media [media]
-            (reduce-kv (fn [res k v]
-                         (let [id (get index k)]
-                           (if (uuid? id)
-                             (-> res
-                                 (assoc id (assoc v :id id))
-                                 (dissoc k))
-                             res)))
-                       media
-                       media))]
-
-    (update file :data
-            (fn [data]
-              (-> data
-                  (blob/decode)
-                  (assoc :id (:id file))
-                  (pmg/migrate-data)
-                  (update :pages-index relink-shapes)
-                  (update :components relink-shapes)
-                  (update :media relink-media)
-                  (d/without-nils)
-                  (blob/encode))))))
-
-(defn- remap-id
-  [item index key]
-  (cond-> item
-    (contains? item key)
-    (assoc key (get index (get item key) (get item key)))))
-
 (defn- retrieve-data
   [conn skey]
   (when-let [row (db/exec-one! conn ["select content from server_prop where id = ?" skey])]
@@ -127,60 +71,24 @@
    (let [skey (or (:skey opts) (cfg/get :initial-project-skey))
          data (retrieve-data conn skey)]
      (when data
-       (let [project (projects/create-project conn {:profile-id (:id profile)
+       (let [index   (reduce #(assoc %1 (:id %2) (uuid/next)) {} (:files data))
-                                                    :team-id (:default-team-id profile)
+             project {:id (uuid/next)
-                                                    :name (:project-name data)})
+                      :profile-id (:id profile)
+                      :team-id (:default-team-id profile)
+                      :name (:project-name data)}]
 
-             now     (dt/now)
+         (create-project conn project)
-             ignore  (dt/plus now (dt/duration {:seconds 5}))
+         (create-project-role conn {:project-id (:id project)
-             index   (as-> {} index
+                                    :profile-id (:id profile)
-                       (reduce #(assoc %1 (:id %2) (uuid/next)) index (:files data))
+                                    :role :owner})
-                       (reduce #(assoc %1 (:id %2) (uuid/next)) index (:fmeds data)))
 
-             flibs   (->> (:flibs data)
+         (doseq [file (:files data)]
-                          (map #(remap-id % index :file-id))
+           (let [params {:profile-id (:id profile)
-                          (map #(remap-id % index :library-file-id))
+                         :project-id (:id project)
-                          (map #(assoc % :synced-at now))
+                         :file file
-                          (map #(assoc % :created-at now)))
+                         :index index}
-
+                 opts   {:reset-shared-flag false}]
-             files   (->> (:files data)
+             (duplicate-file conn params opts))))))))
-                          (map #(assoc % :id (get index (:id %))))
-                          (map #(assoc % :project-id (:id project)))
-                          (map #(assoc % :created-at now))
-                          (map #(assoc % :modified-at now))
-                          (map #(assoc % :ignore-sync-until ignore))
-                          (map #(process-file % index)))
-
-             fmeds   (->> (:fmeds data)
-                          (map #(assoc % :id (get index (:id %))))
-                          (map #(assoc % :created-at now))
-                          (map #(remap-id % index :file-id)))
-
-             fprofs  (map #(array-map :file-id (:id %)
-                                      :profile-id (:id profile)
-                                      :is-owner true
-                                      :is-admin true
-                                      :can-edit true) files)]
-
-       (projects/create-project-profile conn {:project-id (:id project)
-                                              :profile-id (:id profile)})
-
-       (projects/create-team-project-profile conn {:team-id (:default-team-id profile)
-                                                   :project-id (:id project)
-                                                   :profile-id (:id profile)})
-
-       ;; Re-insert into the database
-       (doseq [params files]
-         (db/insert! conn :file params))
-
-       (doseq [params fprofs]
-         (db/insert! conn :file-profile-rel params))
-
-       (doseq [params flibs]
-         (db/insert! conn :file-library-rel params))
-
-       (doseq [params fmeds]
-         (db/insert! conn :file-media-object params)))))))
 
 (defn load
   [system {:keys [email] :as opts}]

backend/tests/app/tests/helpers.clj

@@ -154,12 +154,10 @@
          team (#'teams/create-team conn {:id id
                                          :profile-id profile-id
                                          :name (str "team" i)})]
-     (#'teams/create-team-profile conn
+     (#'teams/create-team-role conn
-                                  {:team-id id
+                               {:team-id id
-                                   :profile-id profile-id
+                                :profile-id profile-id
-                                   :is-owner true
+                                :role :owner})
-                                   :is-admin true
-                                   :can-edit true})
      team)))
 
 
@@ -198,37 +196,26 @@
                :created-at (or created-at (dt/now))
                :content (db/tjson {})}))
 
+(defn create-team-role*
+  ([params] (create-team-role* *pool* params))
+  ([conn {:keys [team-id profile-id role] :or {role :owner}}]
+   (#'teams/create-team-role conn {:team-id team-id
+                                  :profile-id profile-id
+                                  :role role})))
 
-(defn create-team-permission*
+(defn create-project-role*
-  ([params] (create-team-permission* *pool* params))
+  ([params] (create-project-role* *pool* params))
-  ([conn {:keys [team-id profile-id is-owner is-admin can-edit]
+  ([conn {:keys [project-id profile-id role] :or {role :owner}}]
-          :or {is-owner true is-admin true can-edit true}}]
+   (#'projects/create-project-role conn {:project-id project-id
-   (db/insert! conn :team-profile-rel {:team-id team-id
+                                         :profile-id profile-id
-                                       :profile-id profile-id
+                                         :role role})))
-                                       :is-owner is-owner
-                                       :is-admin is-admin
-                                       :can-edit can-edit})))
-
-(defn create-project-permission*
-  ([params] (create-project-permission* *pool* params))
-  ([conn {:keys [project-id profile-id is-owner is-admin can-edit]
-          :or {is-owner true is-admin true can-edit true}}]
-   (db/insert! conn :project-profile-rel {:project-id project-id
-                                          :profile-id profile-id
-                                          :is-owner is-owner
-                                          :is-admin is-admin
-                                          :can-edit can-edit})))
-
-(defn create-file-permission*
-  ([params] (create-file-permission* *pool* params))
-  ([conn {:keys [file-id profile-id is-owner is-admin can-edit]
-          :or {is-owner true is-admin true can-edit true}}]
-   (db/insert! conn :project-profile-rel {:file-id file-id
-                                          :profile-id profile-id
-                                          :is-owner is-owner
-                                          :is-admin is-admin
-                                          :can-edit can-edit})))
 
+(defn create-file-role*
+  ([params] (create-file-role* *pool* params))
+  ([conn {:keys [file-id profile-id role] :or {role :owner}}]
+   (#'files/create-file-role conn {:file-id file-id
+                                   :profile-id profile-id
+                                   :role role})))
 
 (defn update-file*
   ([params] (update-file* *pool* params))

backend/tests/app/tests/test_services_management.clj

@@ -50,7 +50,7 @@
     (let [data {::th/type :duplicate-file
                 :profile-id (:id profile)
                 :file-id (:id file1)
-                :new-name "file 1 (copy)"}
+                :name "file 1 (copy)"}
           out  (th/mutation! data)]
 
       ;; (th/print-result! out)
@@ -122,7 +122,7 @@
     (let [data {::th/type :duplicate-project
                 :profile-id (:id profile)
                 :project-id (:id project)
-                :new-name "project 1 (copy)"}
+                :name "project 1 (copy)"}
           out  (th/mutation! data)]
 
       ;; Check tha tresult is correct
@@ -157,8 +157,8 @@
                                        (:data fb)))))
 
             (when (= (:id fa) (:id file2))
-              (t/is (true? (b/equals? (:data fa)
+              (t/is (false? (b/equals? (:data fa)
-                                      (:data fb))))))
+                                       (:data fb))))))
 
           )))))
 

backend/tests/app/tests/test_services_projects.clj

@@ -50,7 +50,21 @@
         (t/is project-id (get-in result [0 :id]))
         (t/is (= "test project" (get-in result [0 :name])))))
 
-    ;; rename project"
+    ;; query all projects of a user
+    (let [data {::th/type :all-projects
+                :profile-id (:id profile)}
+          out  (th/query! data)]
+      ;; (th/print-result! out)
+
+      (t/is (nil? (:error out)))
+      (let [result (:result out)]
+        (t/is (= 2 (count result)))
+        (t/is (not= project-id (get-in result [0 :id])))
+        (t/is (= "Drafts" (get-in result [0 :name])))
+        (t/is project-id (get-in result [1 :id]))
+        (t/is (= "test project" (get-in result [1 :name])))))
+
+    ;; rename project
     (let [data {::th/type :rename-project
                 :id project-id
                 :name "renamed project"

frontend/src/app/main/data/dashboard.cljs

@@ -365,7 +365,7 @@
               new-name (str name " " (tr "dashboard.copy-suffix"))]
 
           (->> (rp/mutation! :duplicate-project {:project-id id
-                                                 :new-name new-name})
+                                                 :name new-name})
                (rx/tap on-success)
                (rx/map #(partial duplicated %))
                (rx/catch on-error)))))))
@@ -533,7 +533,7 @@
             new-name (str name " " (tr "dashboard.copy-suffix"))]
 
         (->> (rp/mutation! :duplicate-file {:file-id id
-                                            :new-name new-name})
+                                            :name new-name})
              (rx/tap on-success)
              (rx/map file-created)
              (rx/catch on-error))))))