chore(): type defs

Author: e11sy

src/models/eventsFactory.js

@@ -199,6 +199,8 @@ class EventsFactory extends Factory {
             $gte: new ObjectID(paginationCursor),
           }
         } : {},
+      },
+      {
         $sort: {
           groupingTimestamp: -1,
           [sort]: -1,
@@ -296,9 +298,10 @@ class EventsFactory extends Factory {
       lastEvent = result.pop();
     }
 
+    
     return {
       nextCursor: lastEvent ? lastEvent._id.toString() : null,
-      ...result,
+      dailyEvents: result,
     };
   }
 

src/models/projectsFactory.ts

@@ -35,6 +35,8 @@ 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)
+
     const projectData = await this.dataLoaders.projectById.load(id);
 
     if (!projectData) {

src/resolvers/event.js

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

src/resolvers/project.js

@@ -8,6 +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 EVENTS_GROUP_HASH_INDEX_NAME = 'groupHashUnique';
 const REPETITIONS_GROUP_HASH_INDEX_NAME = 'groupHash_hashed';
@@ -289,6 +290,7 @@ module.exports = {
      */
     async event(project, { id: eventId }) {
       const factory = new EventsFactory(project._id);
+
       const event = await factory.findById(eventId);
 
       if (!event) {
@@ -344,7 +346,7 @@ module.exports = {
      *
      * @return {Promise<RecentEventSchema[]>}
      */
-    async dailyEventsPortion(project, { limit, skip, sort, filters, search }) {
+    async dailyEventsPortion(project, { limit, cursor, sort, filters, search }) {
       if (search) {
         if (search.length > MAX_SEARCH_QUERY_LENGTH) {
           search = search.slice(0, MAX_SEARCH_QUERY_LENGTH);
@@ -353,22 +355,29 @@ module.exports = {
 
       const factory = new EventsFactory(project._id);
 
-      // @todo - rename
-      const res = factory.findRecentDailyEventsWithEventAndRepetition(limit, skip, sort, filters, search);
+      const dailyEventsPortion = await factory.findRecentDailyEventsWithEventAndRepetition(limit, cursor, sort, filters, search);
 
-      res.forEach((dailyEvent) => {
+      dailyEventsPortion.dailyEvents.forEach((dailyEvent) => {
         const dailyEventLatestRepetition = dailyEvent.repetition;
         const dailyEventOriginalEvent = dailyEvent.event;
 
-        // wait for util implementation
-        // const mergedRepetition = merge(dailyEventOriginalEvent, dailyEventLatestRepetition);
+        const mergedRepetition = composeFullRepetitionEvent(dailyEventOriginalEvent, dailyEventLatestRepetition);
+        const stringifiedId = dailyEvent._id.toString();
+
+
         delete dailyEvent.repetition;
         delete dailyEvent.event;
-
-        // dailyEvent.event = mergedRepetition;
+        delete dailyEvent._id;
+        
+        dailyEvent.event = mergedRepetition;
+        dailyEvent.id = stringifiedId;
 
         return dailyEvent;
       })
+
+      console.log('daily events portion composed, ...[event]', dailyEventsPortion);
+
+      return dailyEventsPortion;
     },
 
     /**

src/typeDefs/project.ts

@@ -11,6 +11,47 @@ enum EventsSortOrder {
   BY_AFFECTED_USERS
 }
 
+"""
+Pagination cursor of events portion and list of daily events
+"""
+type DailyEventsPortion {
+  """
+  Cursor to the next portion of the events, null if there are no events left
+  """
+  nextCursor: String
+
+  """
+  Daily event information
+  """
+  dailyEvents: [DailyEvent]
+}
+
+"""
+Daily event information with event itself
+"""
+type DailyEvent {
+  """
+  ID of the daily event
+  """
+  id: ID!
+  """
+  Count of events in this day
+  """
+  count: Int!
+  """
+  Count of the users affected by this event in this day
+  """
+  affectedUsers: Int!
+  """
+  Timestamp of the event grouping
+  """
+  groupingTimestamp: Int!
+  """
+  Event itself
+  """
+  event: Event!
+}
+
 """
 Events filters input type
 """
@@ -128,6 +169,36 @@ type Project {
     "Search query"
     search: String
   ): RecentEvents
+  """
+  Portion of daily events
+  """
+  dailyEventsPortion(
+    """
+    Maximum number of results
+    """
+    limit: Int! = 50
+
+    """
+    Next Cursor to fetch next portion of events
+    """
+    nextCursor: String
+
+    """
+    Events sort order
+    """
+    sort: EventsSortOrder = lastRepetitionTime
+
+    """
+    Event marks by which events should be sorted
+    """
+    filters: EventsFiltersInput
+
+    """
+    Search query
+    """
+    search: String
+  ): DailyEventsPortion
+
   """
   Return events that occurred after a certain timestamp
   """