Detailansicht verbessert

express-server/db-connect/db-connect.js

@@ -6,9 +6,11 @@ const stringSimilarity = require('string-similarity');
 
 async function updateUser(uid, mid) {
     try {      
-        let exists = await query('SELECT row_to_json(username) FROM "User" As obj WHERE username = $1;', [uid]);
+        let exists = await query('SELECT row_to_json("User") AS obj FROM "User" WHERE username = $1;', [uid]);
 
-        //existiert
+        console.log(exists);
+
+       //existiert
         if(exists != undefined) {
             await nonQuery('UPDATE "User" SET message_id = $1 WHERE username = $2', [mid, uid]);
         }
@@ -129,7 +131,7 @@ async function editShoppinglist(sl_id, newname, newdescription, newcolor) {
     }
 }
 
-async function generateUser() {
+/*async function generateUser() {
         //insert user
 
         try {
@@ -139,14 +141,18 @@ async function generateUser() {
         catch (error) {
             console.error(error);
         }
-}
+}*/
 
 //get shoppinglist content
-async function displayShoppinglist(sl_id, username) {
+async function displayShoppinglist(sl_id) {
     try {
         let groups = await query('SELECT row_to_json("Group") AS obj FROM "Group" JOIN "Shoppinglist" USING (sl_id) WHERE sl_id = $1;', [sl_id]);
         let items = await query('SELECT row_to_json("Item") AS obj FROM "Item" JOIN "Group" USING (group_id) WHERE "Group".sl_id = $1;', [sl_id]);
-        return items_in_groups(groups, items, sl_id);
+
+        let members = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_member" USING (username) WHERE sl_id = $1', [sl_id]);
+        let admin = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_admin" USING (username) WHERE sl_id = $1', [sl_id]);
+
+        return items_in_groups(groups, items, sl_id, admin[0].username, admin[0].message_id, members);
     }
 
     catch (error) {
@@ -406,10 +412,15 @@ function generate_item_id() {
     return output;
 }
 
-function items_in_groups(groups, items, sl_id) {
+function items_in_groups(groups, items, sl_id, admin_uid, admin_mid, members) {
 
     let result = {
         sl_id: sl_id,
+        admin: {
+            uid: admin_uid,
+            mid: admin_mid
+        },
+        members: [],
         groups: []
     };
 
@@ -423,6 +434,14 @@ function items_in_groups(groups, items, sl_id) {
         });
     }
 
+    for(let item of members) {
+
+        result.members.push({
+            uid: item.username,
+            mid: item.message_id
+        });
+    }
+
     return result;
 }