Merge branch 'development' into unitTestingForAuth

Author: jng34

.github/workflows/pr-instructions.yml

@@ -28,7 +28,7 @@ jobs:
           echo ${{ steps.instruction.outputs.result }} > addingPrInstructions/artifact/artifact.txt
       
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: adding-pr-instructions-artifact
           path: addingPrInstructions/artifact/

.gitignore

@@ -1,4 +1,8 @@
+# vscode dirs
+.devcontainer
+.vscode
 
+# project dirs and files
 node_modules/
 npm-debug.log
 .DS_Store

CONTRIBUTING.md

@@ -106,6 +106,22 @@ Note: Understanding how git remotes work will make collaborating much easier. Yo
 
 ### **2.3 Get up and running**
 
+1. Install [NVM (Node Version Manager)](https://github.com/nvm-sh/nvm). NVM allows you to easily manage and switch between multiple versions of Node.
+
+   - Verify the installation: `nvm --version`
+   - Once NVM is verified, run the following commands from the root of the project:
+
+   ```
+   # Install the project's Node version (specified in the .nvmrc file)
+   nvm install
+
+   # Instruct NVM to use the Node version defined in the .nvmrc file
+   nvm use
+
+   ```
+
+   > NOTE: If the major version of Node does not match the version specified in the .nvmrc file, you may need to be explicit with the version and use: `nvm install <version>` and `nvm use <version>`
+
 1. Have [Node](https://nodejs.org/en/download/) and NPM installed locally:
 
    - Verify with `node -v` and `npm -v` respectively.

VRMS

@@ -0,0 +1 @@
+Subproject commit 7042af0f43f0b034977c7f64c613e9d8b7199edb

backend/controllers/project.controller.js

@@ -130,4 +130,26 @@ ProjectController.bulkUpdateManagedByUsers = async function (req, res) {
   }
 };
 
+// Update onboard/offboard visibility for a project
+ProjectController.updateOnboardOffboardVisibility = async function (req, res) {
+  const { ProjectId } = req.params;
+  const { onboardOffboardVisible } = req.body;
+
+  try {
+    const project = await Project.findByIdAndUpdate(
+      ProjectId,
+      { onboardOffboardVisible },
+      { new: true }
+    );
+
+    if (!project) {
+      return res.status(404).send({ message: 'Project not found' });
+    }
+
+    return res.status(200).send(project);
+  } catch (err) {
+    return res.status(400).send({ message: 'Error updating visibility', error: err.message });
+  }
+};
+
 module.exports = ProjectController;

backend/models/project.model.js

@@ -16,49 +16,51 @@ Idea for the future: programmingLanguages, numberGithubContributions (pull these
 */
 
 const projectSchema = mongoose.Schema({
-    name: { type: String, trim: true },
-    description: { type: String, trim: true },
-    githubIdentifier: { type: String, trim: true },
-    projectStatus: { type: String },                    // Active, Completed, or Paused
-    location: { type: String, trim: true },                         // DTLA, Westside, South LA, or Remote (hacknight)
-    //teamMembers: { type: String },                    // commented since we should be able to get this from Project Team Members table
-    createdDate: { type: Date, default: Date.now },     // date/time project was created
-    completedDate: { type: Date },                      // only if Status = Completed, date/time completed
-    githubUrl: { type: String, trim: true },                        // link to main repo
-    slackUrl: { type: String, trim: true },                         // link to Slack channel
-    googleDriveUrl: { type: String, trim: true },
-    googleDriveId: { type: String },
-    hflaWebsiteUrl: { type: String, trim: true },
-    videoConferenceLink: { type: String },
-    lookingDescription: { type: String },               // narrative on what the project is looking for
-    recruitingCategories: [{ type: String }],           // same as global Skills picklist
-    partners: [{ type: String }],                       // any third-party partners on the project, e.g. City of LA
-    managedByUsers: [{ type: String }]                  // Which users may manage this project.                 
+  name: { type: String, trim: true },
+  description: { type: String, trim: true },
+  githubIdentifier: { type: String, trim: true },
+  projectStatus: { type: String }, // Active, Completed, or Paused
+  location: { type: String, trim: true }, // DTLA, Westside, South LA, or Remote (hacknight)
+  //teamMembers: { type: String },                    // commented since we should be able to get this from Project Team Members table
+  createdDate: { type: Date, default: Date.now }, // date/time project was created
+  completedDate: { type: Date }, // only if Status = Completed, date/time completed
+  githubUrl: { type: String, trim: true }, // link to main repo
+  slackUrl: { type: String, trim: true }, // link to Slack channel
+  googleDriveUrl: { type: String, trim: true },
+  googleDriveId: { type: String },
+  hflaWebsiteUrl: { type: String, trim: true },
+  videoConferenceLink: { type: String },
+  lookingDescription: { type: String }, // narrative on what the project is looking for
+  recruitingCategories: [{ type: String }], // same as global Skills picklist
+  partners: [{ type: String }], // any third-party partners on the project, e.g. City of LA
+  managedByUsers: [{ type: String }], // Which users may manage this project.
+  onboardOffboardVisible: { type: Boolean, default: true }, // Whether onboarding/offboarding forms are visible on the project page
 });
 
-projectSchema.methods.serialize = function() {
-    return {
-        id: this._id,
-        name: this.name,
-        description: this.description,
-        githubIdentifier: this.githubIdentifier,
-        // owner: this.owner,
-        projectStatus: this.projectStatus,
-        location: this.location,
-        //teamMembers: this.teamMembers,
-        createdDate: this.createdDate,
-        completedDate: this.completedDate,
-        githubUrl: this.githubUrl,
-        slackUrl: this.slackUrl,
-        googleDriveUrl: this.googleDriveUrl,
-        googleDriveId: this.googleDriveId,
-        hflaWebsiteUrl: this.hflaWebsiteUrl,
-        videoConferenceLink: this.videoConferenceLink,
-        lookingDescription: this.lookingDescription,
-        recruitingCategories: this.recruitingCategories,
-        partners: this.partners,
-        managedByUsers: this.managedByUsers
-    };
+projectSchema.methods.serialize = function () {
+  return {
+    id: this._id,
+    name: this.name,
+    description: this.description,
+    githubIdentifier: this.githubIdentifier,
+    // owner: this.owner,
+    projectStatus: this.projectStatus,
+    location: this.location,
+    //teamMembers: this.teamMembers,
+    createdDate: this.createdDate,
+    completedDate: this.completedDate,
+    githubUrl: this.githubUrl,
+    slackUrl: this.slackUrl,
+    googleDriveUrl: this.googleDriveUrl,
+    googleDriveId: this.googleDriveId,
+    hflaWebsiteUrl: this.hflaWebsiteUrl,
+    videoConferenceLink: this.videoConferenceLink,
+    lookingDescription: this.lookingDescription,
+    recruitingCategories: this.recruitingCategories,
+    partners: this.partners,
+    managedByUsers: this.managedByUsers,
+    onboardOffboardVisible: this.onboardOffboardVisible,
+  };
 };
 
 const Project = mongoose.model('Project', projectSchema);

backend/package.json

@@ -56,7 +56,7 @@
     "morgan": "^1.10.0",
     "node-cron": "^2.0.3",
     "node-fetch": "^2.6.7",
-    "nodemailer": "^6.6.1"
+    "nodemailer": "^7.0.11"
   },
   "directories": {
     "test": "test"

backend/routers/healthCheck.router.test.js

@@ -0,0 +1,42 @@
+// Mock the healthCheck controller
+jest.mock('../controllers/healthCheck.controller.js');
+
+// Import the healthCheck router and controller
+const healthCheck = require('./healthCheck.router.js');
+const { HealthCheckController } = require('../controllers');
+
+// Create a mock test server
+const express = require('express');
+const supertest = require('supertest');
+const testapp = express();
+testapp.use('/api/healthcheck', healthCheck);
+
+// Set up mock request for the controller
+const request = supertest(testapp);
+
+describe('Unit testing for Health Check Router', () => {
+  // Clear all mocks after each test
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('READ', () => {
+    it('should return status code 200 and message "I\'m Alive" with GET /api/healthcheck', async (done) => {
+      // Mock the controller method
+      HealthCheckController.isAlive.mockImplementationOnce((req, res) => {
+        res.status(200).send("I'm Alive!");
+      });
+
+      // Call GET API endpoint
+      const response = await request.get('/api/healthcheck');
+
+      // Test
+      expect(HealthCheckController.isAlive).toHaveBeenCalled();
+      expect(response.status).toBe(200);
+      expect(response.text).toBe("I'm Alive!");
+
+      // Marks completion of the test
+      done();
+    });
+  });
+});

backend/routers/projects.router.js

@@ -22,4 +22,7 @@ router.patch('/:ProjectId', AuthUtil.verifyCookie, ProjectController.updateManag
 // Bulk update for editing project members
 router.post('/bulk-updates', AuthUtil.verifyCookie, ProjectController.bulkUpdateManagedByUsers);
 
+// Update onboard/offboard visibility for a project
+router.patch('/:ProjectId/visibility', AuthUtil.verifyCookie, ProjectController.updateOnboardOffboardVisibility);
+
 module.exports = router;

backend/routers/users.router.test.js

@@ -130,7 +130,8 @@ describe('Unit Tests for userRouter', () => {
       done();
     });
 
-    it('should get a specific User by UserId with GET to /api/users/:UserId through UserController', async (done) => {
+    // @TODO: Fix failing test, require investigation. Please referece issue 2036
+    it.skip('should get a specific User by UserId with GET to /api/users/:UserId through UserController', async (done) => {
       //Mock the UserController function that this route calls with expected results
       UserController.user_by_id.mockImplementationOnce((req, res) => {
         return res.status(200).send(mockUser);