From 38a0d57e1eb0e6fda9e86421ee9dc592c1eec04b Mon Sep 17 00:00:00 2001 From: Barry Low Date: Tue, 23 Oct 2018 22:49:54 -0700 Subject: [PATCH] Fix teamByRole Query --- api/src/index.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/api/src/index.js b/api/src/index.js index 6673e8562..47bb9435e 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -82,7 +82,17 @@ const resolvers = { }, async teamsByRole(parent, args, ctx, info) { const authId = ctx.request.user.sub - let teamAdmin = await ctx.db.query.teams({where: {members_some: {OR: [{role: 'ADMIN'}, {role: 'OWNER'}], AND: [{member: {authId: authId}}]}}, orderBy: 'updatedAt_DESC'}, TEAMS_FRAGMENT) + let teamAdmin + try { + teamAdmin= await ctx.db.query.teams({where: {members_some: {AND: [{member: {authId: authId}, role_not:'MEMBER'}]}}}, TEAMS_FRAGMENT) + } catch (err) { + logger.debug('teamsByRole error: ') + logger.debug(err) + const errors = res.graphQLErrors.map((error) => { + return error.message + }) + return errors + } logger.info('teamsByRole teamAdmin: ', teamAdmin) return teamAdmin }, @@ -179,7 +189,7 @@ const resolvers = { const platformUrl = 'https://develop.advancedalgos.net/AABrowserAPI/teamSetup/' // const platformUrl = 'http://localhost:1337/AABrowserAPI/teamSetup/' - /* + logger.info(`${platformUrl}${createTeamUrl}/${authId}`) const createPlatformTeam = await axios.get(`${platformUrl}${createTeamUrl}/${authId}`) .then((result) => { @@ -201,7 +211,7 @@ const resolvers = { if(await createPlatformTeam === 'Team Name already taken'){ return createPlatformTeam } - */ + const existingMember = await ctx.db.query.member({ where: { authId } }, `{id}`) .catch((err) => { logger.debug(err, 'existingMember error: ')