add activity

Author: ManAnRuck

src/graphql/resolvers/Activity.js

@@ -0,0 +1,27 @@
+/* eslint-disable no-underscore-dangle */
+
+export default {
+  Query: {},
+
+  Mutation: {
+    increaseActivity: async (parent, { procedureId }, { ProcedureModel, ActivityModel, user }) => {
+      console.log('########### increaseActivity', user);
+      if (!user) {
+        throw new Error('No auth');
+      }
+      const procedure = await ProcedureModel.findOne({ procedureId });
+      if (!procedure) {
+        throw new Error('Procedure not found');
+      }
+      const activity = await ActivityModel.findOne({
+        user,
+        procedure,
+      });
+      if (!activity) {
+        await ActivityModel.create({ user, procedure });
+      }
+      const activityIndex = await ActivityModel.find({ procedure }).count();
+      return { ...procedure.toObject(), 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 }) => {
+    procedures: async (parent, { type, offset, pageSize }, { ProcedureModel, ActivityModel }) => {
       let currentStates = [];
       switch (type) {
         case 'PREPARATION':
@@ -58,7 +58,12 @@ export default {
         return ProcedureModel.find({ currentStatus: { $in: currentStates }, period })
           .sort(sort)
           .skip(offset)
-          .limit(pageSize);
+          .limit(pageSize)
+          .then(results =>
+            results.map(async (procedure) => {
+              const activityIndex = await ActivityModel.find({ procedure }).count();
+              return { ...procedure.toObject(), activityIndex };
+            }));
       }
 
       const activeVotings = await ProcedureModel.find({
@@ -78,15 +83,28 @@ export default {
         .sort(sort)
         .skip(offset - activeVotings.length > 0 ? offset - activeVotings.length : 0)
         .limit(pageSize - activeVotings.length)
-        .then(finishedVotings => [...activeVotings, ...finishedVotings]);
+        .then(finishedVotings => [...activeVotings, ...finishedVotings])
+        .then(results =>
+          results.map(async (procedure) => {
+            const activityIndex = await ActivityModel.find({ procedure }).count();
+            return { ...procedure.toObject(), activityIndex };
+          }));
     },
-    procedure: async (parent, { id }, { ProcedureModel }) =>
-      ProcedureModel.findOne({ procedureId: id }),
-
-    searchProcedures: (parent, { term }, { ProcedureModel }) =>
+    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 }) =>
       ProcedureModel.find(
         { $text: { $search: term }, period: 19 },
         { score: { $meta: 'textScore' } },
-      ).sort({ score: { $meta: 'textScore' } }),
+      )
+        .sort({ score: { $meta: 'textScore' } })
+        .then(results =>
+          results.map(async (procedure) => {
+            const activityIndex = await ActivityModel.find({ procedure }).count();
+            return { ...procedure.toObject(), activityIndex };
+          })),
   },
 };

src/graphql/resolvers/User.js

@@ -17,6 +17,9 @@ export default {
 
       rsa.setPrivateString(process.env.SECRET_KEY);
       const deviceHash = rsa.decrypt(deviceHashEncrypted);
+      if (!deviceHash) {
+        throw new Error('invalid deviceHash');
+      }
       const user = await UserModel.create({ deviceHash });
 
       return { token: user.createToken() };

src/graphql/schemas/Activity.js

@@ -0,0 +1,6 @@
+export default `
+ 
+type Mutation {
+  increaseActivity(procedureId: Int!): Procedure
+}
+`;

src/graphql/schemas/Procedure.js

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

src/index.js

@@ -19,6 +19,7 @@ import auth from './express/auth';
 // Models
 import ProcedureModel from './models/Procedure';
 import UserModel from './models/User';
+import ActivityModel from './models/Activity';
 
 const app = express();
 
@@ -57,6 +58,7 @@ app.use(constants.GRAPHQL_PATH, (req, res, next) => {
       // Models
       ProcedureModel,
       UserModel,
+      ActivityModel,
     },
     tracing: true,
     cacheControl: true,

src/models/Activity.js

@@ -0,0 +1,12 @@
+/* eslint no-underscore-dangle: ["error", { "allow": ["_id"] }] */
+import mongoose, { Schema } from 'mongoose';
+
+const ActivitySchema = new Schema(
+  {
+    user: { type: Schema.Types.ObjectId, ref: 'User', required: true },
+    procedure: { type: Schema.Types.ObjectId, ref: 'Procedure', required: true },
+  },
+  { timestamps: false },
+);
+
+export default mongoose.model('Activity', ActivitySchema);