improve notification settings

Author: ManAnRuck

src/graphql/resolvers/Notification.js

@@ -27,22 +27,36 @@ export default {
     updateNotificationSettings: async (
       parent,
       {
-        disableAll, disableUntil, procedures, tags,
+        enabled, disableUntil, procedures, tags, newVote, newPreperation,
       },
       { user },
     ) => {
       user.notificationSettings = {
         ...user.notificationSettings,
         ..._.omitBy(
           {
-            disableAll,
+            enabled,
             disableUntil,
             procedures,
             tags,
+            newVote,
+            newPreperation,
           },
           _.isNil,
         ),
       };
+      console.log(_.omitBy(
+        {
+          enabled,
+          disableUntil,
+          procedures,
+          tags,
+          newVote,
+          newPreperation,
+        },
+        _.isNil,
+      ));
+      console.log(user);
       await user.save();
       return user.notificationSettings;
     },

src/graphql/schemas/Notification.js

@@ -5,7 +5,9 @@ export default `
   }
 
   type NotificationSettings {
-    disableAll: Boolean
+    enabled: Boolean
+    newVote: Boolean
+    newPreperation: Boolean
     disableUntil: Date
     procedures: [String]
     tags: [String]
@@ -17,7 +19,14 @@ export default `
 
   type Mutation {
     addToken(token: String!, os: String!): TokenResult
-    updateNotificationSettings(disableAll: String, disableUntil: Date, procedures: [String], tags: [String]): NotificationSettings
+    updateNotificationSettings(
+      enabled: Boolean,
+      newVote: Boolean,
+      newPreperation: Boolean, 
+      disableUntil: Date, 
+      procedures: [String], 
+      tags: [String]
+    ): NotificationSettings
   }
 
   `;

src/models/User.js

@@ -12,8 +12,10 @@ const UserSchema = new Schema(
       },
     ],
     notificationSettings: {
-      disableAll: { type: Boolean, default: false },
-      disableUntil: { type: Date },
+      enabled: { type: Boolean, default: false },
+      disableUntil: Date,
+      newVote: { type: Boolean, default: true },
+      newPreperation: { type: Boolean, default: false },
       procedures: [{ type: Schema.Types.ObjectId, ref: 'Procedure' }],
       tags: [],
     },