Moved CleezyFunction.js to api/util and renamed it cleezyHelpers.js.

Author: Pikalot

api/main_endpoints/routes/Cleezy.js

@@ -4,7 +4,6 @@ const router = express.Router();
 const {
   decodeToken,
   checkIfTokenSent,
-  checkIfTokenValid,
 } = require('../util/token-functions.js');
 const {
   OK,
@@ -14,7 +13,6 @@ const {
 } = require('../../util/constants').STATUS_CODES;
 const logger = require('../../util/logger');
 const { Cleezy } = require('../../config/config.json');
-const membershipState = require('../../util/constants').MEMBERSHIP_STATE;
 const { ENABLED } = Cleezy;
 
 let CLEEZY_URL = process.env.CLEEZY_URL
@@ -99,36 +97,4 @@ router.post('/deleteUrl', async (req, res) => {
     });
 });
 
-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: [] };
-  }
-
-  try {
-    const cleezyQuery = req.body.query.replace(/[^a-zA-Z0-9]/g, '');
-    const cleezyRes = await axios.get(CLEEZY_URL + '/list', {
-      params: {
-        search: cleezyQuery
-      }
-    });
-    const cleezyData = cleezyRes.data?.data
-      .slice(0, 5)
-      .map(e => {
-        const u = new URL(e.alias, URL_SHORTENER_BASE_URL);
-        return { ...e, link: u.href };
-      });
-
-    return { status: OK, data: cleezyData };
-  } catch (err) {
-    logger.error('cleezy search urls had an error', err);
-    return { status: SERVER_ERROR, data: [] };
-  }
-};
-
-module.exports = {router, searchCleezyUrls};
+module.exports = router;

api/main_endpoints/routes/ShortcutSearch.js

@@ -17,7 +17,7 @@ const membershipState = require('../../util/constants').MEMBERSHIP_STATE;
 const logger = require('../../util/logger');
 const { Cleezy } = require('../../config/config.json');
 const { ENABLED } = Cleezy;
-const cleezy = require('../routes/Cleezy.js');
+const cleezy = require('../util/cleezyHelpers.js');
 
 // Search for all members using either first name, last name or email
 // Search for all cleezy urls using either alias or url

…/main_endpoints/routes/CleezyFunction.js api/main_endpoints/util/cleezyHelpers.jsapi/main_endpoints/routes/CleezyFunction.js renamed to api/main_endpoints/util/cleezyHelpers.js api/main_endpoints/routes/CleezyFunction.js renamed to api/main_endpoints/util/cleezyHelpers.js

@@ -5,16 +5,16 @@ const {
   decodeToken,
   checkIfTokenSent,
   checkIfTokenValid,
-} = require('../util/token-functions.js');
+} = require('./token-functions.js');
 const {
   OK,
   UNAUTHORIZED,
   FORBIDDEN,
   SERVER_ERROR,
-} = require('../../util/constants').STATUS_CODES;
-const logger = require('../../util/logger');
+} = require('../../util/constants.js').STATUS_CODES;
+const logger = require('../../util/logger.js');
 const { Cleezy } = require('../../config/config.json');
-const membershipState = require('../../util/constants').MEMBERSHIP_STATE;
+const membershipState = require('../../util/constants.js').MEMBERSHIP_STATE;
 const { ENABLED } = Cleezy;
 
 let CLEEZY_URL = process.env.CLEEZY_URL