optimize increaseActivityIndex

Author: ManAnRuck

src/graphql/resolvers/Activity.js

@@ -9,7 +9,7 @@ export default {
       const procedure = await ProcedureModel.findOne({ procedureId });
       const activityIndex = await ActivityModel.find({ procedure }).count();
       return {
-        index: activityIndex,
+        activityIndex,
       };
     },
   },
@@ -31,8 +31,7 @@ export default {
         await ActivityModel.create({ user, procedure });
       }
       const activityIndex = await ActivityModel.find({ procedure }).count();
-      console.log(activityIndex);
-      return { ...procedure.toObject(), activityIndex };
+      return { activityIndex };
     },
   },
 };

src/graphql/resolvers/Procedure.js

@@ -1,7 +1,7 @@
 /* eslint no-underscore-dangle: ["error", { "allow": ["_id"] }] */
 export default {
   Query: {
-    procedures: async (parent, { type, offset, pageSize }, { ProcedureModel, ActivityModel }) => {
+    procedures: async (parent, { type, offset, pageSize }, { ProcedureModel }) => {
       let currentStates = [];
       switch (type) {
         case 'PREPARATION':
@@ -58,12 +58,7 @@ export default {
         return ProcedureModel.find({ currentStatus: { $in: currentStates }, period })
           .sort(sort)
           .skip(offset)
-          .limit(pageSize)
-          .then(results =>
-            results.map(async (procedure) => {
-              const activityIndex = await ActivityModel.find({ procedure }).count();
-              return { ...procedure.toObject(), activityIndex };
-            }));
+          .limit(pageSize);
       }
 
       const activeVotings = await ProcedureModel.find({
@@ -83,28 +78,14 @@ export default {
         .sort(sort)
         .skip(offset - activeVotings.length > 0 ? offset - activeVotings.length : 0)
         .limit(pageSize - activeVotings.length)
-        .then(finishedVotings => [...activeVotings, ...finishedVotings])
-        .then(results =>
-          results.map(async (procedure) => {
-            const activityIndex = await ActivityModel.find({ procedure }).count();
-            return { ...procedure.toObject(), activityIndex };
-          }));
+        .then(finishedVotings => [...activeVotings, ...finishedVotings]);
     },
-    procedure: async (parent, { id }, { ProcedureModel, ActivityModel }) =>
-      ProcedureModel.findOne({ procedureId: id }).then(async (procedure) => {
-        const activityIndex = await ActivityModel.find({ procedure }).count();
-        return { ...procedure.toObject(), activityIndex };
-      }),
-    searchProcedures: (parent, { term }, { ProcedureModel, ActivityModel }) =>
+    procedure: async (parent, { id }, { ProcedureModel }) =>
+      ProcedureModel.findOne({ procedureId: id }),
+    searchProcedures: (parent, { term }, { ProcedureModel }) =>
       ProcedureModel.find(
         { $text: { $search: term }, period: 19 },
         { score: { $meta: 'textScore' } },
-      )
-        .sort({ score: { $meta: 'textScore' } })
-        .then(results =>
-          results.map(async (procedure) => {
-            const activityIndex = await ActivityModel.find({ procedure }).count();
-            return { ...procedure.toObject(), activityIndex };
-          })),
+      ).sort({ score: { $meta: 'textScore' } }),
   },
 };

src/graphql/schemas/Activity.js

@@ -1,14 +1,14 @@
 export default `
 
 type ActivityIndex {
-  index: Int
+  activityIndex: Int
 }
 
 type Query {
-  activityIndex(procedureId: Int!): ActivityIndex
+  activityIndex(procedureId: String!): ActivityIndex
 }
  
 type Mutation {
-  increaseActivity(procedureId: Int!): Procedure
+  increaseActivity(procedureId: String!): ActivityIndex
 }
 `;

src/graphql/schemas/Procedure.js

@@ -8,7 +8,7 @@ enum ProcedureType {
 type Procedure {
   _id: ID!
   title: String!
-  procedureId: String
+  procedureId: String!
   type: String
   period: Int
   currentStatus: String