add test and add sbquery for fetch unarchived user

Author: sahsisunny

models/users.js

@@ -143,6 +143,8 @@ const fetchPaginatedUsers = async (query) => {
     const size = parseInt(query.size) || 100;
     const doc = (query.next || query.prev) && (await userModel.doc(query.next || query.prev).get());
     let dbQuery = (query.prev ? userModel.limitToLast(size) : userModel.limit(size)).orderBy("username");
+    dbQuery = dbQuery.where("roles.archived", "==", false);
+
     if (Object.keys(query).length) {
       if (query.search) {
         dbQuery = dbQuery
@@ -166,16 +168,14 @@ const fetchPaginatedUsers = async (query) => {
 
     snapshot.forEach((doc) => {
       const userData = doc.data();
-      if (!userData.roles.archived) {
-        allUsers.push({
-          id: doc.id,
-          ...doc.data(),
-          phone: undefined,
-          email: undefined,
-          tokens: undefined,
-          chaincode: undefined,
-        });
-      }
+      allUsers.push({
+        id: doc.id,
+        ...userData,
+        phone: undefined,
+        email: undefined,
+        tokens: undefined,
+        chaincode: undefined,
+      });
     });
     return {
       allUsers,

test/integration/users.test.js

@@ -139,6 +139,26 @@ describe("Users", function () {
           return done();
         });
     });
+    it("Should get all the users with archived false", function (done) {
+      chai
+        .request(app)
+        .get("/users")
+        .end((err, res) => {
+          if (err) {
+            return done(err);
+          }
+
+          expect(res).to.have.status(200);
+          expect(res.body).to.be.a("object");
+          expect(res.body.message).to.equal("Users returned successfully!");
+          expect(res.body.users).to.be.a("array");
+          const userData = res.body.users;
+          userData.forEach((user) => {
+            expect(user.roles.archived).to.equal(false);
+          });
+          return done();
+        });
+    });
 
     it("Should get all the users in system when query params are valid", function (done) {
       chai