From eff9386e826a94a533a08375e4b3938513ce0e5f Mon Sep 17 00:00:00 2001 From: anatole <anatole.romon@polytechnique.edu> Date: Wed, 30 May 2018 19:26:35 +0200 Subject: [PATCH] netoyage de code --- src/graphql/connectors/connectors.js | 13 +++++-------- src/graphql/connectors/selectors.js | 2 +- src/graphql/typeDefs/objects.js | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/graphql/connectors/connectors.js b/src/graphql/connectors/connectors.js index 1c4a645..f50161e 100644 --- a/src/graphql/connectors/connectors.js +++ b/src/graphql/connectors/connectors.js @@ -414,7 +414,7 @@ export async function getMessage(user, messageID){ export async function allVisibleEvents(user){ let selection = await selectors.visibleEvents(user); let result = await knex.select().from('events').whereIn('id', selection); - for(r of result){ + for(let r of result){ r.type = 'Announcement'; } return result; @@ -426,7 +426,7 @@ export async function allVisibleAnnouncements(user){ result = result.concat( await knex.select().from('events').whereIn('id', selection) ); - for(r of result){ + for(let r of result){ r.type = 'Announcement'; } return result; @@ -435,8 +435,7 @@ export async function allVisibleAnnouncements(user){ export async function receivedPrivatePosts(user, groupUID){ let received_messages = await selectors.recievedMessages(user, groupUID); let result = await knex('private_posts').select().whereIn('id', received_messages); - let entry; - for(entry of result){ + for(let entry of result){ entry.type = "PrivatePost"; } return result; @@ -445,8 +444,7 @@ export async function receivedPrivatePosts(user, groupUID){ export async function receivedQuestions(user, groupUID){ let received_messages = await selectors.recievedMessages(user, groupUID); let result = await knex('questions').select().whereIn('id', received_messages); - let entry; - for(entry of result){ + for(let entry of result){ entry.type = "Question"; } return result; @@ -455,8 +453,7 @@ export async function receivedQuestions(user, groupUID){ export async function receivedAnswers(user, groupUID){ let received_messages = await selectors.recievedMessages(user, groupUID); let result = await knex('answers').select().whereIn('id', received_messages); - let entry; - for(entry of result){ + for(let entry of result){ entry.type = "Answer"; } return result; diff --git a/src/graphql/connectors/selectors.js b/src/graphql/connectors/selectors.js index 65e814d..5b45d8d 100644 --- a/src/graphql/connectors/selectors.js +++ b/src/graphql/connectors/selectors.js @@ -120,7 +120,7 @@ export async function metaGroupAdminMembers(user, metaGroupUID){ export async function recievedMessages(user, groupUID){ return function(qb){ return qb.column({id : 'message'}).select().from('group_message_relationships').where('group', groupUID).where('status', 'receive'); - } + }; } diff --git a/src/graphql/typeDefs/objects.js b/src/graphql/typeDefs/objects.js index 625be44..22cd793 100644 --- a/src/graphql/typeDefs/objects.js +++ b/src/graphql/typeDefs/objects.js @@ -186,7 +186,7 @@ const Message = ` recipients: Group # Une annonce éventuellement concernée par cette question. - # Null si la question ne concerne pas une annonce particulière + # Null si la question ne concerne pas une annonce particulière forAnnouncement : Announcement -- GitLab