admin: get all mentorships

Author: moshfeu

netlify/functions-src/functions/common/interfaces/user.interface.ts

@@ -2,17 +2,18 @@ import type { ObjectId } from 'mongodb'
 
 export interface User {
   readonly _id: ObjectId;
-  available?: boolean
-  auth0Id: string
-  email: string
-  name: string
-  avatar?: string
-  roles: Role[]
-  country?: string
+  available?: boolean;
+  auth0Id: string;
+  email: string;
+  name: string;
+  avatar?: string;
+  roles: Role[];
+  country?: string;
   image?: {
-    filename: string
-  }
-  channels?: any[]
+    filename: string;
+  };
+  channels?: any[];
+  createdAt: Date;
 }
 
 export enum Role {

netlify/functions-src/functions/data/types.ts

@@ -1,5 +1,9 @@
 import type { OptionalId, WithId } from 'mongodb';
 
+export type BaseExistingEntity = WithId<{
+  createdAt: Date;
+}>
+
 type UpdateEntityPayload<T> = WithId<Partial<T>>;
 export type CreateEntityPayload<T> = OptionalId<T>;
 export type EntityPayload<T> = CreateEntityPayload<T> | UpdateEntityPayload<T>;

netlify/functions-src/functions/data/utils.ts

@@ -1,6 +1,6 @@
 import { ObjectId, type Filter, type MatchKeysAndValues, type OptionalId, type OptionalUnlessRequiredId, type WithId } from 'mongodb';
 import { getCollection } from '../utils/db';
-import type { CollectionName, EntityPayload, UpsertResult } from './types';
+import type { BaseExistingEntity, CollectionName, EntityPayload, UpsertResult } from './types';
 import { DataError } from './errors';
 
 export const upsertEntityByCondition = async <T extends OptionalId<unknown>>(
@@ -24,22 +24,28 @@ export const upsertEntityByCondition = async <T extends OptionalId<unknown>>(
   };
 }
 
-export async function upsertEntity<T extends WithId<unknown>>(collectionName: CollectionName, entity: EntityPayload<T>): Promise<WithId<T>> {
+export async function upsertEntity<T extends BaseExistingEntity>(collectionName: CollectionName, entity: EntityPayload<T>): Promise<WithId<T>> {
   const collection = getCollection<T>(collectionName);
   const { _id: entityId, ...entityData } = entity;
 
   if (entityId) {
     const updatedEntity = await collection.findOneAndUpdate(
       { _id: new ObjectId(entityId) as Filter<T> },
-      { $set: entityData as Partial<T> },
+      {
+        $set: entityData as Partial<T>,
+      },
       { returnDocument: "after" }
     );
     if (!updatedEntity) {
       throw new DataError(404, `${collectionName}: entitiy id: '${entity._id}' not found`);
     }
     return updatedEntity;
   } else {
-    const result = await collection.insertOne(entity as OptionalUnlessRequiredId<T>);
-    return { ...entity, _id: result.insertedId } as WithId<T>;
+    const entityPayload = {
+      ...entity as OptionalUnlessRequiredId<T>,
+      createdAt: new Date(),
+    };
+    const result = await collection.insertOne(entityPayload);
+    return { ...entityPayload, _id: result.insertedId } as WithId<T>;
   }
 }

netlify/functions-src/functions/mentorships.ts

@@ -1,13 +1,13 @@
-import type { Handler } from '@netlify/functions';
 import { withDB } from './hof/withDB';
 import { withAuth } from './utils/auth';
 import { withRouter } from './hof/withRouter';
 import { handler as mentorshipsRequestsHandler, updateRequestHandler } from './modules/mentorships/requests'
 import { handler as getAllMentorshipsHandler } from './modules/mentorships/get-all'
 import { handler as applyForMentorshipHandler } from './modules/mentorships/apply';
 import { Role } from './common/interfaces/user.interface';
+import type { ApiHandler } from './types';
 
-export const handler: Handler = withDB(
+export const handler: ApiHandler = withDB(
   withRouter([
     ['/', 'GET', withAuth(getAllMentorshipsHandler, { role: Role.ADMIN })],
     ['/:userId/requests', 'GET', withAuth(mentorshipsRequestsHandler)],

netlify/functions-src/functions/modules/mentorships/get-all.ts

@@ -18,7 +18,27 @@ const getMentorships = async (query: any): Promise<any[]> => {
     filter.createdAt = { $lte: new Date(query.to) };
   }
 
-  return mentorshipsCollection.find(filter).toArray();
+  return mentorshipsCollection.aggregate([
+    { $match: filter },
+    {
+      $lookup: {
+        from: 'users',
+        localField: 'mentor',
+        foreignField: '_id',
+        as: 'mentor'
+      }
+    },
+    {
+      $lookup: {
+        from: 'users',
+        localField: 'mentee',
+        foreignField: '_id',
+        as: 'mentee'
+      }
+    },
+    { $unwind: { path: '$mentor' } },
+    { $unwind: { path: '$mentee' } }
+  ]).toArray();
 };
 
 const getAllMentorshipsHandler = async (event: HandlerEvent) => {

netlify/functions-src/functions/modules/mentorships/requests.ts

@@ -68,25 +68,8 @@ const getMentorships = async (query: Record<string, string | undefined>): Promis
             userId
           ]
         },
-        // Add createdAt field derived from _id.getTimestamp()
-        createdAt: { $toDate: "$_id" }
       }
     },
-    {
-      $project: {
-        // Include all original fields from the mentorship
-        _id: 1,
-        mentor: 1,
-        mentee: 1,
-        status: 1,
-        createdAt: 1, // Include the derived createdAt field
-        updatedAt: 1,
-        message: 1,
-        background: 1,
-        expectation: 1,
-        isMine: 1
-      }
-    }
   ]).toArray();
 };
 
@@ -104,7 +87,7 @@ const updateMentorshipHandler = async (event: HandlerEventWithBody<Partial<Mento
       reason,
     };
     const upsertedMentorship = await upsertMentorship(mentorshipToUpsert);
-    return success({ mentorship: upsertedMentorship });
+    return success({ data: upsertedMentorship });
   } catch (e) {
     if (e instanceof DataError) {
       return error(e.message, e.statusCode);

netlify/functions-src/mongo-scripts/update-mentorship.mongodb.js

@@ -11,7 +11,7 @@ use('codingcoach');
 //   { _id: new ObjectId('67e049568a3938d0aac4a216') },
 // );
 db.getCollection('mentorships').updateOne(
-  { _id: new ObjectId('67e140e3bcacb881b788c9eb') },
+  { _id: new ObjectId('67e9a7023ce1a19ad81bd5b7') },
   {
     $set: {
       status: 'New',

src/Me/MentorshipRequests/MentorshipRequests.js

@@ -90,7 +90,7 @@ const MentorshipReq = () => {
     reason,
     listType = 'mentor'
   ) => {
-    const { success, mentorship } = await api.updateMentorshipReqStatus(
+    const { success, data: mentorship } = await api.updateMentorshipReqStatus(
       _id,
       userId,
       {

src/api/admin.ts

@@ -4,7 +4,7 @@ import { MentorshipRequest, UserRecord } from '../types/models';
 export function getAllMentorshipRequests(apiService: ApiService, numMonthAgo: number = 1) {
   const monthAgo = new Date();
   monthAgo.setMonth(monthAgo.getMonth() - numMonthAgo);
-  return apiService.makeApiCall<MentorshipRequest[]>(`${paths.MENTORSHIP}/requests`, {
+  return apiService.makeApiCall<MentorshipRequest[]>(`${paths.MENTORSHIP}`, {
     from: monthAgo,
   });
 }