v1.0.3 - [BUGFIX] Drop files in chunk

Author: jdrouet

lib/index.js

@@ -1,7 +1,9 @@
-var Busboy, DataSource, Grid, GridFS, MongoStorage, ObjectID, Promise, _, debug, generateUrl, mongodb;
+var Busboy, DataSource, Grid, GridFS, MongoStorage, ObjectID, Promise, _, async, debug, generateUrl, mongodb;
 
 _ = require('lodash');
 
+async = require('async');
+
 Busboy = require('busboy');
 
 DataSource = require('loopback-datasource-juggler').DataSource;
@@ -93,10 +95,16 @@ MongoStorage = (function() {
   };
 
   MongoStorage.prototype.destroyContainer = function(name, callback) {
-    return this.db.collection('fs.files').remove({
-      'metadata.mongo-storage': true,
-      'metadata.container': name
-    }, callback);
+    var self;
+    self = this;
+    return self.getFiles(name, function(err, files) {
+      if (err) {
+        return callback(err);
+      }
+      return async.each(files, function(file, done) {
+        return self.removeFileById(file._id, done);
+      }, callback);
+    });
   };
 
   MongoStorage.prototype.upload = function(container, req, res, callback) {
@@ -160,15 +168,32 @@ MongoStorage = (function() {
   };
 
   MongoStorage.prototype.removeFile = function(container, filename, callback) {
-    return this.db.collection('fs.files').remove({
-      'metadata.mongo-storage': true,
-      'metadata.container': container,
-      'metadata.filename': filename
-    }, function(err) {
-      return callback(err);
+    var self;
+    self = this;
+    return self.getFile(container, filename, function(err, file) {
+      if (err) {
+        return callback(err);
+      }
+      return self.removeFileById(file._id, callback);
     });
   };
 
+  MongoStorage.prototype.removeFileById = function(id, callback) {
+    var self;
+    self = this;
+    return async.parallel([
+      function(done) {
+        return self.db.collection('fs.chunks').remove({
+          files_id: id
+        }, done);
+      }, function(done) {
+        return self.db.collection('fs.files').remove({
+          _id: id
+        }, done);
+      }
+    ], callback);
+  };
+
   MongoStorage.prototype.getFile = function(container, filename, callback) {
     return this.db.collection('fs.files').findOne({
       'metadata.mongo-storage': true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-component-storage-mongo",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -21,6 +21,7 @@
   "author": "Jérémie Drouet <jeremie.drouet@gmail.com>",
   "license": "ISC",
   "dependencies": {
+    "async": "^1.5.2",
     "bluebird": "^3.0.6",
     "busboy": "^0.2.11",
     "debug": "^2.2.0",

source/index.coffee

@@ -1,4 +1,5 @@
 _           = require 'lodash'
+async       = require 'async'
 Busboy      = require 'busboy'
 DataSource  = require('loopback-datasource-juggler').DataSource
 debug       = require('debug') 'loopback:storage:mongo'
@@ -65,11 +66,12 @@ class MongoStorage
         files: files
 
   destroyContainer: (name, callback) ->
-    @db.collection 'fs.files'
-    .remove
-      'metadata.mongo-storage': true
-      'metadata.container': name
-    , callback
+    self = @
+    self.getFiles name, (err, files) ->
+      return callback err if err
+      async.each files, (file, done) ->
+        self.removeFileById file._id, done
+      , callback
 
   upload: (container, req, res, callback) ->
     self = @
@@ -113,13 +115,25 @@ class MongoStorage
       return callback err, files
 
   removeFile: (container, filename, callback) ->
-    @db.collection 'fs.files'
-    .remove
-      'metadata.mongo-storage': true
-      'metadata.container': container
-      'metadata.filename': filename
-    , (err) ->
-      return callback err
+    self = @
+    self.getFile container, filename, (err, file) ->
+      return callback err if err
+      self.removeFileById file._id, callback
+
+  removeFileById: (id, callback) ->
+    self = @
+    async.parallel [
+      (done) ->
+        self.db.collection 'fs.chunks'
+        .remove
+          files_id: id
+        , done
+      (done) ->
+        self.db.collection 'fs.files'
+        .remove
+          _id: id
+        , done
+    ], callback
 
   getFile: (container, filename, callback) ->
     @db.collection 'fs.files'