Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #494 from braydonf/frameslimit
Browse files Browse the repository at this point in the history
Limit query for frames
  • Loading branch information
braydonf authored Aug 16, 2017
2 parents 19b02de + 0c0bfeb commit f3cd773
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/server/routes/frames.js
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ FramesRouter.prototype.destroyFrameById = function(req, res, next) {
FramesRouter.prototype.getFrames = function(req, res, next) {
const Frame = this.storage.models.Frame;

Frame.find({ user: req.user._id }, function(err, frames) {
Frame.find({ user: req.user._id }).limit(10).exec(function(err, frames) {
if (err) {
return next(new errors.InternalError(err.message));
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"storj-service-error-types": "^1.2.0",
"storj-service-mailer": "^1.0.0",
"storj-service-middleware": "^1.3.1",
"storj-service-storage-models": "^8.22.2",
"storj-service-storage-models": "^8.22.3",
"through": "^2.3.8"
}
}
12 changes: 10 additions & 2 deletions test/server/routes/frames.unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,11 @@ describe('FramesRouter', function() {
var _frameFind = sinon.stub(
framesRouter.storage.models.Frame,
'find'
).callsArgWith(1, new Error('Panic!'));
).returns({
limit: sinon.stub().returns({
exec: sinon.stub().callsArgWith(0, new Error('Panic!'))
})
});
framesRouter.getFrames(request, response, function(err) {
_frameFind.restore();
expect(err.message).to.equal('Panic!');
Expand All @@ -2032,7 +2036,11 @@ describe('FramesRouter', function() {
var _frameFind = sinon.stub(
framesRouter.storage.models.Frame,
'find'
).callsArgWith(1, null, [frame1, frame2]);
).returns({
limit: sinon.stub().returns({
exec: sinon.stub().callsArgWith(0, null, [frame1, frame2])
})
});
response.on('end', function() {
_frameFind.restore();
expect(response._getData()).to.have.lengthOf(2);
Expand Down

0 comments on commit f3cd773

Please sign in to comment.