Merge pull request #198 from dhis2/fix/users-with-org-view

fix: users-with-organisation view
dhis2 · Apr 16, 2020 · c4fb69d · c4fb69d
2 parents fd1a314 + 4e67b74
commit c4fb69d
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/migrations/20200203182043_fix_view_users_with_organisations.js b/migrations/20200203182043_fix_view_users_with_organisations.js
@@ -0,0 +1,23 @@
+exports.up = async knex => {
+    await knex.raw('DROP VIEW users_with_organisations')
+    await knex.raw(`
+        CREATE VIEW users_with_organisations  
+        AS SELECT u.id AS user_id, u.name as user_name, u.email, o.name AS organisation_name, o.id AS organisation_id FROM users AS u 
+            INNER JOIN user_organisation AS dorg 
+                ON dorg.user_id = u.id
+            INNER JOIN organisation AS o 
+                ON o.id = dorg.organisation_id
+        `)
+}
+
+exports.down = async knex => {
+    await knex.raw('DROP VIEW users_with_organisations')
+    await knex.raw(`
+    CREATE VIEW users_with_organisations  
+    AS SELECT u.id AS user_id, u.name as user_name, u.email, o.name AS organisation_name, o.id AS organisation_id FROM users AS u 
+        INNER JOIN user_organisation AS dorg 
+            ON dorg.user_id = user_id 
+        INNER JOIN organisation AS o 
+            ON o.id = dorg.organisation_id
+    `)
+}