mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
Upgrade to mongoose 7 (#14971)
* remove some unused dependencies * update mongoose version * make common tests pass * Make unit tests pass * make api v3 integration tests pass * fix lint issues * fix issue with package-lock * fix(lint): we don't need no .js * fix(lint): update to latest config-habitrpg * chore(npm): update package locks * fix(test): replace deprecated fn * chore(package): update eslint-habitrpg again * fix(lint): server linting * fix(lint): client linting * fix(client): correct mangled common imports * chore(npm): update package-locks * fix(lint): punctuation, module --------- Co-authored-by: SabreCat <sabrecat@gmail.com> Co-authored-by: SabreCat <sabe@habitica.com>
This commit is contained in:
@@ -30,7 +30,7 @@ async function checkForActiveCron (user, now) {
|
||||
|
||||
// If the cron signature is already set, cron is running in another request
|
||||
// throw an error and recover later,
|
||||
if (userUpdateResult.nMatched === 0 || userUpdateResult.nModified === 0) {
|
||||
if (userUpdateResult.matchedCount === 0 || userUpdateResult.modifiedCount === 0) {
|
||||
throw new Error('CRON_ALREADY_RUNNING');
|
||||
}
|
||||
}
|
||||
@@ -72,7 +72,6 @@ async function cronAsync (req, res) {
|
||||
await unlockUser(user);
|
||||
return null;
|
||||
}
|
||||
|
||||
const tasks = await Tasks.Task.find({
|
||||
userId: user._id,
|
||||
$or: [ // Exclude completed todos
|
||||
@@ -100,7 +99,7 @@ async function cronAsync (req, res) {
|
||||
// Clear old completed todos - 30 days for free users, 90 for subscribers
|
||||
// Do not delete challenges completed todos TODO unless the task is broken?
|
||||
// Do not delete group completed todos
|
||||
Tasks.Task.remove({
|
||||
Tasks.Task.deleteMany({
|
||||
userId: user._id,
|
||||
type: 'todo',
|
||||
completed: true,
|
||||
|
||||
Reference in New Issue
Block a user