Merge branch 'develop' into feature/inDiscord

Author: bhtibrewal

controllers/issues.js

@@ -10,7 +10,15 @@ const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 const getIssues = async (req, res) => {
   try {
-    const issues = await issuesService.getOrgIssues();
+    const { q: queryString } = req.query;
+    let issues = {};
+    if (queryString) {
+      const searchedIssues = await issuesService.searchOrgIssues(queryString);
+      issues.data = searchedIssues?.data?.items ?? [];
+    } else {
+      issues = await issuesService.getOrgIssues();
+    }
+
     let issuesData = issues.data.length > 0 ? issues.data : [];
     issuesData = issuesData.filter((issue) => !Object.keys(issue).includes("pull_request"));
     issuesData = issuesData.map(async (issue) => {

controllers/users.js

@@ -455,12 +455,12 @@ const filterUsers = async (req, res) => {
     if (!Object.keys(req.query).length) {
       return res.boom.badRequest("filter for item not provided");
     }
-    const allUsers = await userQuery.getUsersBasedOnFilter(req.query);
+    const users = await userQuery.getUsersBasedOnFilter(req.query);
 
     return res.json({
-      message: "Users found successfully!",
-      users: allUsers,
-      count: allUsers.length,
+      message: users.length ? "Users found successfully!" : "No users found",
+      users,
+      count: users.length,
     });
   } catch (error) {
     logger.error(`Error while fetching all users: ${error}`);

middlewares/validators/user.js

@@ -172,14 +172,17 @@ async function validateUserQueryParams(req, res, next) {
           joi.array().items(joi.string().valid("IDLE", "OOO", "ACTIVE"))
         )
         .optional(),
+    })
+    .messages({
+      "object.min": "Please provide at least one filter criteria",
     });
 
   try {
     await schema.validateAsync(req.query);
     next();
   } catch (error) {
     logger.error(`Error validating query params : ${error}`);
-    res.boom.badRequest(error.details[0].message);
+    res.boom.badRequest(error);
   }
 }
 

models/users.js

@@ -395,18 +395,24 @@ const getUsersBasedOnFilter = async (query) => {
   let finalItems = [];
 
   if (doesTagQueryExist && doesStateQueryExist) {
-    const stateItemIds = new Set(stateItems.map((item) => item.userId));
-    finalItems = tagItems.filter((item) => stateItemIds.has(item.itemId)).map((item) => item.itemId);
+    if (stateItems.length && tagItems.length) {
+      const stateItemIds = new Set(stateItems.map((item) => item.userId));
+      finalItems = tagItems.filter((item) => stateItemIds.has(item.itemId)).map((item) => item.itemId);
+    }
   } else if (doesStateQueryExist) {
     finalItems = stateItems.map((item) => item.userId);
   } else if (doesTagQueryExist) {
     finalItems = tagItems.map((item) => item.itemId);
   }
 
-  finalItems = [...new Set(finalItems)];
-  const userRefs = finalItems.map((itemId) => userModel.doc(itemId));
-  const userDocs = (await firestore.getAll(...userRefs)).map((doc) => ({ id: doc.id, ...doc.data() }));
-  return userDocs;
+  if (finalItems.length) {
+    finalItems = [...new Set(finalItems)];
+    const userRefs = finalItems.map((itemId) => userModel.doc(itemId));
+    const userDocs = (await firestore.getAll(...userRefs)).map((doc) => ({ id: doc.id, ...doc.data() }));
+    const filteredUserDocs = userDocs.filter((doc) => !doc.roles?.archived);
+    return filteredUserDocs;
+  }
+  return [];
 };
 const getAllUsers = async () => {
   try {

services/githubService.js

@@ -48,7 +48,7 @@ const extractPRdetails = (data) => {
  * @param searchParams {Object} - List of params to create github API URL
  * @param resultsOptions {Object} - Ordering and pagination of results
  */
-const getGithubURL = (searchParams, resultsOptions = {}) => {
+const getGithubURL = (searchParams, resultsOptions = {}, searchString) => {
   const baseURL = config.get("githubApi.baseUrl");
   const issuesAndPRsPath = "/search/issues";
 
@@ -65,7 +65,11 @@ const getGithubURL = (searchParams, resultsOptions = {}) => {
   const paramsStrArr = paramsObjArr.map(([key, value]) => `${key}:${value}`);
 
   // The string that can be entrered as text on Github website for simple search
-  const prsSearchText = paramsStrArr.join(" ");
+  let prsSearchText = paramsStrArr.join(" ");
+
+  if (searchString) {
+    prsSearchText = `${searchString} ${prsSearchText}`;
+  }
 
   urlObj.searchParams.append("q", prsSearchText);
 
@@ -178,7 +182,7 @@ const fetchMergedPRs = async (params = {}) => {
 };
 
 const fetchOpenIssues = async (params = {}) => {
-  const { perPage = 100, page = 1, searchParams = {}, resultOptions = {} } = params;
+  const { perPage = 100, page = 1, searchParams = {}, resultOptions = {}, searchString = "" } = params;
 
   try {
     const url = getGithubURL(
@@ -192,7 +196,8 @@ const fetchOpenIssues = async (params = {}) => {
         ...resultOptions,
         per_page: perPage,
         page,
-      }
+      },
+      searchString
     );
     return getFetch(url);
   } catch (err) {
@@ -239,6 +244,7 @@ const fetchIssues = async () => {
       createdURL,
       {
         filter: "all",
+        state: "open",
       },
       {
         Accept: "application/vnd.github+json",

services/issuesService.js

@@ -9,6 +9,15 @@ const getOrgIssues = async () => {
   return data;
 };
 
+const searchOrgIssues = async (searchString) => {
+  const data = await githubService.fetchOpenIssues({
+    searchString,
+  });
+
+  return data;
+};
+
 module.exports = {
   getOrgIssues,
+  searchOrgIssues,
 };

test/integration/usersFilter.test.js

@@ -121,7 +121,7 @@ describe("Filter Users", function () {
   });
 
   // eslint-disable-next-line mocha/no-skipped-tests
-  describe.skip("GET /users/search", function () {
+  describe("GET /users/search", function () {
     it("Should search users based on state", function (done) {
       chai
         .request(app)
@@ -203,7 +203,7 @@ describe("Filter Users", function () {
           expect(res.body.message).to.equal("Users found successfully!");
           expect(res.body.users).to.be.a("array");
           expect(res.body.users.length).to.equal(2);
-          assertUserIds(res.body.users, [activeUser, oooUser, idleUser]);
+          assertUserIds(res.body.users, [oooUser, idleUser]);
           return done();
         });
     });

test/unit/services/githubService.test.js

@@ -138,4 +138,21 @@ describe("githubService", function () {
       expect(response).to.be.equal(`https://api.github.com/orgs/Real-Dev-Squad/issues`);
     });
   });
+
+  describe("fetchOpenIssues with search query param", function () {
+    it("Should generate the correct url to fetch open issues with search param", async function () {
+      const searchString = "website";
+      const response = await githubService.fetchOpenIssues({
+        searchString,
+      });
+
+      const baseURL = config.get("githubApi.baseUrl");
+      const org = config.get("githubApi.org");
+      const path = "search/issues";
+      const searchParams = `org%3A${org}+type%3Aissue+is%3Aopen&sort=created&per_page=100&page=1`;
+
+      const url = `${baseURL}/${path}?q=${searchString}+${searchParams}`;
+      expect(response).to.be.equal(url);
+    });
+  });
 });