chore(): clean up

Author: e11sy

src/models/eventsFactory.js

@@ -149,7 +149,7 @@ class EventsFactory extends Factory {
    * Returns events that grouped by day
    *
    * @param {Number} limit - events count limitations
-   * @param {String} paginatoinCursor - pointer to the first daily event to be selected
+   * @param {String} paginationCursor - pointer to the first daily event to be selected
    * @param {'BY_DATE' | 'BY_COUNT'} sort - events sort order
    * @param {EventsFilters} filters - marks by which events should be filtered
    * @param {String} search - Search query
@@ -158,7 +158,7 @@ class EventsFactory extends Factory {
    */
   async findRecentDailyEventsWithEventAndRepetition(
     limit = 10,
-    paginationCursor = '',
+    paginationCursor = null,
     sort = 'BY_DATE',
     filters = {},
     search = ''
@@ -197,8 +197,8 @@ class EventsFactory extends Factory {
       {
         $match: paginationCursor ? {
           _id: {
-            $gte: new ObjectID(paginationCursor),
-          }
+            $lte: new ObjectID(paginationCursor),
+          },
         } : {},
       },
       {
@@ -266,7 +266,7 @@ class EventsFactory extends Factory {
           localField: 'lastRepetitionId',
           foreignField: '_id',
           as: 'repetition',
-        }
+        },
       },
       /**
        * Desctruct event and repetition arrays since there are only one document in both arrays
@@ -293,32 +293,23 @@ class EventsFactory extends Factory {
 
     const result = await cursor.toArray();
 
-    let lastEvent;
-
-    if (result.length === limit + 1) {
-      lastEvent = result.pop();
-    }
+    const nextCursor = result.pop()._id;
 
     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,
+      nextCursor: nextCursor,
       dailyEvents: composedResult,
     };
   }
@@ -696,7 +687,7 @@ class EventsFactory extends Factory {
         _id: new ObjectID(eventId),
       });
 
-    console.log('repetition found', repetition)
+    console.log('repetition found', repetition);
 
     /**
      * If repetition is not found by eventId, try to find it by eventId
@@ -707,14 +698,14 @@ class EventsFactory extends Factory {
           _id: new ObjectID(eventId),
         });
 
-        console.log('no repetition found, fetched by original event id', originalEvent);
+      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);
+      console.log('repetition found, fetched by groupHash', originalEvent);
     }
 
     return originalEvent;

src/models/projectsFactory.ts

@@ -35,7 +35,7 @@ export default class ProjectsFactory extends AbstractModelFactory<ProjectDBSchem
    * @param id - user id
    */
   public async findById(id: string): Promise<ProjectModel | null> {
-    console.log('id in data loader', id)
+    console.log('id in data loader', id);
 
     const projectData = await this.dataLoaders.projectById.load(id);
 

src/resolvers/event.js

@@ -44,7 +44,7 @@ module.exports = {
      * @return {Promise<UserModel[]> | null}
      */
     async visitedBy({ visitedBy, projectId }, _args, { factories, user }) {
-      console.log('visitedBy, projectId', visitedBy, projectId)
+      console.log('visitedBy, projectId', visitedBy, projectId);
 
       /**
        * Crutch for Demo Workspace

src/resolvers/project.js

@@ -8,7 +8,6 @@ const EventsFactory = require('../models/eventsFactory');
 const ProjectToWorkspace = require('../models/projectToWorkspace');
 const { dateFromObjectId } = require('../utils/dates');
 const ProjectModel = require('../models/project').default;
-const { composeEventPayloadWithRepetition } = require('../utils/merge');
 
 const EVENTS_GROUP_HASH_INDEX_NAME = 'groupHashUnique';
 const REPETITIONS_GROUP_HASH_INDEX_NAME = 'groupHash_hashed';
@@ -356,10 +355,6 @@ module.exports = {
 
       const dailyEventsPortion = await factory.findRecentDailyEventsWithEventAndRepetition(limit, nextCursor, sort, filters, search);
 
-      console.log('daily events portion composed, ...[event]', dailyEventsPortion);
-
-      // this.dailyEventsPortion.dailyEvents.forEach(dailyEvent)
-
       return dailyEventsPortion;
     },