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:
Phillip Thelen
2024-01-16 22:18:47 +01:00
committed by GitHub
parent d0e4b533e3
commit f8d315ff6e
189 changed files with 2645 additions and 1423 deletions

View File

@@ -6,48 +6,27 @@ import { TAVERN_ID } from '../../website/server/models/group';
// but you no longer have access to,
// like private parties or users
export async function checkExistence (collectionName, id) {
return new Promise((resolve, reject) => {
const collection = mongoose.connection.db.collection(collectionName);
collection.find({ _id: id }, { _id: 1 }).limit(1).toArray((findError, docs) => {
if (findError) return reject(findError);
const exists = docs.length > 0;
return resolve(exists);
});
});
const count = await mongoose.connection.db.collection(collectionName).countDocuments({ _id: id });
return count > 0;
}
// Obtain a property from the database. Useful if the property is private
// and thus unavailable to the client
export async function getProperty (collectionName, id, path) {
return new Promise((resolve, reject) => {
const collection = mongoose.connection.db.collection(collectionName);
collection.find({ _id: id }, { [path]: 1 }).limit(1).toArray((findError, docs) => {
if (findError) return reject(findError);
return resolve(get(docs[0], path));
});
});
const doc = await mongoose.connection.db.collection(collectionName)
.find({ _id: id }, { [path]: 1 }, { limit: 1 }).next();
return get(doc, path);
}
// Specifically helpful for the GET /groups tests,
// resets the db to an empty state and creates a tavern document
export async function resetHabiticaDB () {
return new Promise((resolve, reject) => {
mongoose.connection.dropDatabase(dbErr => {
if (dbErr) return reject(dbErr);
const groups = mongoose.connection.db.collection('groups');
const users = mongoose.connection.db.collection('users');
return users.count({ _id: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0' }, (err, count) => {
if (err) return reject(err);
if (count > 0) return resolve();
// create the leader for the tavern
return users.insertOne({
const groups = mongoose.connection.db.collection('groups');
const users = mongoose.connection.db.collection('users');
return mongoose.connection.dropDatabase()
.then(() => users.countDocuments({ _id: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0' })).then(count => {
if (count === 0) {
users.insertOne({
_id: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0',
apiToken: TAVERN_ID,
auth: {
@@ -59,79 +38,52 @@ export async function resetHabiticaDB () {
passwordHashMethod: 'bcrypt',
},
},
}, insertErr => {
if (insertErr) return reject(insertErr);
// For some mysterious reason after a dropDatabase there can still be a group...
return groups.count({ _id: TAVERN_ID }, (err2, count2) => {
if (err2) return reject(err2);
if (count2 > 0) return resolve();
return groups.insertOne({
_id: TAVERN_ID,
chat: [],
leader: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0', // Siena Leslie
name: 'HabitRPG',
type: 'guild',
privacy: 'public',
memberCount: 0,
}, insertErr2 => {
if (insertErr2) return reject(insertErr2);
return resolve();
});
});
});
});
}
}).then(() => groups.countDocuments({ _id: TAVERN_ID }))
.then(count => {
if (count === 0) {
groups.insertOne({
_id: TAVERN_ID,
chat: [],
leader: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0', // Siena Leslie
name: 'HabitRPG',
type: 'guild',
privacy: 'public',
memberCount: 0,
});
}
});
});
}
export async function updateDocument (collectionName, doc, update) {
const collection = mongoose.connection.db.collection(collectionName);
return new Promise(resolve => {
collection.updateOne({ _id: doc._id }, { $set: update }, updateErr => {
if (updateErr) throw new Error(`Error updating ${collectionName}: ${updateErr}`);
resolve();
});
});
return collection.updateOne({ _id: doc._id }, { $set: update });
}
// Unset a property in the database.
// Useful for testing.
export async function unsetDocument (collectionName, doc, update) {
const collection = mongoose.connection.db.collection(collectionName);
return new Promise(resolve => {
collection.updateOne({ _id: doc._id }, { $unset: update }, updateErr => {
if (updateErr) throw new Error(`Error updating ${collectionName}: ${updateErr}`);
resolve();
});
});
return collection.updateOne({ _id: doc._id }, { $unset: update });
}
export async function getDocument (collectionName, doc) {
const collection = mongoose.connection.db.collection(collectionName);
return new Promise(resolve => {
collection.findOne({ _id: doc._id }, (lookupErr, found) => {
if (lookupErr) throw new Error(`Error looking up ${collectionName}: ${lookupErr}`);
resolve(found);
});
});
return collection.findOne({ _id: doc._id });
}
before(done => {
mongoose.connection.on('open', err => {
if (err) return done(err);
return resetHabiticaDB()
.then(() => done())
.catch(done);
.then(() => {
done();
})
.catch(error => {
throw error;
});
});
});
after(done => mongoose.connection.dropDatabase(err => {
if (err) return done(err);
return mongoose.connection.close(done);
}));
after(() => mongoose.connection.dropDatabase());