chore(): update from master

Author: e11sy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.1.27",
+  "version": "1.1.28",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {

src/models/eventsFactory.js

@@ -222,6 +222,12 @@ class EventsFactory extends Factory {
               $options: 'i',
             },
           },
+          {
+            'event.payload.addons': {
+              $regex: escapedSearch,
+              $options: 'i',
+            },
+          },
         ],
       }
       : {};

src/models/project.ts

@@ -426,15 +426,20 @@ export default class ProjectModel extends AbstractModel<ProjectDBScheme> impleme
   /**
    * Toggles enabled state of the notifications rule
    * @param ruleId - rule id to update
+   * @param status - new isEnabled status of the rule
    */
-  public async toggleNotificationsRuleEnabledState(ruleId: string): Promise<ProjectNotificationsRuleDBScheme | null> {
+  public async toggleNotificationsRuleEnabledState(ruleId: string, status?: boolean): Promise<ProjectNotificationsRuleDBScheme | null> {
     const rule = this.notifications.find(_rule => _rule._id.toString() === ruleId);
 
     if (!rule) {
       return null;
     }
 
-    rule.isEnabled = !rule.isEnabled;
+    if (status !== undefined) {
+      rule.isEnabled = status;
+    } else {
+      rule.isEnabled = !rule.isEnabled;
+    }
 
     const result = await this.collection.findOneAndUpdate(
       {

src/resolvers/projectNotifications.ts

@@ -242,5 +242,25 @@ export default {
 
       return project.toggleNotificationsRuleEnabledState(input.ruleId);
     },
+
+    /**
+     * Unsubscribes from notifications by disabling the rule
+     * @param _obj - parent object
+     * @param factories - factories for working with models
+     * @param input - input data for unsubscribing
+     */
+    async unsubscribeFromNotifications(
+      _obj: undefined,
+      { input }: { input: ProjectNotificationsRulePointer },
+      { factories }: ResolverContextWithUser
+    ): Promise<ProjectNotificationsRuleDBScheme | null> {
+      const project = await factories.projectsFactory.findById(input.projectId);
+
+      if (!project) {
+        throw new ApolloError('No project with such id');
+      }
+
+      return project.toggleNotificationsRuleEnabledState(input.ruleId, false);
+    },
   },
 };

src/typeDefs/projectNotificationsMutations.ts

@@ -143,5 +143,13 @@ export default gql`
       "Data for toggling"
       input: ProjectNotificationRulePointer
     ): ProjectNotificationsRule @requireAdmin
+
+    """
+    Unsubscribes from notifications by disabling the rule
+    """
+    unsubscribeFromNotifications(
+      "Data for unsubscribing"
+      input: ProjectNotificationRulePointer!
+    ): ProjectNotificationsRule
   }
 `;