Skip to content

Upgrade to Mongoose 9 #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daandtu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to Mongoose 9 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 22 additions & 34 deletions lib/sequence.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ module.exports = function SequenceFactory(connection) {
* @param {string} [options.collection_name='counters'] A name for the counter collection
* @param {boolean} [options.exclusive=true] Set False to allow sharing same Sequence with
* multiple Schemas.
* @param {boolean} [options.parallel_hooks] If true any hook will be registered as parallel
* @param {Number} [options.start_seq=1] The number to start the sequence on
* @param {Number} [options.inc_amount=1] The number to increment by
* @throws {Error} If id is missing for counter which referes other fields
Expand All @@ -45,7 +44,6 @@ module.exports = function SequenceFactory(connection) {
reference_fields: null,
disable_hooks: false,
collection_name: 'counters',
parallel_hooks: true,
exclusive: true,
};

Expand Down Expand Up @@ -218,37 +216,31 @@ module.exports = function SequenceFactory(connection) {
*/
Sequence.prototype._getPreSaveHook = function () {
const sequence = this;
return function (next, done) {
return function () {
const doc = this;
let cb = done;
if (!sequence._options.parallel_hooks) {
cb = next;
}
if (sequence._options.parallel_hooks) {
next();
}
if (!doc.isNew) {
cb();
return;
}
sequence._createCounter(doc, (createErr, createSeq) => {
if (createErr) {
cb(createErr);
return;
}
if (!_.isNull(createSeq)) {
doc.set(sequence._options.inc_field, createSeq);
cb();
} else {
sequence._setNextCounter(doc, (setError, setSeq) => {
if (setError) {
cb(setError);
return;
}
doc.set(sequence._options.inc_field, setSeq);
cb();
});
}
return new Promise((resolve, reject) => {
sequence._createCounter(doc, (createErr, createSeq) => {
if (createErr) {
reject(createErr);
return;
}
if (!_.isNull(createSeq)) {
doc.set(sequence._options.inc_field, createSeq);
resolve();
} else {
sequence._setNextCounter(doc, (setError, setSeq) => {
if (setError) {
reject(setError);
return;
}
doc.set(sequence._options.inc_field, setSeq);
resolve();
});
}
});
});
};
};
Expand All @@ -259,11 +251,7 @@ module.exports = function SequenceFactory(connection) {
* @method _setHooks
*/
Sequence.prototype._setHooks = function () {
if (this._options.parallel_hooks) {
this._schema.pre('save', true, this._getPreSaveHook());
} else {
this._schema.pre('save', this._getPreSaveHook());
}
this._schema.pre('save', this._getPreSaveHook());
};

/**
Expand Down
154 changes: 84 additions & 70 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-prettier": "^5.0.1",
"jest": "^29.7.0",
"mongoose": "8.0.3",
"mongoose": "9.1.0",
"prettier": "^3.1.1",
"sinon": "17.0.1"
},
"jest": {
"testEnvironment": "node"
}
}
}
Loading