better activityIndex handling

Author: ManAnRuck

src/graphql/resolvers/Activity.js

@@ -8,8 +8,13 @@ export default {
       }
       const procedure = await ProcedureModel.findOne({ procedureId });
       const activityIndex = await ActivityModel.find({ procedure }).count();
+      const active = await ActivityModel.findOne({
+        user,
+        procedure,
+      });
       return {
         activityIndex,
+        active: !!active,
       };
     },
   },
@@ -23,15 +28,15 @@ export default {
       if (!procedure) {
         throw new Error('Procedure not found');
       }
-      const activity = await ActivityModel.findOne({
+      let active = await ActivityModel.findOne({
         user,
         procedure,
       });
-      if (!activity) {
-        await ActivityModel.create({ user, procedure });
+      if (!active) {
+        active = await ActivityModel.create({ user, procedure });
       }
       const activityIndex = await ActivityModel.find({ procedure }).count();
-      return { activityIndex };
+      return { activityIndex, active };
     },
   },
 };

src/graphql/resolvers/Procedure.js

@@ -80,12 +80,28 @@ export default {
         .limit(pageSize - activeVotings.length)
         .then(finishedVotings => [...activeVotings, ...finishedVotings]);
     },
+
     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' } }),
   },
+
+  Procedure: {
+    activityIndex: async (procedure, args, { ActivityModel, user }) => {
+      const activityIndex = await ActivityModel.find({ procedure }).count();
+      const active = await ActivityModel.findOne({
+        user,
+        procedure,
+      });
+      return {
+        activityIndex,
+        active: !!active,
+      };
+    },
+  },
 };

src/graphql/schemas/Activity.js

@@ -2,6 +2,7 @@ export default `
 
 type ActivityIndex {
   activityIndex: Int
+  active: Boolean
 }
 
 type Query {

src/graphql/schemas/Procedure.js

@@ -17,7 +17,7 @@ type Procedure {
   voteDate: Date
   subjectGroups: [String]
   submissionDate: Date
-  activityIndex: Int
+  activityIndex: ActivityIndex
   importantDocuments: [Document]
 }