Chore : Minor Fixes

controllers/users.js

@@ -858,6 +858,12 @@ async function usersPatchHandler(req, res) {
  }
 }
 const addGithubId = async (req, res) => {
+ const { action } = req.query;
+ if (action !== "adds-github-id") {
+ return res.status(400).json({
+ message: "Invalid action type",
+ });
+ }
  const usersNotFound = [];
  let countUserFound = 0;
  let countUserNotFound = 0;
@@ -875,16 +881,15 @@ const addGithubId = async (req, res) => {
  const batchCount = Math.ceil(totalUsers / 500);
  // Create batch write operations for each batch of documents
  for (let i = 0; i < batchCount; i++) {
- const batchDocs = usersSnapshot.docs.slice(i * 500, (i + 1) * 500);
  const batchWrite = firestore.batch();
  const batchWrites = [];
- for (const userDoc of batchDocs) {
+ for (const userDoc of usersSnapshot.docs.slice(i * 500, (i + 1) * 500)) {
  const githubUsername = userDoc.data().github_id;
  const username = userDoc.data().username;
  const userId = userDoc.id;
  batchWrite.update(userDoc.ref, { github_user_id: null });
 
- const promise = fetch(`https://api.github.com/users/${githubUsername}`, requestOptions)
+ const getUserDetails = fetch(`https://api.github.com/users/${githubUsername}`, requestOptions)
  .then((response) => {
  if (!response.ok) {
  throw new Error("Network response was not ok");
@@ -902,7 +907,7 @@ const addGithubId = async (req, res) => {
  usersNotFound.push(invalidUsers);
  logger.error("An error occurred at fetch:", error);
  });
- batchWrites.push(promise);
+ batchWrites.push(getUserDetails);
  }
  await Promise.all(batchWrites);
  await batchWrite.commit();

routes/users.js

@@ -62,5 +62,5 @@ router.patch("/rejectDiff", authenticate, authorizeRoles([SUPERUSER]), users.rej
 router.patch("/:userId", authenticate, authorizeRoles([SUPERUSER]), users.updateUser);
 router.get("/suggestedUsers/:skillId", authenticate, authorizeRoles([SUPERUSER]), users.getSuggestedUsers);
 // WARNING!! - One time Script/Route to do migration
-router.post("/migrate", authenticate, authorizeRoles([SUPERUSER]), users.addGithubId);
+router.post("/migrations", authenticate, authorizeRoles([SUPERUSER]), users.addGithubId);
 module.exports = router;

test/unit/models/users.test.js

@@ -493,7 +493,7 @@ describe("users", function () {
  it("API should not be accessible to any regular user", function (done) {
  chai
  .request(app)
- .post("/users/migrate")
+ .post("/users/migrations?action=adds-github-id")
  .set("cookie", `${cookieName}=${userToken}`)
  .send()
  .end((err, res) => {
@@ -514,9 +514,16 @@ describe("users", function () {
  for (const user of prodUsers.slice(2)) {
  await addUser(user);
  }
+ const allUsers = await chai.request(app).get("/users").set("cookie", `${cookieName}=${superUserToken}`).send();
+ const usersWithoutGithubId = allUsers.body.users.filter((user) => {
+ return !user.github_user_id;
+ });
+
+ expect(usersWithoutGithubId).to.not.have.length(0);
+
  const res = await chai
  .request(app)
- .post("/users/migrate")
+ .post("/users/migrations?action=adds-github-id")
  .set("cookie", `${cookieName}=${superUserToken}`)
  .send();
 
@@ -526,6 +533,17 @@ describe("users", function () {
  expect(res.body.data).to.have.property("usersUpdated").that.is.a("number");
  expect(res.body.data).to.have.property("usersNotUpdated").that.is.a("number");
  expect(res.body.data).to.have.property("invalidUsersDetails").that.is.an("array");
+
+ const updatedUsers = await chai
+ .request(app)
+ .get("/users")
+ .set("cookie", `${cookieName}=${superUserToken}`)
+ .send();
+
+ const updatedUsersWithoutGithubId = updatedUsers.body.users.filter((user) => {
+ return !user.github_user_id;
+ });
+ expect(updatedUsersWithoutGithubId).to.have.length(0);
  });
  });
 });