GitHub duplication Fixed and Migration

controllers/auth.js

@@ -27,6 +27,7 @@ const githubAuth = (req, res, next) => {
         tokens: {
           githubAccessToken: accessToken,
         },
+        github_user_id: user.id,
       };
 
       const { userId, incompleteUserDetails } = await users.addOrUpdate(userData);

controllers/users.js

@@ -1,3 +1,5 @@
+const axios = require("axios");
+const firestore = require("../utils/firestore");
 const chaincodeQuery = require("../models/chaincodes");
 const userQuery = require("../models/users");
 const profileDiffsQuery = require("../models/profileDiffs");
@@ -462,6 +464,65 @@ const filterUsers = async (req, res) => {
   }
 };
 
+// one time script function to perform the migration - adding github_user_id field to the document
+const migrate = async (req, res) => {
+  try {
+    // Fetch user data from GitHub API for each document in the users collection
+    const usersSnapshot = await firestore.collection("users").get();
+    const batchSize = Math.ceil(usersSnapshot.docs.length / 2);
+    const batch1 = usersSnapshot.docs.slice(0, batchSize);
+    const batch2 = usersSnapshot.docs.slice(batchSize);
+    const batchWrites = [];
+
+    // Create batch write operations for the first batch of documents
+    const batch1Write = firestore.batch();
+    for (const userDoc of batch1) {
+      const githubUsername = userDoc.data().github_id;
+      batch1Write.update(userDoc.ref, { github_user_id: null });
+      batchWrites.push(
+        axios
+          .get(`https://api.github.com/users/${githubUsername}`)
+          .then((response) => {
+            const githubUserId = response.data.id;
+            batch1Write.update(userDoc.ref, { github_user_id: `${githubUserId}` });
+          })
+          .catch((error) => {
+            res.send(error);
+          })
+      );
+    }
+
+    // Create batch write operations for the second batch of documents
+    const batch2Write = firestore.batch();
+    for (const userDoc of batch2) {
+      const githubUsername = userDoc.data().github_id;
+      batch2Write.update(userDoc.ref, { github_user_id: null });
+      batchWrites.push(
+        axios
+          .get(`https://api.github.com/users/${githubUsername}`)
+          .then((response) => {
+            const githubUserId = response.data.id;
+            batch2Write.update(userDoc.ref, { github_user_id: `${githubUserId}` });
+          })
+          .catch((error) => {
+            res.send(error);
+          })
+      );
+    }
+
+    // Execute both batch writes in parallel
+    await Promise.all(batchWrites);
+
+    // Commit both batch writes to update the Firestore documents
+    await batch1Write.commit();
+    await batch2Write.commit();
+
+    return res.send("Documents updated successfully");
+  } catch (error) {
+    return res.status(500).send("Internal server error");
+  }
+};
+
 module.exports = {
   verifyUser,
   generateChaincode,
@@ -481,4 +542,5 @@ module.exports = {
   addDefaultArchivedRole,
   getUserSkills,
   filterUsers,
+  migrate,
 };

models/users.js

@@ -39,14 +39,23 @@ const addOrUpdate = async (userData, userId = null) => {
     }
 
     // userId is null, Add or Update user
-    const user = await userModel.where("github_id", "==", userData.github_id).limit(1).get();
-    if (!user.empty) {
-      await userModel.doc(user.docs[0].id).set(userData, { merge: true });
+    const userWithGithubUserId = await userModel.where("github_user_id", "==", userData.github_user_id).limit(1).get();
+    const userWithGithubId = await userModel.where("github_id", "==", userData.github_id).limit(1).get();
+    if (!userWithGithubUserId.empty) {
+      await userModel.doc(userWithGithubUserId.docs[0].id).set(userData, { merge: true });
 
       return {
         isNewUser: false,
-        userId: user.docs[0].id,
-        incompleteUserDetails: user.docs[0].data().incompleteUserDetails,
+        userId: userWithGithubUserId.docs[0].id,
+        incompleteUserDetails: userWithGithubUserId.docs[0].data().incompleteUserDetails,
+      };
+    } else if (!userWithGithubId.empty) {
+      await userModel.doc(userWithGithubId.docs[0].id).set(userData, { merge: true });
+
+      return {
+        isNewUser: false,
+        userId: userWithGithubId.docs[0].id,
+        incompleteUserDetails: userWithGithubId.docs[0].data().incompleteUserDetails,
       };
     }
 
@@ -65,7 +74,6 @@ const addOrUpdate = async (userData, userId = null) => {
     throw err;
   }
 };
-
 const addJoinData = async (userData) => {
   try {
     await joinModel.add(userData);
@@ -74,7 +82,6 @@ const addJoinData = async (userData) => {
     throw err;
   }
 };
-
 const getJoinData = async (userId) => {
   try {
     const userData = [];

routes/users.js

@@ -29,4 +29,7 @@ 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("/users/migrate", authenticate, authorizeRoles([SUPERUSER]), users.migrate);
+
 module.exports = router;

test/fixtures/user/user.js

@@ -16,6 +16,7 @@ module.exports = () => {
       yoe: 0,
       img: "./img.png",
       linkedin_id: "ankurnarkhede",
+      github_user_id: githubUserInfo[0].id,
       github_id: githubUserInfo[0].username,
       github_display_name: githubUserInfo[0].displayName,
       isMember: true,
@@ -41,6 +42,7 @@ module.exports = () => {
       last_name: "Bhandarkar",
       yoe: 0,
       img: "./img.png",
+      github_user_id: "23654780",
       github_id: "whydonti",
       linkedin_id: "nikhil-bhandarkar",
       twitter_id: "whatifi",
@@ -57,6 +59,7 @@ module.exports = () => {
       last_name: "Gajjewar",
       yoe: 0,
       img: "./img.png",
+      github_user_id: "23654788",
       github_id: "cartmanishere",
       linkedin_id: "pranav-gajjewar",
       twitter_id: "PGajjewar",
@@ -77,6 +80,7 @@ module.exports = () => {
       yoe: 3,
       img: "./img.png",
       linkedin_id: "sagarbajpai",
+      github_user_id: "23654790",
       github_id: "sagarbajpai",
       github_display_name: "Sagar Bajpai",
       phone: "1234567890",
@@ -101,6 +105,7 @@ module.exports = () => {
       yoe: 10,
       img: "./img.png",
       linkedin_id: "ankushdharkar",
+      github_user_id: "23654700",
       github_id: "ankushdharkar",
       github_display_name: "Ankush Dharkar",
       phone: "1234567890",
@@ -125,6 +130,7 @@ module.exports = () => {
       yoe: 0,
       img: "./img.png",
       linkedin_id: "ankitabannore",
+      github_user_id: "23654725",
       github_id: "Ankita2002-Fr",
       github_display_name: "Ankita Bannore",
       isMember: true,
@@ -149,6 +155,7 @@ module.exports = () => {
       last_name: "Chaudhari",
       yoe: 0,
       img: "./img.png",
+      github_user_id: "23654583",
       github_id: "mehulkchaudhari",
       linkedin_id: "mehulkchaudhari",
       twitter_id: "mehulkchaudhari",
@@ -174,6 +181,7 @@ module.exports = () => {
       yoe: 0,
       img: "./img.png",
       linkedin_id: "ankurnarkhede",
+      github_user_id: "23654236",
       github_id: "ankur1234",
       github_display_name: "ankur-xyz",
       phone: "1234567890",
@@ -182,6 +190,7 @@ module.exports = () => {
     {
       username: "ritvik",
       github_id: "RitvikJamwal75",
+      github_user_id: "23654123",
       first_name: "Ritvik",
       yoe: 1,
       picture: {

test/integration/contributions.test.js

@@ -23,17 +23,20 @@ describe("Contributions", function () {
       yoe: 0,
       img: "./img.png",
       github_id: "prakashchoudhary07",
+      github_user_id: "12345678",
       username: "prakash",
     };
     // Adding user
     await userModel.addOrUpdate(user);
     // Creating second user
     user.username = "userWithNoPrs";
     user.github_id = "userWithNoPrs";
+    user.github_user_id = "userWithNoPrs";
     await userModel.addOrUpdate(user);
     // Creating second user
     user.username = "userNoTask";
     user.github_id = "userNoTask";
+    user.github_user_id = "userNoTask";
     await userModel.addOrUpdate(user);
     //  Creating task for user
     const task = {

test/integration/tasks.test.js

@@ -210,6 +210,7 @@ describe("Tasks", function () {
       const { userId: assignedUser } = await userModel.addOrUpdate({
         github_id: "prakashchoudhary07",
         username: "user1",
+        github_user_id: "12345678",
       });
       const assignedTask = [
         {

test/unit/models/users.test.js

@@ -87,5 +87,62 @@ describe("users", function () {
       expect(user.last_name).to.equal(userData.last_name);
       expect(userExists).to.equal(true);
     });
+
+    it("should add the github_user_id to the user collection", async function () {
+      const userData = userDataArray[0];
+      userData.github_user_id = "12345678";
+
+      const { isNewUser, userId } = await users.addOrUpdate(userData);
+
+      const data = (await userModel.doc(userId).get()).data();
+
+      expect(data.github_user_id).to.equal(userData.github_user_id);
+      expect(isNewUser).to.equal(true);
+    });
+
+    it("should update the github_id in the user collection", async function () {
+      const userData = userDataArray[0];
+      userData.github_user_id = "Yash Sinha";
+
+      // Add the user the first time
+      const { userId } = await users.addOrUpdate(userData);
+
+      // Update the user with same data and new github_user_id
+      userData.github_id = "Ankush Dharkar";
+      await users.addOrUpdate(userData, userId);
+
+      const data = (await userModel.doc(userId).get()).data();
+
+      expect(data.github_id).to.equal(userData.github_id);
+    });
+
+    it("verifies the error text message", async function () {
+      const userData = { ...userDataArray[0], github_id: 123 };
+
+      try {
+        await users.addOrUpdate(userData);
+      } catch (error) {
+        expect(error.message).to.equal("Validation error: github_id must be a string");
+      }
+    });
+
+    it("should have a maximum length of 8 characters", async function () {
+      const userData = { ...userDataArray[0], github_user_id: "a".repeat(9) };
+
+      try {
+        await users.addOrUpdate(userData);
+      } catch (error) {
+        expect(error.message).to.equal("Validation error: github_id exceeds maximum length of 8 characters");
+      }
+    });
+
+    it("should be stored correctly in the database", async function () {
+      const userData = { ...userDataArray[0], github_id: "my_github_id" };
+
+      const { userId } = await users.addOrUpdate(userData);
+      const data = (await userModel.doc(userId).get()).data();
+
+      expect(data.github_id).to.equal("my_github_id");
+    });
   });
 });