Update: replace query of username to userId

Author: gauravsinhaweb

controllers/members.js

@@ -3,6 +3,7 @@ const members = require("../models/members");
 const tasks = require("../models/tasks");
 const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 const dataAccess = require("../services/dataAccessLayer");
+const { addLog } = require("../models/logs");
 /**
  * Fetches the data about our members
  *
@@ -82,18 +83,23 @@ const moveToMembers = async (req, res) => {
 const archiveMembers = async (req, res) => {
   try {
     const { username } = req.params;
-    const user = await fetchUser({ username });
-    const userId = user.user.id;
+    const user = await dataAccess.retrieveUsers({ username });
     const superUserId = req.userData.id;
     const body = req.body;
+    const meta = {
+      userId: user?.user?.id,
+      superUserId: superUserId,
+      username: username,
+    };
     if (!body?.reason || /^\s*$/.test(body?.reason)) {
       return res.boom.badRequest("Reason is required");
     }
     if (user?.userExists) {
-      const successObject = await members.addArchiveRoleToMembers(userId, username, superUserId, body?.reason);
+      const successObject = await members.addArchiveRoleToMembers(user.user.id);
       if (successObject.isArchived) {
         return res.boom.badRequest("User is already archived");
       }
+      addLog("archiveDetails", meta, { body: body?.reason });
       return res.status(204).send();
     }
     return res.boom.notFound("User doesn't exist");

models/logs.js

@@ -42,17 +42,17 @@ const fetchLogs = async (query, param) => {
       }
     });
 
-    const { limit, lastDocId, username } = query;
+    const { limit, lastDocId, userId } = query;
     let lastDoc;
     const limitDocuments = Number(limit);
 
     if (lastDocId) {
       lastDoc = await logsModel.doc(lastDocId).get();
     }
-    if (username) {
+    if (userId) {
       const logsSnapshot = await logsModel
         .where("type", "==", param)
-        .where("meta.username", "==", username)
+        .where("meta.userId", "==", userId)
         .orderBy("timestamp", "desc")
         .get();
       const logs = [];

test/unit/models/logs.test.js

@@ -46,6 +46,7 @@ describe("Logs", function () {
       const query = {};
 
       const data = await logsQuery.fetchLogs(query, type);
+
       expect(data).to.be.an("array").with.lengthOf(0);
     });
     it("Should fetch all archived logs", async function () {
@@ -55,7 +56,7 @@ describe("Logs", function () {
       await logsQuery.addLog(type, meta, body);
       const data = await logsQuery.fetchLogs(query, type);
 
-      expect(data).to.be.an("array").with.lengthOf(1);
+      expect(data).to.be.an("array").with.lengthOf.greaterThan(0);
       expect(data[0]).to.have.property("timestamp").that.is.an("object");
       expect(data[0].timestamp).to.have.property("_seconds").that.is.a("number");
       expect(data[0].timestamp).to.have.property("_nanoseconds").that.is.a("number");
@@ -65,12 +66,12 @@ describe("Logs", function () {
     it("Should fetch all archived logs for given username", async function () {
       const { type, meta, body } = logsData.archivedUserDetailsModal[0];
       const query = {
-        username: meta.username,
+        userId: meta.userId,
       };
       await logsQuery.addLog(type, meta, body);
       const data = await logsQuery.fetchLogs(query, type);
 
-      expect(data).to.be.an("array").to.have.lengthOf.greaterThan(0);
+      expect(data).to.be.an("array").with.lengthOf.greaterThan(0);
       expect(data[0]).to.have.property("timestamp").that.is.an("object");
       expect(data[0].timestamp).to.have.property("_seconds").that.is.a("number");
       expect(data[0].timestamp).to.have.property("_nanoseconds").that.is.a("number");
@@ -80,7 +81,7 @@ describe("Logs", function () {
     it("Should throw response status 404, if username is incorrect in the query", async function () {
       const { type, meta, body } = logsData.archivedUserDetailsModal[0];
       const query = {
-        username: "TEST_USERNAME", // incorrect username
+        userId: "1234_test", // incorrect username
       };
       await logsQuery.addLog(type, meta, body);
       const data = await logsQuery.fetchLogs(query, type);