imp(): pass original event id to getEventRepetitions

Author: e11sy

src/models/eventsFactory.js

@@ -436,12 +436,13 @@ class EventsFactory extends Factory {
    * Returns Event repetitions
    *
    * @param {string|ObjectID} eventId - Event's id, could be repetitionId in case when we want to get repetitions portion by one repetition
+   * @param {string|ObjectID} originalEventId - id of the original event
    * @param {Number} limit - count limitations
    * @param {Number} cursor - pointer to the next repetition
    *
    * @return {EventRepetitionsPortionSchema}
    */
-  async getEventRepetitions(eventId, limit = 10, cursor = null) {
+  async getEventRepetitions(eventId, originalEventId, limit = 10, cursor = null) {
     limit = this.validateLimit(limit);
 
     cursor = cursor ? new ObjectID(cursor) : null;
@@ -455,21 +456,28 @@ class EventsFactory extends Factory {
      * Get original event
      * @type {Event}
      */
-    const eventOriginal = await this.findById(eventId);
+    const eventOriginal = await this.findById(originalEventId);
 
     if (!eventOriginal) {
-      throw new Error(`Original event not found for ${eventId}`);
+      throw new Error(`Original event not found for ${originalEventId}`);
+    }
+
+    /**
+     * Get portion based on cursor if cursor is not null
+     */
+    const query = cursor ? { 
+      groupHash: eventOriginal.groupHash,
+      _id: { $lte: cursor },
+    } : { 
+      groupHash: eventOriginal.groupHash,
     }
 
     /**
      * Collect repetitions
      * @type {EventRepetitionSchema[]}
      */
     const repetitions = await this.getCollection(this.TYPES.REPETITIONS)
-      .find({
-        groupHash: eventOriginal.groupHash,
-        _id: cursor ? { $lte: cursor } : {},
-      })
+      .find(query)
       .sort({ _id: -1 })
       .limit(limit + 1)
       .toArray();

src/resolvers/event.js

@@ -29,10 +29,10 @@ module.exports = {
      *
      * @return {RepetitionsPortion}
      */
-    async repetitionsPortion({ _id: eventId, projectId }, { limit, cursor }) {
+    async repetitionsPortion({ _id: eventId, projectId, originalEventId }, { limit, cursor }) {
       const factory = new EventsFactory(projectId);
 
-      return factory.getEventRepetitions(eventId, limit, cursor);
+      return factory.getEventRepetitions(eventId, originalEventId, limit, cursor);
     },
 
     /**