cleezy.js post '/list' calls cleezyHelpers.js instead. cleezyHelpers.js supports limit record returns

Author: Pikalot

api/main_endpoints/routes/Cleezy.js

@@ -14,6 +14,7 @@ const {
 const logger = require('../../util/logger');
 const { Cleezy } = require('../../config/config.json');
 const { ENABLED } = Cleezy;
+const cleezyHelpers = require('../util/cleezyHelpers.js');
 
 let CLEEZY_URL = process.env.CLEEZY_URL
   || 'http://localhost:8000';
@@ -26,28 +27,14 @@ router.get('/list', async (req, res) => {
       disabled: true
     });
   }
-  const { page = 0, search, sortColumn = 'created_at', sortOrder = 'DESC'} = req.query;
   if (!checkIfTokenSent(req)) {
     return res.sendStatus(FORBIDDEN);
   } else if (!await decodeToken(req)) {
     return res.sendStatus(UNAUTHORIZED);
   }
   try {
-    const response = await axios.get(CLEEZY_URL + '/list', {
-      params: {
-        page,
-        ...(search !== undefined && { search }),
-        // eslint-disable-next-line camelcase
-        sort_by: sortColumn,
-        order: sortOrder
-      },
-    });
-    const { data = [], total, rows_per_page: rowsPerPage } = response.data;
-    const returnData = data.map(element => {
-      const u = new URL(element.alias, URL_SHORTENER_BASE_URL);
-      return { ...element, link: u.href };
-    });
-    res.json({ data: returnData, total, rowsPerPage });
+    const returnData = await cleezyHelpers.searchCleezyUrls(req);
+    res.json(returnData);
   } catch (err) {
     logger.error('/listAll had an error', err);
     if (err.response && err.response.data) {

api/main_endpoints/routes/ShortcutSearch.js

@@ -18,6 +18,7 @@ const logger = require('../../util/logger');
 const { Cleezy } = require('../../config/config.json');
 const { ENABLED } = Cleezy;
 const cleezy = require('../util/cleezyHelpers.js');
+const MAX_RESULT = 5;
 
 // Search for all members using either first name, last name or email
 // Search for all cleezy urls using either alias or url
@@ -106,7 +107,7 @@ router.post('/', async function(req, res) {
 
   // Find user and sort results based on best match of full name or email
   try{
-    const users = await User.find(maybeOr, { password: 0 }).limit(5);
+    const users = await User.find(maybeOr, { password: 0 }).limit(MAX_RESULT);
     users.sort(sortByMatch(req.body.query));
 
     // Short circuit if cleezy is disabled
@@ -117,17 +118,14 @@ router.post('/', async function(req, res) {
       });
     }
 
-    const cleezyRes = await cleezy.searchCleezyUrls(req);
-    if (cleezyRes.status !== OK) {
-      logger.warn('Cleezy search failed', {
-        status: cleezyRes.status
-      });
-
-      return res.status(OK).send({
-        cleezyStatus: cleezyRes.status,
-        items: { users }
-      });
-    }
+    const cleezyReq = {
+      query: {
+        search: req.body.query,
+        page: 0,
+        limit: MAX_RESULT,
+      }
+    };
+    const cleezyRes = await cleezy.searchCleezyUrls(cleezyReq);
 
     return res.status(OK).send({
       items: {

api/main_endpoints/util/cleezyHelpers.js

@@ -1,56 +1,49 @@
-const express = require('express');
 const axios = require('axios');
-const router = express.Router();
 const {
-  decodeToken,
-  checkIfTokenSent,
-  checkIfTokenValid,
-} = require('./token-functions.js');
-const {
-  OK,
-  UNAUTHORIZED,
-  FORBIDDEN,
   SERVER_ERROR,
 } = require('../../util/constants.js').STATUS_CODES;
 const logger = require('../../util/logger.js');
-const { Cleezy } = require('../../config/config.json');
-const membershipState = require('../../util/constants.js').MEMBERSHIP_STATE;
-const { ENABLED } = Cleezy;
 
 let CLEEZY_URL = process.env.CLEEZY_URL
   || 'http://localhost:8000';
 let URL_SHORTENER_BASE_URL =
   process.env.NODE_ENV === 'production' ? 'https://sce.sjsu.edu/s/' : 'http://localhost:8000/find/';
 
 const searchCleezyUrls = async (req) => {
-  if(!ENABLED || !req.body.query) {
-    return { status: OK, data: [] };
-  }
-
-  if (!checkIfTokenSent(req)) {
-    return { status: FORBIDDEN, data: [] };
-  } else if (!checkIfTokenValid(req, membershipState.OFFICER)) {
-    return { status: UNAUTHORIZED, data: [] };
-  }
-
+  const { page = 0, search, sortColumn = 'created_at', sortOrder = 'DESC', limit } = req.query;
   try {
-    const cleezyQuery = req.body.query.replace(/[^a-zA-Z0-9]/g, '');
+    const cleezyQuery = search?.replace(/[^a-zA-Z0-9]/g, '');
     const cleezyRes = await axios.get(CLEEZY_URL + '/list', {
       params: {
-        search: cleezyQuery
+        page,
+        ...(cleezyQuery !== undefined && { search: cleezyQuery }),
+        // eslint-disable-next-line camelcase
+        sort_by: sortColumn,
+        order: sortOrder,
       }
     });
-    const cleezyData = cleezyRes.data?.data
-      .slice(0, 5)
+    const { data = [], total, rows_per_page: rowsPerPage } = cleezyRes.data;
+    const cleezyData = data
+      .slice(0, limit)
       .map(e => {
         const u = new URL(e.alias, URL_SHORTENER_BASE_URL);
         return { ...e, link: u.href };
       });
 
-    return { status: OK, data: cleezyData };
+    return { data: cleezyData, total, rowsPerPage };
   } catch (err) {
-    logger.error('cleezy search urls had an error', err);
-    return { status: SERVER_ERROR, data: [] };
+    logger.error('cleezyHelpers had an error', err);
+    if (err.response && err.response.data) {
+      return {
+        status: err.response.status,
+        error: err.response.data
+      };
+    } else {
+      return {
+        status: SERVER_ERROR,
+        error: 'Failed to list URLs in cleezyHelpers'
+      };
+    }
   }
 };