2 files changed, 40 insertions, 7 deletions

diff --git a/server/models/pods.js b/server/models/pods.js
index 04cc2d6fc..daeadeb07 100644
--- a/server/models/pods.js
+++ b/server/models/pods.js
@@ -19,10 +19,13 @@ const PodsDB = mongoose.model('pods', podsSchema)
 const Pods = {
   add: add,
   count: count,
+  findById: findById,
   findByUrl: findByUrl,
   findBadPods: findBadPods,
   incrementScores: incrementScores,
   list: list,
+  listAllIds: listAllIds,
+  listAllUrls: listAllUrls,
   remove: remove,
   removeAll: removeAll,
   removeAllByIds: removeAllByIds
@@ -48,6 +51,10 @@ function findBadPods (callback) {
   PodsDB.find({ score: 0 }, callback)
 }
 
+function findById (id, callback) {
+  PodsDB.findById(id, callback)
+}
+
 function findByUrl (url, callback) {
   PodsDB.findOne({ url: url }, callback)
 }
@@ -68,6 +75,14 @@ function list (callback) {
   })
 }
 
+function listAllIds (callback) {
+  return PodsDB.find({}, { _id: 1 }, callback)
+}
+
+function listAllUrls (callback) {
+  return PodsDB.find({}, { _id: 0, url: 1 }, callback)
+}
+
 function remove (url, callback) {
   if (!callback) callback = function () {}
   PodsDB.remove({ url: url }, callback)
diff --git a/server/models/requests.js b/server/models/requests.js
index 2152ae0e9..e67ccad56 100644
--- a/server/models/requests.js
+++ b/server/models/requests.js
@@ -7,9 +7,8 @@ const logger = require('../helpers/logger')
 // ---------------------------------------------------------------------------
 
 const requestsSchema = mongoose.Schema({
-  type: String,
-  id: String, // Special id to find duplicates (video created we want to remove...)
-  request: mongoose.Schema.Types.Mixed
+  request: mongoose.Schema.Types.Mixed,
+  to: [ { type: mongoose.Schema.Types.ObjectId, ref: 'users' } ]
 })
 const RequestsDB = mongoose.model('requests', requestsSchema)
 
@@ -19,12 +18,15 @@ const Requests = {
   create: create,
   findById: findById,
   list: list,
+  removeAll: removeAll,
+  removePodOf: removePodOf,
   removeRequestById: removeRequestById,
-  removeRequests: removeRequests
+  removeRequests: removeRequests,
+  removeWithEmptyTo: removeWithEmptyTo
 }
 
-function create (id, type, request, callback) {
-  RequestsDB.create({ id: id, type: type, request: request }, callback)
+function create (request, to, callback) {
+  RequestsDB.create({ request: request, to: to }, callback)
 }
 
 function findById (id, callback) {
@@ -32,7 +34,17 @@ function findById (id, callback) {
 }
 
 function list (callback) {
-  RequestsDB.find({}, { _id: 1, type: 1, request: 1 }, callback)
+  RequestsDB.find({}, { _id: 1, request: 1, to: 1 }, callback)
+}
+
+function removeAll (callback) {
+  RequestsDB.remove({ }, callback)
+}
+
+function removePodOf (requestsIds, podId, callback) {
+  if (!callback) callback = function () {}
+
+  RequestsDB.update({ _id: { $in: requestsIds } }, { $pull: { to: podId } }, { multi: true }, callback)
 }
 
 function removeRequestById (id, callback) {
@@ -50,6 +62,12 @@ function removeRequests (ids) {
   })
 }
 
+function removeWithEmptyTo (callback) {
+  if (!callback) callback = function () {}
+
+  RequestsDB.remove({ to: { $size: 0 } }, callback)
+}
+
 // ---------------------------------------------------------------------------
 
 module.exports = Requests