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

seasoned_api/src/request/request.js

@@ -23,6 +23,7 @@ class RequestRepository {
       downloaded: '(select status from requests where id is request.id and type is request.type limit 1)',
       // deluge: '(select status from deluge_torrent where id is request.id and type is request.type limit 1)',
       // fetchAllFilterStatus: 'select * from request where '
+      readWithoutUserData: 'select id, title, year, type, status, date from requests where id is ? and type is ?',
       read: 'select id, title, year, type, status, requested_by, ip, date, user_agent from requests where id is ? and type is ?'
     };
   }
@@ -106,11 +107,17 @@ class RequestRepository {
    * @returns {Promise}
    */
   getRequestByIdAndType(id, type) {
-    return Promise.resolve()
-      .then(() => this.database.get(this.queries.read, [id, type]))
+    return this.database.get(this.queries.readWithoutUserData, [id, type])
       .then(row => {
         assert(row, 'Could not find request item with that id and type')
-        return JSON.stringify(row)
+        return {
+          id: row.id,
+          title: row.title,
+          year: row.year,
+          type: row.type,
+          status: row.status,
+          requested_date: new Date(row.date)
+        }
       })
   }
 
@@ -145,11 +152,15 @@ class RequestRepository {
         const totalRequests = sqliteResponse['totalRequests']
         const totalPages = Math.ceil(totalRequests / 26)
 
-        return [ rows.map(item => { item.poster = item.poster_path; return item }), totalPages ]
+        return [ rows.map(item => {
+          item.poster = item.poster_path; delete item.poster_path;
+          item.backdrop = item.background_path; delete item.background_path;
+          return item
+        }), totalPages, totalRequests ]
         return Promise.all(this.mapToTmdbByType(rows))
 })
-      .then(([result, totalPages]) => Promise.resolve({
-        results: result, total_results: result.length, page: page, total_pages: totalPages
+      .then(([result, totalPages, totalRequests]) => Promise.resolve({
+        results: result, total_results: totalRequests, page: page, total_pages: totalPages
       }))
       .catch(error => { console.log(error);throw error })
   }