Onboarding Improvement

src/backend/src/controllers/calendar.controllers.ts

@@ -139,13 +139,14 @@ export default class CalendarController {
 
   static async createCalendar(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, description, colorHexCode } = req.body;
+      const { name, description, colorHexCode, isNewMemberCalendar } = req.body;
 
       const calendar = await CalendarService.createCalendar(
         req.currentUser,
         name,
         description,
         colorHexCode,
+        isNewMemberCalendar,
         req.organization
       );
 
@@ -158,14 +159,15 @@ export default class CalendarController {
   static async editCalendar(req: Request, res: Response, next: NextFunction) {
     try {
       const { calendarId } = req.params as Record<string, string>;
-      const { name, colorHexCode, description } = req.body;
+      const { name, colorHexCode, description, isNewMemberCalendar } = req.body;
 
       const updatedCalendar = await CalendarService.editCalendar(
         req.currentUser,
         calendarId,
         name,
         description,
         colorHexCode,
+        isNewMemberCalendar,
         req.organization
       );
 
@@ -175,6 +177,15 @@ export default class CalendarController {
     }
   }
 
+  static async getNewMemberEvents(req: Request, res: Response, next: NextFunction) {
+    try {
+      const events = await CalendarService.getNewMemberEvents(req.organization);
+      res.status(200).json(events);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async deleteCalendar(req: Request, res: Response, next: NextFunction) {
     try {
       const { calendarId } = req.params as Record<string, string>;

src/backend/src/controllers/organizations.controllers.ts

@@ -125,31 +125,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async setNewMemberImage(req: Request, res: Response, next: NextFunction) {
-    try {
-      if (!req.file) {
-        throw new HttpException(400, 'Invalid or undefined image data');
-      }
-
-      const updatedOrg = await OrganizationsService.setNewMemberImage(req.file, req.currentUser, req.organization);
-
-      res.status(200).json(updatedOrg);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
-  static async getOrganizationNewMemberImage(req: Request, res: Response, next: NextFunction) {
-    try {
-      const { organization } = req;
-
-      const newMemberImageId = await OrganizationsService.getNewMemberImage(organization.organizationId);
-      res.status(200).json(newMemberImageId);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async setOrganizationDescription(req: Request, res: Response, next: NextFunction) {
     try {
       const updatedOrg = await OrganizationsService.setOrganizationDescription(

src/backend/src/controllers/part-review.controllers.ts

@@ -1,5 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
 import PartReviewService from '../services/part-review.services.js';
+import RecruitmentServices from '../services/recruitment.services.js';
 import { WbsNumber, validateWBS } from 'shared';
 import { HttpException } from '../utils/errors.utils.js';
 
@@ -255,7 +256,15 @@ export default class PartReviewController {
   static async createFaq(req: Request, res: Response, next: NextFunction) {
     try {
       const { question, answer } = req.body;
-      const faq = await PartReviewService.createFaq(question, answer, req.currentUser, req.organization.organizationId);
+      const faq = await RecruitmentServices.createOrganizationFaq(
+        req.currentUser,
+        question,
+        answer,
+        req.organization,
+        false,
+        false,
+        true
+      );
       res.status(200).json(faq);
     } catch (error: unknown) {
       next(error);

src/backend/src/controllers/projects.controllers.ts

@@ -183,15 +183,17 @@ export default class ProjectsController {
 
   static async createLinkType(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, iconName, required, isOnGuestHomePage } = req.body;
+      const { name, iconName, required, isOnGuestHomePage, isOnNewMemberDashboard, isOnOnboardingDashboard } = req.body;
 
       const newLinkType = await ProjectsService.createLinkType(
         req.currentUser,
         name,
         iconName,
         required,
         req.organization,
-        isOnGuestHomePage
+        isOnGuestHomePage,
+        isOnNewMemberDashboard,
+        isOnOnboardingDashboard
       );
       res.status(200).json(newLinkType);
     } catch (error: unknown) {
@@ -469,14 +471,23 @@ export default class ProjectsController {
   static async editLinkType(req: Request, res: Response, next: NextFunction) {
     try {
       const { linkTypeName } = req.params as Record<string, string>;
-      const { name: newName, iconName, required, isOnGuestHomePage } = req.body;
+      const {
+        name: newName,
+        iconName,
+        required,
+        isOnGuestHomePage,
+        isOnNewMemberDashboard,
+        isOnOnboardingDashboard
+      } = req.body;
       const linkTypeUpdated = await ProjectsService.editLinkType(
         linkTypeName,
         iconName,
         required,
         req.currentUser,
         req.organization,
         isOnGuestHomePage,
+        isOnNewMemberDashboard,
+        isOnOnboardingDashboard,
         newName
       );
       res.status(200).json(linkTypeUpdated);

src/backend/src/controllers/recruitment.controllers.ts

@@ -11,15 +11,34 @@ export default class RecruitmentController {
     }
   }
 
+  static async getNewMemberMilestones(req: Request, res: Response, next: NextFunction) {
+    try {
+      const newMemberMilestones = await RecruitmentServices.getNewMemberMilestones(req.organization);
+      res.status(200).json(newMemberMilestones);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getRecruitingMilestones(req: Request, res: Response, next: NextFunction) {
+    try {
+      const recruitingMilestones = await RecruitmentServices.getRecruitingMilestones(req.organization);
+      res.status(200).json(recruitingMilestones);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createMilestone(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, description, dateOfEvent } = req.body;
+      const { name, description, dateOfEvent, isOnNewMemberDashboard, isOnRecruitingDashboard } = req.body;
 
       const milestone = await RecruitmentServices.createMilestone(
         req.currentUser,
         name,
         description,
         dateOfEvent,
+        { isOnNewMemberDashboard, isOnRecruitingDashboard },
         req.organization
       );
       res.status(200).json(milestone);
@@ -57,19 +76,66 @@ export default class RecruitmentController {
     }
   }
 
+  // TODO rename this method throughout stack
+  // Changed scope of getAllOrganizationFaqs to include part review, so what this call really wants is
+  // recruiting FAQs, but I'll change this as part of actual work not schema changes
   static async getAllOrganizationFaqs(req: Request, res: Response, next: NextFunction) {
     try {
-      const allFaqs = await RecruitmentServices.getAllOrganizationFaqs(req.organization);
+      const allFaqs = await RecruitmentServices.getRecruitingFaqs(req.organization);
       res.status(200).json(allFaqs);
     } catch (error: unknown) {
       next(error);
     }
   }
 
-  static async createOrganizationFaq(req: Request, res: Response, next: NextFunction) {
+  static async getRecruitingFaqs(req: Request, res: Response, next: NextFunction) {
+    try {
+      const faqs = await RecruitmentServices.getRecruitingFaqs(req.organization);
+      res.status(200).json(faqs);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getNewMemberFaqs(req: Request, res: Response, next: NextFunction) {
+    try {
+      const faqs = await RecruitmentServices.getNewMemberFaqs(req.organization);
+      res.status(200).json(faqs);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createRecruitingFaq(req: Request, res: Response, next: NextFunction) {
     try {
       const { question, answer } = req.body;
-      const faq = await RecruitmentServices.createOrganizationFaq(req.currentUser, question, answer, req.organization);
+      const faq = await RecruitmentServices.createOrganizationFaq(
+        req.currentUser,
+        question,
+        answer,
+        req.organization,
+        true,
+        false,
+        false
+      );
+      res.status(200).json(faq);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createNewMemberFaq(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { question, answer } = req.body;
+      const faq = await RecruitmentServices.createOrganizationFaq(
+        req.currentUser,
+        question,
+        answer,
+        req.organization,
+        false,
+        true,
+        false
+      );
       res.status(200).json(faq);
     } catch (error: unknown) {
       next(error);

src/backend/src/controllers/slack.controllers.ts

@@ -3,7 +3,8 @@ import OrganizationsService from '../services/organizations.services.js';
 import SlackServices, {
   SlackBlockActionBody,
   SaboSubmissionActionValue,
-  CrApprovalActionValue
+  CrApprovalActionValue,
+  TeamJoinRequestApprovalActionValue
 } from '../services/slack.services.js';
 import { tryParseJson } from '../utils/slack.utils.js';
 
@@ -129,4 +130,49 @@ export default class SlackController {
       throw error;
     }
   }
+
+  /**
+   * Handles the Slack block action for approving a team join request.
+   * Unlike handleApproveCRAction, all error reporting goes through respond() rather than
+   * replyToMessageInThread -- team join request notifications are sent as fresh (non-threaded)
+   * ephemerals, so there's no reliable message thread to reply into.
+   *
+   * @param body The validated Slack block action body (general structure validated in routes)
+   * @param respond Bolt response callback bound to this interaction's response_url
+   */
+  static async handleApproveTeamJoinRequestAction(
+    body: SlackBlockActionBody,
+    respond: (msg: {
+      response_type?: 'ephemeral';
+      text?: string;
+      replace_original?: boolean;
+      delete_original?: boolean;
+    }) => Promise<unknown>
+  ) {
+    const { user, actions } = body;
+    const [firstAction] = actions;
+
+    const parsed = tryParseJson<TeamJoinRequestApprovalActionValue>(firstAction.value);
+    if (!parsed.ok) {
+      await respond({
+        response_type: 'ephemeral',
+        text: `❌ An error occurred: Invalid action data format.\n\n*Error:* ${parsed.error}`
+      });
+      return;
+    }
+    const actionValue = parsed.data;
+
+    if (!actionValue.teamJoinRequestId || typeof actionValue.teamJoinRequestId !== 'string') {
+      await respond({
+        response_type: 'ephemeral',
+        text: `❌ An error occurred: Missing or invalid team join request ID.`
+      });
+      return;
+    }
+
+    const userSlackId = user.id;
+    const { teamJoinRequestId } = actionValue;
+
+    await SlackServices.handleApproveTeamJoinRequestAction(userSlackId, teamJoinRequestId, respond);
+  }
 }

src/backend/src/controllers/teams.controllers.ts

@@ -149,6 +149,55 @@ export default class TeamsController {
     }
   }
 
+  static async createTeamJoinRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamId } = req.params as Record<string, string>;
+
+      const request = await TeamsService.createTeamJoinRequest(req.currentUser, teamId, req.organization);
+      res.status(200).json(request);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getMyTeamJoinRequests(req: Request, res: Response, next: NextFunction) {
+    try {
+      const requests = await TeamsService.getMyTeamJoinRequests(req.currentUser, req.organization);
+      res.status(200).json(requests);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getPendingTeamJoinRequests(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamId } = req.params as Record<string, string>;
+
+      const requests = await TeamsService.getPendingTeamJoinRequests(teamId, req.currentUser, req.organization);
+      res.status(200).json(requests);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async reviewTeamJoinRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamJoinRequestId } = req.params as Record<string, string>;
+      const { approved, denialReason } = req.body;
+
+      const request = await TeamsService.reviewTeamJoinRequest(
+        req.currentUser,
+        teamJoinRequestId,
+        approved,
+        denialReason,
+        req.organization
+      );
+      res.status(200).json(request);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async deleteTeam(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params as Record<string, string>;