approve reject application

Author: moshfeu

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

@@ -1,23 +1,23 @@
-import { ObjectId } from 'mongodb';
 import type { Application } from '../modules/mentors/types';
 import type { UpsertResult } from './types';
 import { upsertEntityByCondition } from './utils';
 import { getCollection } from '../utils/db';
+import { ObjectId, type Filter, type MatchKeysAndValues } from 'mongodb';
 
-export const upsertApplication = async (userId: ObjectId): UpsertResult<Application> => {
-  const applicationPayload = {
-    user: userId,
-    status: 'pending',
+export const upsertApplication = async (application: MatchKeysAndValues<Application>): UpsertResult<Application> => {
+  const filter: Filter<Application> = {};
+  if (application._id) {
+    filter._id = new ObjectId(application._id);
   }
 
-  const { data: application, isNew } = await upsertEntityByCondition<Application>(
+  const { data: upsertedApplication, isNew } = await upsertEntityByCondition<Application>(
     'applications',
-    { user: userId, status: 'pending' },
-    applicationPayload
+    filter,
+    application,
   );
 
   return {
-    data: application,
+    data: upsertedApplication,
     isNew,
   };
 }
@@ -26,7 +26,7 @@ export const getApplications = async (status?: string): Promise<Application[]> =
   const collection = getCollection<Application>('applications');
   const filter: any = {};
   if (status) {
-    filter.status = status?.toUpperCase();
+    filter.status = status;
   }
 
   const pipeline = [

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

@@ -11,7 +11,7 @@ export const upsertEntityByCondition = async <T extends OptionalId<unknown>>(
   const collection = getCollection<T>(collectionName);
   const { value: upsertedEntity, lastErrorObject } = await collection.findOneAndUpdate(
     condition,
-    { $setOnInsert: entity },
+    { $set: entity },
     { upsert: true, returnDocument: 'after', includeResultMetadata: true }
   );
   const isNew = lastErrorObject?.updatedExisting === false;

netlify/functions-src/functions/hof/withRouter.ts

@@ -4,10 +4,17 @@ import { error } from '../utils/response';
 import type { ApiHandler, HttpMethod } from '../types';
 import { DataError } from '../data/errors';
 
-type Route = [pattern: string, HttpMethod, ApiHandler];
+type Route = [pattern: string, HttpMethod | HttpMethod[], ApiHandler];
 export type Routes = Route[];
 
-const findRouteByPath = (routes: Routes, path: string, httpMethod: string) => {
+const matchesHttpMethod = (allowedMethods: HttpMethod | HttpMethod[], requestMethod: HttpMethod): allowedMethods is HttpMethod => {
+  if (Array.isArray(allowedMethods)) {
+    return allowedMethods.includes(requestMethod);
+  }
+  return allowedMethods === requestMethod;
+}
+
+const findRouteByPath = (routes: Routes, path: string, httpMethod: HttpMethod) => {
   const matchedRoutes = routes.filter(([pattern]) => {
     const urlPattern = new UrlPattern(pattern);
     return urlPattern.match(path);
@@ -19,12 +26,14 @@ const findRouteByPath = (routes: Routes, path: string, httpMethod: string) => {
     case 1:
       const [matchedRoute] = matchedRoutes;
       const [, routeHttpMethod] = matchedRoute;
-      if (routeHttpMethod !== httpMethod) {
+      if (!matchesHttpMethod(routeHttpMethod, httpMethod)) {
         throw new DataError(405, 'Method not allowed');
       }
       return matchedRoute;
     default:
-      const route = matchedRoutes.find(([, HttpMethod]) => HttpMethod === httpMethod);
+      const route = matchedRoutes.find(
+        ([, routeHttpMethod]) => matchesHttpMethod(routeHttpMethod, httpMethod)
+      );
       if (!route) {
         throw new DataError(405, 'Method not allowed');
       }
@@ -49,7 +58,7 @@ export const withRouter = (routes: Routes): ApiHandler => {
   return async (event, context) => {
     try {
       const path = getAppPath(event.path);
-      const route = findRouteByPath(routes, path, event.httpMethod);
+      const route = findRouteByPath(routes, path, event.httpMethod as HttpMethod);
 
       const { handler, params } = getRouteData(route, path);
 
@@ -61,7 +70,12 @@ export const withRouter = (routes: Routes): ApiHandler => {
         }
       }
 
-      return await handler({ ...event, queryStringParameters: params }, context);
+      const queryStringParameters = {
+        ...event.queryStringParameters,
+        ...params,
+      };
+
+      return await handler({ ...event, queryStringParameters }, context);
     } catch (e) {
       console.error(e);
       if (e instanceof DataError) {

netlify/functions-src/functions/mentors.ts

@@ -5,12 +5,14 @@ import { withRouter } from './hof/withRouter';
 import { handler as getMentorsHanler } from './modules/mentors/get';
 import { handler as getApplicationsHandler } from './modules/mentors/applications/get';
 import { handler as upsertApplicationHandler } from './modules/mentors/applications/post';
+import { handler as updateApplicationHandler } from './modules/mentors/applications/put';
 import { Role } from './common/interfaces/user.interface';
 
 export const handler: ApiHandler = withDB(
   withRouter([
     ['/', 'GET', withAuth(getMentorsHanler, { authRequired: false })],
     ['/applications', 'GET', withAuth(getApplicationsHandler, { returnUser: true, role: Role.ADMIN })],
+    ['/applications/:applicationId', 'PUT', withAuth(updateApplicationHandler, { returnUser: true, role: Role.ADMIN })],
     ['/applications', 'POST', withAuth(upsertApplicationHandler, { returnUser: true, })],
     // TODO: find out if needed
     // ['/:userId/applications', 'GET', withAuth(getUserApplicationsHandler, { returnUser: true })],

netlify/functions-src/functions/modules/mentors/applications/post.ts

@@ -4,7 +4,12 @@ import type { ApiHandler } from '../../../types';
 import { success } from '../../../utils/response';
 import type { Application } from '../types';
 
-export const handler: ApiHandler<Application, User> = async (_event, context) => {
-  const { data, isNew } = await upsertApplication(context.user._id);
+export const handler: ApiHandler<Application, User> = async (event, context) => {
+  const application = event.parsedBody!;
+  const { data, isNew } = await upsertApplication({
+    ...application,
+    user: context.user._id,
+    status: 'Pending',
+  });
   return success({ data }, isNew ? 201 : 200);
 }

netlify/functions-src/functions/modules/mentors/applications/put.ts

@@ -0,0 +1,25 @@
+import { ObjectId } from 'mongodb';
+import type { User } from '../../../common/interfaces/user.interface';
+import { upsertApplication } from '../../../data/mentors';
+import type { ApiHandler } from '../../../types';
+import type { ApplicationStatus } from '../types';
+import { success } from '../../../utils/response';
+
+export const handler: ApiHandler<{ status: ApplicationStatus }, User> = async (event, context) => {
+  const { applicationId } = event.queryStringParameters || {};
+  const { status } = event.parsedBody || {};
+
+  if (!applicationId || !status) {
+    return { statusCode: 400, body: 'Bad request' };
+  }
+
+  const { data, isNew } = await upsertApplication({
+    _id: new ObjectId(applicationId),
+    status,
+  });
+
+  return success({
+    data,
+    isNew,
+  });
+}

netlify/functions-src/functions/modules/mentors/types.ts

@@ -13,12 +13,13 @@ export interface Mentor {
   avatar?: string
 }
 
+export type ApplicationStatus = 'Pending' | 'Approved' | 'Rejected';
 export type Application = OptionalId<{
   user: ObjectId;
-  status: string;
+  status: ApplicationStatus;
+  reason?: string;
 }>;
 
-
 export interface GetMentorsQuery {
   tags?: string | string[]
   country?: string

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

@@ -80,6 +80,7 @@ export function withAuth(handler: ApiHandler, options: {
       }
 
       // TODO: instead, set a custom prop on auth0 - is admin to save the call to the database and get it from the token
+      // TODO: combine these 2 getCurrentUser calls
       if (role) {
         const currentUser = await getCurrentUser(decodedToken.sub)
         if (!currentUser.roles.includes(role)) {

netlify/functions-src/mongo-scripts/approve-applications.mongodb.js

@@ -0,0 +1,15 @@
+// MongoDB Playground
+// Use Ctrl+Space inside a snippet or a string literal to trigger completions.
+
+const { stat } = require('fs');
+const { ObjectId } = require('mongodb');
+
+// The current database to use.
+use('codingcoach');
+
+// Create a new document in the collection.
+db.getCollection('applications').findOneAndUpdate(
+  {_id: new ObjectId('67e99efa8eb43562ce98b410')},
+  { $set: { status: 'Pending' } },
+  { returnDocument: 'after' }
+);

netlify/functions-src/mongo-scripts/get-panding-applications.mongodb.js

@@ -0,0 +1,10 @@
+// MongoDB Playground
+// Use Ctrl+Space inside a snippet or a string literal to trigger completions.
+
+const { stat } = require('fs');
+
+// The current database to use.
+use('codingcoach');
+
+// Create a new document in the collection.
+db.getCollection('applications').find({status: 'Pending'});