fix(): fix visitedBy issue

Author: e11sy

src/models/eventsFactory.js

@@ -299,10 +299,27 @@ class EventsFactory extends Factory {
       lastEvent = result.pop();
     }
 
+    const composedResult = result.map(dailyEvent => {
+      const repetition = dailyEvent.repetition;
+      const event = dailyEvent.event;
+
+      console.log('current projectId is ', this.projectId);
+
+      return {
+        ...dailyEvent,
+        id: dailyEvent._id.toString(),
+        _id: undefined,
+        event: this._composeEventWithRepetition(event, repetition),
+        repetition: undefined,
+      }
+    })
+
+    console.log('result', composedResult)
+
 
     return {
       nextCursor: lastEvent ? lastEvent._id.toString() : null,
-      dailyEvents: result,
+      dailyEvents: composedResult,
     };
   }
 
@@ -679,6 +696,8 @@ class EventsFactory extends Factory {
         _id: new ObjectID(eventId),
       });
 
+    console.log('repetition found', repetition)
+
     /**
      * If repetition is not found by eventId, try to find it by eventId
      */
@@ -687,11 +706,15 @@ class EventsFactory extends Factory {
         .findOne({
           _id: new ObjectID(eventId),
         });
+
+        console.log('no repetition found, fetched by original event id', originalEvent);
     } else {
       originalEvent = await this.getCollection(this.TYPES.EVENTS)
         .findOne({
           groupHash: repetition.groupHash,
         });
+
+        console.log('repetition found, fetched by groupHash', originalEvent);
     }
 
     return originalEvent;
@@ -711,6 +734,7 @@ class EventsFactory extends Factory {
       firstAppearanceTimestamp: event.timestamp,
       timestamp: repetition.timestamp,
       payload: composeEventPayloadWithRepetition(event.payload, repetition),
+      projectId: this.projectId,
     };
   }
 }

src/resolvers/event.js

@@ -112,15 +112,15 @@ module.exports = {
      * Mark event as visited for current user
      *
      * @param {ResolverObj} _obj - resolver context
-     * @param {string} project - project id
-     * @param {string} id - event id
+     * @param {string} projectId - project id
+     * @param {string} eventId - event id
      * @param {UserInContext} user - user context
      * @return {Promise<boolean>}
      */
-    async visitEvent(_obj, { project, id }, { user }) {
-      const factory = new EventsFactory(project);
+    async visitEvent(_obj, { projectId, eventId }, { user }) {
+      const factory = new EventsFactory(projectId);
 
-      const { result } = await factory.visitEvent(id, user.id);
+      const { result } = await factory.visitEvent(eventId, user.id);
 
       return !!result.ok;
     },

src/resolvers/project.js

@@ -8,7 +8,7 @@ const EventsFactory = require('../models/eventsFactory');
 const ProjectToWorkspace = require('../models/projectToWorkspace');
 const { dateFromObjectId } = require('../utils/dates');
 const ProjectModel = require('../models/project').default;
-const { composeFullRepetitionEvent } = require('../utils/merge');
+const { composeEventPayloadWithRepetition } = require('../utils/merge');
 
 const EVENTS_GROUP_HASH_INDEX_NAME = 'groupHashUnique';
 const REPETITIONS_GROUP_HASH_INDEX_NAME = 'groupHash_hashed';
@@ -356,25 +356,9 @@ module.exports = {
 
       const dailyEventsPortion = await factory.findRecentDailyEventsWithEventAndRepetition(limit, nextCursor, sort, filters, search);
 
-      dailyEventsPortion.dailyEvents.forEach((dailyEvent) => {
-        const dailyEventLatestRepetition = dailyEvent.repetition;
-        const dailyEventOriginalEvent = dailyEvent.event;
+      console.log('daily events portion composed, ...[event]', dailyEventsPortion);
 
-        const mergedRepetition = composeFullRepetitionEvent(dailyEventOriginalEvent, dailyEventLatestRepetition);
-        const stringifiedId = dailyEvent._id.toString();
-        mergedRepetition.firstAppearanceTimestamp = dailyEvent.event.timestamp;
-
-        delete dailyEvent.repetition;
-        delete dailyEvent.event;
-        delete dailyEvent._id;
-        
-        dailyEvent.event = mergedRepetition;
-        dailyEvent.id = stringifiedId;
-
-        return dailyEvent;
-      })
-
-      console.log('daily events portion composed, ...[event]', dailyEventsPortion.dailyEvents[0].event);
+      // this.dailyEventsPortion.dailyEvents.forEach(dailyEvent)
 
       return dailyEventsPortion;
     },

src/typeDefs/event.ts

@@ -53,7 +53,7 @@ type Release {
   """
   Release commits
   """
-  commits: [Commit!]!
+  commits: [Commit]
 }
 
 """