revevert factory changes

Author: slaveeks

src/models/eventsFactory.js

@@ -1,5 +1,4 @@
 import { getMidnightWithTimezoneOffset, getUTCMidnight } from '../utils/dates';
-import { composeFullRepetitionEvent } from '../utils/merge';
 import { groupBy } from '../utils/grouper';
 import safe from 'safe-regex';
 
@@ -423,14 +422,6 @@ class EventsFactory extends Factory {
       .skip(skip)
       .toArray();
 
-    repetitions.forEach(repetition => {
-      repetition.payload = composeFullRepetitionEvent(eventOriginal, repetition).payload;
-
-      if ('delta' in repetition) {
-        delete repetition.delta;
-      }
-    });
-
     const isLastPortion = repetitions.length < limit && skip === 0;
 
     /**
@@ -464,30 +455,10 @@ class EventsFactory extends Factory {
    * @todo move to Repetitions(?) model
    */
   async getEventRepetition(repetitionId) {
-    const repetition = await this.getCollection(this.TYPES.REPETITIONS)
+    return this.getCollection(this.TYPES.REPETITIONS)
       .findOne({
-        _id: ObjectID(repetitionId),
+        _id: new ObjectID(repetitionId),
       });
-
-    if (!repetition) {
-      return null;
-    }
-
-    const event = await this.findOneByQuery({
-      groupHash: repetition.groupHash,
-    });
-
-    if (!event) {
-      return null;
-    }
-
-    repetition.payload = composeFullRepetitionEvent(event, repetition).payload;
-
-    if ('delta' in repetition) {
-      delete repetition.delta;
-    }
-
-    return repetition;
   }
 
   /**
@@ -498,6 +469,10 @@ class EventsFactory extends Factory {
   async getEventLastRepetition(eventId) {
     const repetitions = await this.getEventRepetitions(eventId, 1);
 
+    if (repetitions.length === 0) {
+      return null;
+    }
+
     return repetitions.shift();
   }
 

src/typeDefs/event.ts

@@ -255,6 +255,12 @@ type Repetition {
   """
   payload: RepetitionPayload
 
+  """
+  Delta of the event's payload, stringified JSON
+  """
+  delta: String
+
+
   """
   Event timestamp
   """