Admin User Details Angular Upgrade

service/src/models/event.d.ts

@@ -58,7 +58,6 @@ export type Callback<Result = unknown> = (err: Error | null, result?: Result, to
 export declare function count(options: TODO, callback: Callback<number>): void
 export declare function getEvents(options: TODO, callback: Callback<MageEventDocument[]>): void
 export declare function getById(id: MageEventId, options: TODO, callback: Callback<MageEventDocument | null>): void
-export declare function filterEventsByUserId(events: MageEventDocument[], userId: string, callback: Callback<MageEventDocument[]>): void
 export declare function create(event: MageEventCreateAttrs, user: Partial<UserDocument> & Pick<UserDocument, '_id'>, callback: Callback<MageEventDocument>): void
 export declare function addForm(eventId: MageEventId, form: any, callback: Callback<MageEventDocument>): void
 export declare function addLayer(event: MageEventDocument, layer: any, callback: Callback<MageEventDocument>): void

service/src/models/event.js

@@ -316,7 +316,7 @@ exports.count = function (options, callback) {
     conditions['$or'] = accesses;
   }
 
-  Event.count(conditions, function (err, count) {
+  Event.countDocuments(conditions, function (err, count) {
     callback(err, count);
   });
 };
@@ -354,48 +354,57 @@ exports.getEvents = async function (options, callback) {
     projection.teamIds = true;
   }
 
-  const totalCount = await Event.count(query).exec();
+  try {
+    const andClauses = [];
 
-  Event.find(query, projection, function (err, events) {
-    if (err) return callback(err);
+    const buildAccessClause = async (userId) => {
+      if (!userId) return null;
 
-    const filters = [];
+      const teamDocs = await Team.TeamModel.find({ userIds: { $in: [userId] } }, { _id: 1 }).lean();
+      const teamIdsForUser = teamDocs.map(t => t._id);
+      const readRoles = rolesWithPermission('read');
+      const aclKey = `acl.${userId.toString()}`;
+      return {
+        $or: [
+          { teamIds: { $in: teamIdsForUser } },
+          { [aclKey]: { $in: readRoles } }
+        ]
+      };
+    };
 
-    // First filter out events user cannot access
-    if (options.access && options.access.user) {
-      filters.push(function (done) {
-        filterEventsByUserId(events, options.access.user._id, function (err, filteredEvents) {
-          if (err) return done(err);
+    const accessUserId = options && options.access && options.access.user ? options.access.user._id : null;
+    const filterUserId = filter && filter.userId ? filter.userId : null;
 
-          events = filteredEvents;
-          done();
-        });
-      });
+    const [accessClause, filterClause] = await Promise.all([
+      buildAccessClause(accessUserId),
+      buildAccessClause(filterUserId)
+    ]);
+
+    if (accessClause) andClauses.push(accessClause);
+    if (filterClause) andClauses.push(filterClause);
+    if (andClauses.length) {
+      if (query.$and) {
+        query.$and = query.$and.concat(andClauses);
+      } else {
+        query.$and = andClauses;
+      }
     }
+  } catch (err) {
+    return callback(err);
+  }
 
-    // Filter again if filtering based on particular user
-    if (options.filter && options.filter.userId) {
-      filters.push(function (done) {
-        filterEventsByUserId(events, options.filter.userId, function (err, filteredEvents) {
-          if (err) return done(err);
+  const totalCount = await Event.countDocuments(query).exec();
 
-          events = filteredEvents;
-          done();
-        });
+  Event.find(query, projection, (err, events) => {
+    if (err) return callback(err);
+
+    if (options.populate) {
+      Event.populate(events, [{ path: 'teamIds' }, { path: 'layerIds' }], function (err, events) {
+        callback(err, events, totalCount);
       });
+    } else {
+      callback(null, events, totalCount);
     }
-
-    async.series(filters, function (err) {
-      if (err) return callback(err);
-
-      if (options.populate) {
-        Event.populate(events, [{ path: 'teamIds' }, { path: 'layerIds' }], function (err, events) {
-          callback(err, events, totalCount);
-        });
-      } else {
-        callback(null, events, totalCount);
-      }
-    });
   })
     .sort({ name: 1, _id: 1 })
     .limit(options.limit || 1000)
@@ -625,7 +634,7 @@ exports.getMembers = async function (eventId, options) {
 
     const includeTotalCount = typeof options.includeTotalCount === 'boolean' ? options.includeTotalCount : options.pageIndex === 0
     if (includeTotalCount) {
-      page.totalCount = await User.Model.count(params);
+      page.totalCount = await User.Model.countDocuments(params);
     }
 
     return page;
@@ -683,7 +692,7 @@ exports.getNonMembers = async function (eventId, options) {
 
     const includeTotalCount = typeof options.includeTotalCount === 'boolean' ? options.includeTotalCount : options.pageIndex === 0
     if (includeTotalCount) {
-      page.totalCount = await User.Model.count(params);
+      page.totalCount = await User.Model.countDocuments(params);
     }
 
     return page;
@@ -728,7 +737,7 @@ exports.getTeamsInEvent = async function (eventId, options) {
   };
   const includeTotalCount = typeof options.includeTotalCount === 'boolean' ? options.includeTotalCount : options.pageIndex === 0
   if (includeTotalCount) {
-    page.totalCount = await Team.TeamModel.count(params);
+    page.totalCount = await Team.TeamModel.countDocuments(params);
   }
   return page;
 };
@@ -766,7 +775,7 @@ exports.getTeamsNotInEvent = async function (eventId, options) {
 
   const includeTotalCount = typeof options.includeTotalCount === 'boolean' ? options.includeTotalCount : options.pageIndex === 0
   if (includeTotalCount) {
-    page.totalCount = await Team.TeamModel.count(params);
+    page.totalCount = await Team.TeamModel.countDocuments(params);
   }
 
   return page;

service/src/routes/events.ts

@@ -205,8 +205,9 @@ function EventRoutes(app: express.Application, security: { authentication: authe
         complete: req.parameters!.complete,
         teamId: req.query.teamId as string | undefined,
         excludeTeamId: req.query.excludeTeamId as string | undefined,
-        searchTerm: req.query.term as string | undefined
-      } as any
+        searchTerm: req.query.term as string | undefined,
+        userId: req.query.userId as string | undefined
+      };
       if (req.parameters!.userId) {
         filter.userId = req.parameters!.userId
       }