Merge pull request #1142 from Real-Dev-Squad/return-archived-role-fal…

…se-user-only

Return un-archived user only

models/users.js

@@ -142,7 +142,15 @@ const fetchPaginatedUsers = async (query) => {
     // INFO: https://github.com/Real-Dev-Squad/website-backend/pull/873#discussion_r1064229932
     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");
+
+    let dbQuery = userModel.where("roles.archived", "==", false).orderBy("username");
+
+    if (query.prev) {
+      dbQuery = dbQuery.limitToLast(size);
+    } else {
+      dbQuery = dbQuery.limit(size);
+    }
+
     if (Object.keys(query).length) {
       if (query.search) {
         dbQuery = dbQuery

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