Moved, renamed, re-did and added a lot of stuff. Getting ready for the v2 upgrade

seasoned_api/src/webserver/controllers/search/movieSearch.js

@@ -1,7 +1,7 @@
-const SearchHistory = require('src/searchHistory/searchHistory');
 const configuration = require('src/config/configuration').getInstance();
 const Cache = require('src/tmdb/cache');
 const TMDB = require('src/tmdb/tmdb');
+const SearchHistory = require('src/searchHistory/searchHistory');
 const cache = new Cache();
 const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
 const searchHistory = new SearchHistory();
@@ -16,20 +16,25 @@ function movieSearchController(req, res) {
   const user = req.loggedInUser;
   const { query, page } = req.query;
 
-  Promise.resolve()
-  .then(() => {
-    if (user) {
-      return searchHistory.create(user, query);
-    }
-    return null
-  })
-  .then(() => tmdb.movieSearch(query, page))
-  .then((movies) => {
-    res.send(movies);
-  })
-  .catch((error) => {
-    res.status(500).send({ success: false, error: error.message });
-  });
+  if (user) {
+    return searchHistory.create(user, query);
+  }
+
+  tmdb.movieSearch(query, page)
+    .then(movieSearchResults => res.send(movieSearchResults))
+    .catch(error => {
+      const { status, message } = error;
+
+      if (status && message) {
+        res.status(error.status).send({ success: false, error: error.message })
+      } else {
+        // TODO log unhandled errors
+        console.log('caugth movie search controller error', error)
+        res.status(500).send({
+          message: `An unexpected error occured while searching movies with query: ${query}`
+        })
+      }
+    })
 }
 
 module.exports = movieSearchController;