Merge branch 'refactor-project-overview' into stage

Author: e11sy

src/models/eventsFactory.js

@@ -8,6 +8,10 @@ const Event = require('../models/event');
 const { ObjectID } = require('mongodb');
 const { composeEventPayloadByRepetition } = require('../utils/merge');
 
+/**
+ * @typedef {import('mongodb').UpdateWriteOpResult} UpdateWriteOpResult
+ */
+
 /**
  * @typedef {Object} EventRepetitionSchema
  * @property {String} _id — repetition's identifier
@@ -39,9 +43,9 @@ const { composeEventPayloadByRepetition } = require('../utils/merge');
 
 /**
  * @typedef {Object} DailyEventsCursor
- * @property {Number} groupingTimestampBound - boundary value of groupingTimestamp field of the last event in the portion
- * @property {Number} sortValueBound - boundary value of the field by which events are sorted (count/affectedUsers/lastRepetitionTime) of the last event in the portion
- * @property {String} idBound - boundary value of _id field of the last event in the portion
+ * @property {Number} groupingTimestampBoundary - boundary value of groupingTimestamp field of the last event in the portion
+ * @property {Number} sortValueBoundary - boundary value of the field by which events are sorted (count/affectedUsers/lastRepetitionTime) of the last event in the portion
+ * @property {String} idBoundary - boundary value of _id field of the last event in the portion
  */
 
 /**
@@ -236,16 +240,16 @@ class EventsFactory extends Factory {
                * If groupingTimestamp is less than the cursors one
                * - daily events of the next day
                */
-              groupingTimestamp: { $lt: paginationCursor.groupingTimestampBound },
+              groupingTimestamp: { $lt: paginationCursor.groupingTimestampBoundary },
             },
             {
               /**
                * If groupingTimestamp equals to the cursor one, but [sort] is less than the cursors one
                * - daily events of the same day, but with less count/affectedUsers/lastRepetitionTime
                */
               $and: [
-                { groupingTimestamp: paginationCursor.groupingTimestampBound },
-                { [sort]: { $lt: paginationCursor.sortValueBound } },
+                { groupingTimestamp: paginationCursor.groupingTimestampBoundary },
+                { [sort]: { $lt: paginationCursor.sortValueBoundary } },
               ],
             },
             {
@@ -254,9 +258,9 @@ class EventsFactory extends Factory {
                * - daily events of the same day with the same count/affectedUsers/lastRepetitionTime, but that were created earlier
                */
               $and: [
-                { groupingTimestamp: paginationCursor.groupingTimestampBound },
-                { [sort]: paginationCursor.sortValueBound },
-                { _id: { $lte: new ObjectID(paginationCursor.idBound) } },
+                { groupingTimestamp: paginationCursor.groupingTimestampBoundary },
+                { [sort]: paginationCursor.sortValueBoundary },
+                { _id: { $lte: new ObjectID(paginationCursor.idBoundary) } },
               ],
             },
           ],
@@ -363,9 +367,9 @@ class EventsFactory extends Factory {
       const nextCursorEvent = result.pop();
 
       nextCursor = {
-        groupingTimestampBound: nextCursorEvent.groupingTimestamp,
-        sortValueBound: nextCursorEvent[sort],
-        idBound: nextCursorEvent._id.toString(),
+        groupingTimestampBoundary: nextCursorEvent.groupingTimestamp,
+        sortValueBoundary: nextCursorEvent[sort],
+        idBoundary: nextCursorEvent._id.toString(),
       };
     }
 
@@ -575,7 +579,7 @@ class EventsFactory extends Factory {
    *
    * @param {String} repetitionId - id of Repetition to find
    * @param {String} originalEventId - id of the original event
-   * @return {Event|null}
+   * @return {EventRepetitionSchema|null}
    */
   async getEventRepetition(repetitionId, originalEventId) {
     /**
@@ -591,6 +595,8 @@ class EventsFactory extends Factory {
        * All events have same type with originalEvent id
        */
       originalEvent.originalEventId = originalEventId;
+      originalEvent.originalTimestamp = originalEvent.timestamp;
+      originalEvent.projectId = this.projectId;
 
       return originalEvent || null;
     }
@@ -660,20 +666,20 @@ class EventsFactory extends Factory {
    * @param {string|ObjectId} eventId - id of the original event
    * @param {string|ObjectId} userId - id of the user who is visiting the event
    *
-   * @return {Promise<void>}
+   * @return {Promise<UpdateWriteOpResult>}
    */
   async visitEvent(eventId, userId) {
-    const event = await this.findById(eventId);
+    const result = await this.getCollection(this.TYPES.EVENTS)
+      .updateOne(
+        { _id: new ObjectID(eventId) },
+        { $addToSet: { visitedBy: new ObjectID(userId) } }
+      );
 
-    if (!event) {
+    if (result.matchedCount === 0) {
       throw new Error(`Event not found for eventId: ${eventId}`);
     }
 
-    return this.getCollection(this.TYPES.EVENTS)
-      .updateOne(
-        { _id: new ObjectID(event._id) },
-        { $addToSet: { visitedBy: new ObjectID(userId) } }
-      );
+    return result;
   }
 
   /**
@@ -682,7 +688,7 @@ class EventsFactory extends Factory {
    * @param {string|ObjectId} eventId - id of the original event to mark
    * @param {string} mark - mark label
    *
-   * @return {Promise<void>}
+   * @return {Promise<UpdateWriteOpResult>}
    */
   async toggleEventMark(eventId, mark) {
     const collection = this.getCollection(this.TYPES.EVENTS);
@@ -745,19 +751,19 @@ class EventsFactory extends Factory {
   async updateAssignee(eventId, assignee) {
     const collection = this.getCollection(this.TYPES.EVENTS);
 
-    const event = await this.findById(eventId);
-
-    if (!event) {
-      throw new Error(`Event not found for eventId: ${eventId}`);
-    }
-
-    const query = { _id: new ObjectID(event._id) };
+    const query = { _id: new ObjectID(eventId) };
 
     const update = {
       $set: { assignee: assignee },
     };
 
-    return collection.updateOne(query, update);
+    const result = await collection.updateOne(query, update);
+
+    if (result.updatedCount === 0) {
+      throw new Error(`Event not found for eventId: ${eventId}`);
+    }
+
+    return result;
   }
 
   /**

src/typeDefs/project.ts

@@ -59,23 +59,23 @@ type DailyEventsCursor {
   """
   Grouping timestamp of the first event in the next portion
   """
-  groupingTimestampBound: Int!
+  groupingTimestampBoundary: Int!
 
   """
   Sort key value of the first event in the next portion
   """
-  sortValueBound: Int!
+  sortValueBoundary: Int!
 
   """
   ID of the first event of in the next portion
   """
-  idBound: ID!
+  idBoundary: ID!
 }
 
 input DailyEventsCursorInput {
-  groupingTimestampBound: Int!
-  sortValueBound: Int!
-  idBound: ID!
+  groupingTimestampBoundary: Int!
+  sortValueBoundary: Int!
+  idBoundary: ID!
 }
 
 """