Merge pull request #1 from abhiaiyer91/Issue-3963

Issue 3963
ParabolInc · Jul 1, 2020 · ecfd9c1 · ecfd9c1
2 parents 9560f56 + 3641344
commit ecfd9c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/packages/server/dataloader/foreignLoaderMakers.ts b/packages/server/dataloader/foreignLoaderMakers.ts
@@ -122,19 +122,6 @@ export const meetingMembersByUserId = new LoaderMakerForeign(
     return r
       .table('MeetingMember')
       .getAll(r.args(userIds), {index: 'userId'})
-
-      .run()
-  }
-)
-
-export const meetingSettingsByTeamId = new LoaderMakerForeign(
-  'meetingSettings',
-  'teamId',
-  async (teamIds) => {
-    const r = await getRethink()
-    return r
-      .table('MeetingSettings')
-      .getAll(r.args(teamIds), {index: 'teamId'})
       .run()
   }
 )

diff --git a/packages/server/graphql/types/ActionMeeting.ts b/packages/server/graphql/types/ActionMeeting.ts
@@ -27,8 +27,9 @@ const ActionMeeting = new GraphQLObjectType<IActionMeeting, GQLContext>({
       type: new GraphQLNonNull(ActionMeetingSettings),
       description: 'The settings that govern the action meeting',
       resolve: async ({teamId}, _args, {dataLoader}) => {
-        const allSettings = await dataLoader.get('meetingSettingsByTeamId').load(teamId)
-        return allSettings.find((settings) => settings.meetingType === MeetingTypeEnum.action)
+        return await dataLoader
+          .get('meetingSettingsByType')
+          .load({teamId, meetingType: MeetingTypeEnum.action})
       }
     },
     taskCount: {

diff --git a/packages/server/graphql/types/RetrospectiveMeeting.ts b/packages/server/graphql/types/RetrospectiveMeeting.ts
@@ -123,8 +123,10 @@ const RetrospectiveMeeting = new GraphQLObjectType<any, GQLContext>({
       resolve: async ({id: meetingId}, _args, {dataLoader}) => {
         const meeting = await dataLoader.get('newMeetings').load(meetingId)
         const {teamId} = meeting
-        const allSettings = await dataLoader.get('meetingSettingsByTeamId').load(teamId)
-        return allSettings.find((settings) => settings.meetingType === RETROSPECTIVE)
+
+        return await dataLoader
+          .get('meetingSettingsByType')
+          .load({teamId, meetingType: RETROSPECTIVE})
       }
     },
     taskCount: {

diff --git a/packages/server/graphql/types/Team.ts b/packages/server/graphql/types/Team.ts
@@ -149,8 +149,7 @@ const Team = new GraphQLObjectType<ITeam, GQLContext>({
       },
       description: 'The team-specific settings for running all available types of meetings',
       resolve: async ({id: teamId}, {meetingType}, {dataLoader}) => {
-        const allSettings = await dataLoader.get('meetingSettingsByTeamId').load(teamId)
-        return allSettings.find((settings) => settings.meetingType === meetingType)
+        return await dataLoader.get('meetingSettingsByType').load({teamId, meetingType})
       }
     },
     activeMeetings: {