imp(): get rid of event id in repetitionsPortion

Author: e11sy

src/models/eventsFactory.js

@@ -149,7 +149,9 @@ class EventsFactory extends Factory {
         _id: new ObjectID(id),
       });
 
-    return searchResult ? new Event(searchResult) : null;
+    const event = searchResult ? new Event(searchResult) : null;
+
+    return event
   }
 
   /**
@@ -442,7 +444,7 @@ class EventsFactory extends Factory {
    *
    * @return {EventRepetitionsPortionSchema}
    */
-  async getEventRepetitions(eventId, originalEventId, limit = 10, cursor = null) {
+  async getEventRepetitions(originalEventId, limit = 10, cursor = null) {
     limit = this.validateLimit(limit);
 
     cursor = cursor ? new ObjectID(cursor) : null;
@@ -536,6 +538,11 @@ class EventsFactory extends Factory {
           _id: ObjectID(originalEventId),
         });
 
+      /**
+       * All events have same type with originalEvent id
+       */
+      originalEvent.originalEventId = originalEventId;
+
       return originalEvent || null;
     }
 

src/resolvers/event.js

@@ -22,17 +22,17 @@ module.exports = {
     /**
      * Returns repetitions portion of the event
      *
-     * @param {String} eventId - id of the event got from the partent graph node (event)
      * @param {String} projectId - id of the project got from the parent node (event)
+     * @param {String} originalEventId - id of the original event of the repetitions to get, got from parent node (event)
      * @param {Number} limit - argument of the query, maximal count of the repetitions in one portion
      * @param {Number|null} cursor - pointer to the next portion of repetition, could be null if we want to get first portion
      *
      * @return {RepetitionsPortion}
      */
-    async repetitionsPortion({ _id: eventId, projectId, originalEventId }, { limit, cursor }) {
+    async repetitionsPortion({ projectId, originalEventId}, { limit, cursor }) {
       const factory = new EventsFactory(projectId);
 
-      return factory.getEventRepetitions(eventId, originalEventId, limit, cursor);
+      return factory.getEventRepetitions(originalEventId, limit, cursor);
     },
 
     /**

src/resolvers/project.js

@@ -289,9 +289,13 @@ module.exports = {
      * @returns {EventRepetitionSchema}
      */
     async event(project, { eventId: repetitionId, originalEventId }) {
+      console.log(`event resolver in project: ${repetitionId}, ${originalEventId}`)
+
       const factory = new EventsFactory(project._id);
       const repetition = await factory.getEventRepetition(repetitionId, originalEventId);
 
+      console.log('repetition', repetition)
+
       if (!repetition) {
         return null;
       }