Merge branch 'master' into feat/events-multiselect-bulk-actions

Author: Dobrunia

src/models/eventsFactory.js

@@ -1,8 +1,8 @@
-import { getMidnightWithTimezoneOffset, getUTCMidnight } from '../utils/dates';
 import safe from 'safe-regex';
 import { createProjectEventsByIdLoader } from '../dataLoaders';
 import RedisHelper from '../redisHelper';
 import ChartDataService from '../services/chartDataService';
+import { getMidnightWithTimezoneOffset, getUTCMidnight } from '../utils/dates';
 
 const Factory = require('./modelFactory');
 const mongo = require('../mongo');
@@ -992,6 +992,37 @@ class EventsFactory extends Factory {
       },
       { $set: { assignee: normalizedAssignee } }
     );
+   * Remove a single event and all related data (repetitions, daily events)
+   *
+   * @param {string|ObjectId} eventId - id of the original event to remove
+   * @return {Promise<boolean>}
+   */
+  async removeEvent(eventId) {
+    const eventsCollection = this.getCollection(this.TYPES.EVENTS);
+
+    const event = await eventsCollection.findOne({ _id: new ObjectId(eventId) });
+
+    // If event is not found, throw error
+    if (!event) {
+      throw new Error(`Event not found for eventId: ${eventId}`);
+    }
+
+    const { groupHash } = event;
+
+    // Delete original event
+    const result = await eventsCollection.deleteOne({ _id: new ObjectId(eventId) });
+
+    // Delete all repetitions with same groupHash
+    if (await this.isCollectionExists(this.TYPES.REPETITIONS)) {
+      await this.getCollection(this.TYPES.REPETITIONS).deleteMany({ groupHash });
+    }
+
+    // Delete all daily event records with same groupHash
+    if (await this.isCollectionExists(this.TYPES.DAILY_EVENTS)) {
+      await this.getCollection(this.TYPES.DAILY_EVENTS).deleteMany({ groupHash });
+    }
+
+    return result.acknowledged && result.deletedCount > 0;
   }
 
   /**

src/resolvers/event.js

@@ -199,6 +199,19 @@ module.exports = {
         success: !!result.acknowledged,
         modifiedCount: result.modifiedCount || 0,
       };
+     * Remove event and all related data (repetitions, daily events)
+     *
+     * @param {ResolverObj} _obj - resolver context
+     * @param {string} projectId - project id
+     * @param {string} eventId - event id to remove
+     * @return {Promise<boolean>}
+     */
+    async removeEvent(_obj, { projectId, eventId }, context) {
+      const factory = getEventsFactory(context, projectId);
+
+      const result = await factory.removeEvent(eventId);
+
+      return result;
     },
 
     /**

src/typeDefs/event.ts

@@ -591,6 +591,11 @@ extend type Mutation {
   bulkSetEventMarks(
     """
     Project id
+  Remove event and all related data (repetitions, daily events)
+  """
+  removeEvent(
+    """
+    ID of project event is related to
     """
     projectId: ID!
 
@@ -609,6 +614,10 @@ extend type Mutation {
     """
     enabled: Boolean!
   ): BulkSetEventMarksResponse! @requireUserInWorkspace
+    ID of the event to remove
+    """
+    eventId: ID!
+  ): Boolean! @requireAdmin
 
   """
   Namespace that contains only mutations related to the events