dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testen

Browse Source
This commit is contained in:
LukasNowy
2019-03-20 18:45:36 +01:00
parent e21773b35f
commit 3b292c02e8
5 changed files with 325 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
express-server/db-connect/db-connect.js
View File

@ -168,7 +168,7 @@ async function displayShoppinglist(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, shoppinglist[0].name, shoppinglist[0].description);
return items_in_groups(groups, items, sl_id, admin[0].username, admin[0].message_id, members, shoppinglist[0].name, shoppinglist[0].description, shoppinglist[0].invitelink);
} catch (error) {
console.error(error);
}
@ -423,6 +423,8 @@ async function manInvite(sl_id, uid) {
async function removeMember(uid, sl_id) {
try {
await nonQuery('DELETE FROM "Shoppinglist_member" WHERE username = $1 AND sl_id = $2', [uid, sl_id]);
return getShoppinglistsShared(sl_id);
} catch (error) {
console.error(error);
}
@ -469,12 +471,13 @@ function generate_item_id() {
return output;
}
function items_in_groups(groups, items, sl_id, admin_uid, admin_mid, members, name, description) {
function items_in_groups(groups, items, sl_id, admin_uid, admin_mid, members, name, description, invitelink) {
let result = {
sl_id: sl_id,
name: name,
description: description,
invitelink: invitelink,
admin: {
uid: admin_uid,
mid: admin_mid