Merge branch 'development' into fix/recurring-checkin-bulk

Author: trillium

.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

@@ -1,4 +1,5 @@
 const { Project, User } = require('../models');
+const { ObjectId } = require('mongodb');
 
 const ProjectController = {};
 
@@ -87,11 +88,11 @@ ProjectController.updateManagedByUsers = async function (req, res) {
       managedProjects = managedProjects.filter((id) => id !== ProjectId);
     }
 
-    // Update project's managedByUsers 
+    // Update project's managedByUsers
     project.managedByUsers = managedByUsers;
     await project.save({ validateBeforeSave: false });
 
-    // Update user's managedProjects 
+    // Update user's managedProjects
     user.managedProjects = managedProjects;
     await user.save({ validateBeforeSave: false });
 
@@ -102,4 +103,53 @@ ProjectController.updateManagedByUsers = async function (req, res) {
   }
 };
 
+ProjectController.bulkUpdateManagedByUsers = async function (req, res) {
+  const { bulkOps } = req.body;
+
+  // Convert string IDs to ObjectId in bulkOps
+  bulkOps.forEach((op) => {
+    if (op?.updateOne?.filter._id) {
+      op.updateOne.filter._id = ObjectId(op.updateOne.filter._id);
+    }
+    if (op?.updateOne?.update) {
+      const update = op.updateOne.update;
+      if (update?.$addToSet?.managedByUsers) {
+        update.$addToSet.managedByUsers = ObjectId(update.$addToSet.managedByUsers);
+      }
+      if (update?.$pull?.managedByUsers) {
+        update.$pull.managedByUsers = ObjectId(update.$pull.managedByUsers);
+      }
+    }
+  });
+
+  try {
+    const result = await Project.bulkWrite(bulkOps);
+    res.status(200).json(result);
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+};
+
+// 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/controllers/user.controller.js

@@ -1,4 +1,5 @@
 const jwt = require('jsonwebtoken');
+const { ObjectId } = require('mongodb');
 
 const EmailController = require('./email.controller');
 const { CONFIG_AUTH } = require('../config');
@@ -27,6 +28,25 @@ UserController.user_list = async function (req, res) {
   }
 };
 
+UserController.user_by_email = async function (req, res) {
+  const { headers } = req;
+  const { email } = req.params;
+
+  console.log('email: ', email);
+
+  if (headers['x-customrequired-header'] !== expectedHeader) {
+    return res.sendStatus(403);
+  }
+
+  try {
+    const user = await User.find({ email });
+    return res.status(200).send(user);
+  } catch (err) {
+    console.log(err);
+    return res.sendStatus(400);
+  }
+};
+
 // Get list of Users with accessLevel 'admin' or 'superadmin' with GET
 UserController.admin_list = async function (req, res) {
   const { headers } = req;
@@ -104,8 +124,6 @@ UserController.user_by_id = async function (req, res) {
 
   try {
     const user = await User.findById(UserId);
-    // TODO throw 404 if User.findById returns empty object
-    // and look downstream to see whether 404 would break anything
     return res.status(200).send(user);
   } catch (err) {
     console.error(err);
@@ -294,7 +312,7 @@ UserController.updateManagedProjects = async function (req, res) {
       managedByUsers = managedByUsers.filter((id) => id !== UserId);
     }
 
-    // Update user's managedProjects 
+    // Update user's managedProjects
     user.managedProjects = managedProjects;
     await user.save({ validateBeforeSave: false });
 
@@ -309,4 +327,31 @@ UserController.updateManagedProjects = async function (req, res) {
   }
 };
 
+UserController.bulkUpdateManagedProjects = async function (req, res) {
+  const { bulkOps } = req.body;
+
+  // Convert string IDs to ObjectId in bulkOps
+  bulkOps.forEach((op) => {
+    if (op?.updateOne?.filter._id) {
+      op.updateOne.filter._id = ObjectId(op.updateOne.filter._id);
+    }
+    if (op?.updateOne?.update) {
+      const update = op.updateOne.update;
+      if (update?.$addToSet?.managedProjects) {
+        update.$addToSet.managedProjects = ObjectId(update.$addToSet.managedProjects);
+      }
+      if (update?.$pull?.managedProjects) {
+        update.$pull.managedProjects = ObjectId(update.$pull.managedProjects);
+      }
+    }
+  });
+
+  try {
+    const result = await User.bulkWrite(bulkOps);
+    res.status(200).json(result);
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+};
+
 module.exports = UserController;

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/models/user.model.js

@@ -37,7 +37,7 @@ const userSchema = mongoose.Schema({
   isHflaGithubMember: { type: Boolean }, // pull from API once github handle in place?
   githubPublic2FA: { type: Boolean }, // does the user have 2FA enabled on their github and membership set to public?
   availability: { type: String }, // availability to meet outside of hacknight times; string for now, more structured in future
-  managedProjects: [{ type: String}], // Which projects managed by user.
+  managedProjects: [{ type: String }], // Which projects managed by user.
   //currentProject: { type: String }              // no longer need this as we can get it from Project Team Member table
   // password: { type: String, required: true }
   isActive: { type: Boolean, default: true }

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"