simplify

Author: slaveeks

src/dataLoaders.ts

@@ -106,6 +106,7 @@ export default class DataLoaders {
 
 /**
  * Create DataLoader for events in dynamic collections `events:<projectId>` stored in the events DB
+ *
  * @param eventsDb - MongoDB connection to the events database
  * @param projectId - project id used to pick a dynamic collection
  */

src/models/eventsFactory.js

@@ -96,7 +96,7 @@ class EventsFactory extends Factory {
     }
 
     this.projectId = projectId;
-    this.eventById = createProjectEventsByIdLoader(mongo.databases.events, this.projectId);
+    this.eventsDataLoader = createProjectEventsByIdLoader(mongo.databases.events, this.projectId);
   }
 
   /**
@@ -159,7 +159,7 @@ class EventsFactory extends Factory {
    * @returns {Event|null}
    */
   async findById(id) {
-    const searchResult = await this.eventById.load(id);
+    const searchResult = await this.eventsDataLoader.load(id);
 
     const event = searchResult ? new Event(searchResult) : null;
 
@@ -603,7 +603,7 @@ class EventsFactory extends Factory {
      * If originalEventId equals repetitionId than user wants to get first repetition which is original event
      */
     if (repetitionId === originalEventId) {
-      const originalEvent = await this.eventById.load(originalEventId);
+      const originalEvent = await this.eventsDataLoader.load(originalEventId);
 
       if (!originalEvent) {
         return null;
@@ -627,7 +627,7 @@ class EventsFactory extends Factory {
         _id: ObjectID(repetitionId),
       });
 
-    const originalEvent = await this.eventById.load(originalEventId);
+    const originalEvent = await this.eventsDataLoader.load(originalEventId);
 
     if (!originalEvent) {
       return null;
@@ -712,7 +712,7 @@ class EventsFactory extends Factory {
   async toggleEventMark(eventId, mark) {
     const collection = this.getCollection(this.TYPES.EVENTS);
 
-    const event = await this.eventsDataLoader.eventById.load(eventId);
+    const event = await this.eventsDataLoader.load(eventId);
 
     if (!event) {
       throw new Error(`Event not found for eventId: ${eventId}`);

src/resolvers/event.js

@@ -5,17 +5,17 @@ const sendPersonalNotification = require('../utils/personalNotifications').defau
 /**
  * Returns a per-request, per-project EventsFactory instance
  * Uses context.eventsFactoryCache to memoize by projectId
- * @param {any} context - GraphQL resolver context
- * @param {string|ObjectID} ctorProjectId - value passed to EventsFactory constructor
- * @param {string|ObjectID} keyProjectId - value used as cache key (string id is preferred)
- * @returns {EventsFactory}
+ *
+ * @param {ResolverContextBase} context - resolver context
+ * @param {string} projectId - project id to get EventsFactory instance for
+ * @returns {EventsFactory} - EventsFactory instance bound to a specific project object
  */
-function getEventsFactoryForProjectId(context, ctorProjectId, keyProjectId) {
+function getEventsFactoryForProjectId(context, projectId) {
   const cache = context.eventsFactoryCache || (context.eventsFactoryCache = new Map());
-  const cacheKey = (keyProjectId || ctorProjectId).toString();
+  const cacheKey = projectId.toString();
 
   if (!cache.has(cacheKey)) {
-    cache.set(cacheKey, new EventsFactory(ctorProjectId));
+    cache.set(cacheKey, new EventsFactory(projectId));
   }
 
   return cache.get(cacheKey);
@@ -49,7 +49,7 @@ module.exports = {
      * @return {RepetitionsPortion}
      */
     async repetitionsPortion({ projectId, originalEventId }, { limit, cursor }, context) {
-      const factory = getEventsFactoryForProjectId(context, projectId, projectId);
+      const factory = getEventsFactoryForProjectId(context, projectId);
 
       return factory.getEventRepetitions(originalEventId, limit, cursor);
     },
@@ -104,7 +104,7 @@ module.exports = {
      * @returns {Promise<ProjectChartItem[]>}
      */
     async chartData({ projectId, groupHash }, { days, timezoneOffset }, context) {
-      const factory = getEventsFactoryForProjectId(context, new ObjectID(projectId), projectId);
+      const factory = getEventsFactoryForProjectId(context, projectId);
 
       return factory.findChartData(days, timezoneOffset, groupHash);
     },
@@ -117,7 +117,7 @@ module.exports = {
      * @returns {Promise<Release>}
      */
     async release({ projectId, id: eventId }, _args, context) {
-      const factory = getEventsFactoryForProjectId(context, new ObjectID(projectId), projectId);
+      const factory = getEventsFactoryForProjectId(context, projectId);
       const release = await factory.getEventRelease(eventId);
 
       return release;
@@ -134,7 +134,7 @@ module.exports = {
      * @return {Promise<boolean>}
      */
     async visitEvent(_obj, { projectId, eventId }, { user, ...context }) {
-      const factory = getEventsFactoryForProjectId(context, projectId, projectId);
+      const factory = getEventsFactoryForProjectId(context, projectId);
 
       const { result } = await factory.visitEvent(eventId, user.id);
 
@@ -151,7 +151,7 @@ module.exports = {
      * @return {Promise<boolean>}
      */
     async toggleEventMark(_obj, { project, eventId, mark }, context) {
-      const factory = getEventsFactoryForProjectId(context, project, project);
+      const factory = getEventsFactoryForProjectId(context, project);
 
       const { result } = await factory.toggleEventMark(eventId, mark);
 
@@ -176,7 +176,7 @@ module.exports = {
      */
     async updateAssignee(_obj, { input }, { factories, user, ...context }) {
       const { projectId, eventId, assignee } = input;
-      const factory = getEventsFactoryForProjectId(context, projectId, projectId);
+      const factory = getEventsFactoryForProjectId(context, projectId);
 
       const userExists = await factories.usersFactory.findById(assignee);
 
@@ -227,7 +227,7 @@ module.exports = {
      */
     async removeAssignee(_obj, { input }, context) {
       const { projectId, eventId } = input;
-      const factory = getEventsFactoryForProjectId(context, projectId, projectId);
+      const factory = getEventsFactoryForProjectId(context, projectId);
 
       const { result } = await factory.updateAssignee(eventId, '');
 

src/resolvers/project.js

@@ -14,34 +14,28 @@ const REPETITIONS_GROUP_HASH_INDEX_NAME = 'groupHash_hashed';
 const REPETITIONS_USER_ID_INDEX_NAME = 'userId';
 const MAX_SEARCH_QUERY_LENGTH = 50;
 
-/**
- * Symbol key for memoizing per-project EventsFactory instance
- */
-const PROJECT_EVENTS_FACTORY = Symbol('PROJECT_EVENTS_FACTORY');
-
 /**
  * Returns a singleton EventsFactory instance bound to a specific project object.
- * Also mirrors the instance into request-scoped cache to share across nested resolvers.
- * @param {ProjectDBScheme|Object} project
- * @param {ResolverContextBase} context
- * @returns {EventsFactory}
+ * Uses request-scoped cache to share across nested resolvers.
+ *
+ * @param {ProjectDBScheme|Object} project - project instance to make a instance of EventsFactory
+ * @param {ResolverContextBase} context - resolver context
+ * @returns {EventsFactory} - EventsFactory instance bound to a specific project object
  */
 function getEventsFactoryForProject(project, context) {
-  if (!project[PROJECT_EVENTS_FACTORY]) {
-    const factory = new EventsFactory(project._id);
+  const cache = context && context.eventsFactoryCache;
+  const key = project._id.toString();
 
-    Object.defineProperty(project, PROJECT_EVENTS_FACTORY, {
-      value: factory,
-      enumerable: false,
-      configurable: false,
-    });
-
-    if (context && context.eventsFactoryCache) {
-      context.eventsFactoryCache.set(project._id.toString(), factory);
+  if (cache) {
+    if (!cache.has(key)) {
+      cache.set(key, new EventsFactory(project._id));
     }
+
+    return cache.get(key);
   }
 
-  return project[PROJECT_EVENTS_FACTORY];
+  // Fallback (shouldn't happen in normal resolver flow): return a fresh instance
+  return new EventsFactory(project._id);
 }
 
 /**