Merge pull request #620 from zurichat/revert-618-search_endpoint

Revert "feat-search_endpoint"
zurichat · Oct 11, 2021 · 2936f58 · 2936f58
2 parents 0a75803 + 53c05a0
commit 2936f58
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 61 deletions.
diff --git a/backend/controllers/index.html b/backend/controllers/index.html
diff --git a/backend/controllers/search.controller.js b/backend/controllers/search.controller.js
@@ -1,6 +1,5 @@
 const DatabaseOps = require('../utils/database.helper');
 const File = new DatabaseOps('File');
-const Folder = new DatabaseOps('Folder');
 const appResponse = require('../utils/appResponse');
 
 
@@ -10,6 +9,7 @@ exports.searchAndFilterFiles = async (req, res) => {
 
   if (fileName.trim()) {
     const data = await File.fetchAll();
+
     let response;
 
     if (fileType.trim()) {
@@ -31,35 +31,4 @@ exports.searchAndFilterFiles = async (req, res) => {
   } else {
     return res.status(400).send(appResponse('Invalid fileName provided!', null));
   }
-}
-
-exports.searchFileAndFolder = async (req, res) => {
-  let { searchQuery } = req.query;
-  console.log(searchQuery)
-  const fileData = await File.fetchAll();
-  const folderData = await Folder.fetchAll();
-
-
-  if (searchQuery.trim()) {
-    searchFile = fileData.filter(({ fileName: name }) => {
-      return new RegExp(String(searchQuery), 'i').test(name);
-    })
-    searchFolder = folderData.filter(({ folderName: name }) => {
-      return new RegExp(String(searchQuery), 'i').test(name);
-    })
-
-    const response = await Promise.all([searchFile,searchFolder]);
-
-    if ((response[0].length <= 0) && (response[1].length <= 0)) {
-      return res.status(404).send(appResponse('No such File/Folder!', null, true));
-    }
-    return res.status(200).send(appResponse('Search results for files and folders', response, true));
-  } else {
-    return res.status(400).send(appResponse('Invalid search entry!', null));
-  }
-
-}
-
-exports.testSearch = async (req,res) => {
-  res.sendFile(`${__dirname}/index.html`);
 }
diff --git a/backend/routes/search.route.js b/backend/routes/search.route.js
@@ -1,8 +1,6 @@
 const router = require('express').Router();
-const { searchAndFilterFiles,searchFileAndFolder,testSearch } = require('../controllers/search.controller');
+const { searchAndFilterFiles } = require('../controllers/search.controller');
 
 router.get('/', searchAndFilterFiles);
-router.get('/fileAndFolder/', searchFileAndFolder)
-router.get('/testSearch/', testSearch)
 
 module.exports = router;