From 34d33a2d83f51a53052d344968a8b28da25aebab Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 18 Dec 2019 23:47:29 +0100
Subject: [PATCH] :sparkles: Include project name on files queries.

Just for convenience.
---
 .../uxbox/services/queries/project_files.clj   |  4 +++-
 .../uxbox/services/queries/project_pages.clj   | 18 ------------------
 .../src/uxbox/services/queries/projects.clj    |  2 ++
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/backend/src/uxbox/services/queries/project_files.clj b/backend/src/uxbox/services/queries/project_files.clj
index 920a684cb..8ec4df11f 100644
--- a/backend/src/uxbox/services/queries/project_files.clj
+++ b/backend/src/uxbox/services/queries/project_files.clj
@@ -27,6 +27,7 @@
 
 (su/defstr sql:generic-project-files
   "select pf.*,
+          p.name as project_name,
           array_agg(pp.id) over pages_w as pages
      from project_files as pf
     inner join projects as p on (pf.project_id = p.id)
@@ -76,6 +77,7 @@
   (-> (db/query conn [sql:recent-files user 20])
       (p/then' (partial mapv decode-row))))
 
+
 ;; --- Query: Project File (By ID)
 
 (su/defstr sql:project-file
@@ -90,6 +92,7 @@
   (-> (db/query-one db/pool [sql:project-file user id])
       (p/then' decode-row)))
 
+
 ;; --- Query: Users of the File
 
 (su/defstr sql:file-users
@@ -117,7 +120,6 @@
   (db/with-atomic [conn db/pool]
     (-> (retrieve-minimal-file conn user file-id)
         (p/then (fn [{:keys [id project-id]}]
-                  (prn ::project-file-users id project-id)
                   (db/query conn [sql:file-users id project-id]))))))
 
 (defn- retrieve-minimal-file
diff --git a/backend/src/uxbox/services/queries/project_pages.clj b/backend/src/uxbox/services/queries/project_pages.clj
index decf5b74e..9d4310ee6 100644
--- a/backend/src/uxbox/services/queries/project_pages.clj
+++ b/backend/src/uxbox/services/queries/project_pages.clj
@@ -42,24 +42,6 @@
   (str "with pages as (" sql:generic-project-pages ")"
        " select * from pages where file_id = $2"))
 
-;; (defn project-pages-sql
-;;   [user]
-;;   (-> (sql/from ["project_pages" "pp"])
-;;       (sql/join ["project_files" "pf"] "pf.id = pp.file_id")
-;;       (sql/join ["projects" "p"] "p.id = pf.project_id")
-;;       (sql/ljoin ["project_users", "pu"] "pu.project_id = p.id")
-;;       (sql/ljoin ["project_file_users", "pfu"] "pfu.file_id = pf.id")
-;;       (sql/select "pp.*")
-;;       (sql/where ["((pfu.user_id = ? and pfu.can_edit = true) or
-;;                  (pu.user_id = ? and pu.can_edit = true))" user user])
-;;       (sql/order "pp.created_at")))
-
-;; (let [sql (-> (project-pages-sql user)
-;;               (sql/where ["pp.file_id = ?" file-id])
-;;               (sql/fmt))]
-;;   (-> (db/query db/pool sql)
-;;       (p/then #(mapv decode-row %)))))
-
 (s/def ::project-pages
   (s/keys :req-un [::user ::file-id]))
 
diff --git a/backend/src/uxbox/services/queries/projects.clj b/backend/src/uxbox/services/queries/projects.clj
index ffeb10ac9..c47c04479 100644
--- a/backend/src/uxbox/services/queries/projects.clj
+++ b/backend/src/uxbox/services/queries/projects.clj
@@ -23,6 +23,7 @@
 (s/def ::token ::us/string)
 (s/def ::user ::us/uuid)
 
+
 ;; --- Query: Projects
 
 (su/defstr sql:projects
@@ -41,6 +42,7 @@
   (-> (db/query db/pool [sql:projects user])
       (p/then' (partial mapv decode-row))))
 
+
 ;; --- Helpers
 
 (defn decode-row