BC-5829 - update mongoose for feathersjs 5

package.json

@@ -104,8 +104,10 @@
 	},
 	"dependencies": {
 		"@aws-sdk/lib-storage": "^3.100.0",
+		"@feathersjs/adapter-commons": "^5.0.12",
 		"@feathersjs/authentication": "^5.0.12",
 		"@feathersjs/authentication-local": "^5.0.12",
+		"@feathersjs/commons": "^5.0.12",
 		"@feathersjs/configuration": "^5.0.12",
 		"@feathersjs/errors": "^5.0.12",
 		"@feathersjs/express": "^5.0.12",
@@ -172,7 +174,6 @@
 		"express-openapi-validator": "^4.13.2",
 		"express-session": "^1.17.3",
 		"feathers-hooks-common": "^8.1.1",
-		"feathers-mongoose": "^6.3.0",
 		"feathers-swagger": "^3.0.0",
 		"file-type": "^18.5.0",
 		"freeport": "^1.0.5",
@@ -189,7 +190,7 @@
 		"mixwith": "^0.1.1",
 		"moment": "^2.19.2",
 		"mongodb-uri": "^0.9.7",
-		"mongoose": "^5.13.20",
+		"mongoose": "^6.12.3",
 		"mongoose-delete": "^0.5.4",
 		"mongoose-id-validator": "^0.6.0",
 		"mongoose-lean-virtuals": "^0.8.1",
@@ -239,6 +240,7 @@
 	"devDependencies": {
 		"@aws-sdk/client-s3": "^3.352.0",
 		"@faker-js/faker": "^8.0.2",
+		"@feathersjs/adapter-tests": "^5.0.12",
 		"@golevelup/ts-jest": "^0.3.4",
 		"@jest-mock/express": "^1.4.5",
 		"@nestjs/cli": "^10.1.17",

scripts/endLdapSchoolYear.js

@@ -21,7 +21,7 @@ appPromise
 			)
 			.exec();
 
-		info(`LDAP Schools ended their Maintenance mode: ${resultLdapSchools.nModified} schools updated`);
+		info(`LDAP Schools ended their Maintenance mode: ${resultLdapSchools.modifiedCount} schools updated`);
 
 		return process.exit(0);
 	})

scripts/startNewSchoolYear.js

@@ -38,7 +38,7 @@ appPromise
 				{ inMaintenanceSince: MAINTENANCE_START_DATE }
 			)
 			.exec();
-		info(`LDAP Schools set in Maintenance mode: ${resultLdapSchools.nModified} schools updated`);
+		info(`LDAP Schools set in Maintenance mode: ${resultLdapSchools.modifiedCount} schools updated`);
 
 		const resultNonLdapSchools = await schoolModel
 			.updateMany(
@@ -50,7 +50,7 @@ appPromise
 				{ currentYear: nextSchoolYearId._id }
 			)
 			.exec();
-		info(`Non-LDAP Schools changed year: ${resultNonLdapSchools.nModified} schools updated`);
+		info(`Non-LDAP Schools changed year: ${resultNonLdapSchools.modifiedCount} schools updated`);
 
 		return process.exit(0);
 	})

src/components/helper/repo.helper.js

@@ -1,30 +1,31 @@
 const { error } = require('../../logger');
 
 /**
+ * https://mongoosejs.com/docs/6.x/docs/migrating_to_6.html#mongodb-driver-40
  * Converts an mongoose update many result to an internal TO
- * @param {*} param0
- * @param {1|0} param0.ok 0 for error
- * @param {Integer} param0.n Number of elements matched the given filter
- * @param {Integer} param0.nModified Number of elements updated
+ * @param {Integer} matchedCount; // Number of documents matched
+ * @param {Integer} modifiedCount; // Number of documents modified
+ * @param {Boolean} acknowledged; // Boolean indicating everything went smoothly.
+ * @param {null|string} upsertedId; // null or an id containing a document that had to be upserted.
+ * @param {Integer} upsertedCount; // Number indicating how many documents had to be upserted. Will either be 0 or 1.
  */
-const updateManyResult = ({ ok, n, nModified }) => {
-	if (ok !== 1) {
-		error('mongoose updateMany has failed', { ok, n, nModified });
+const updateManyResult = ({ acknowledged, matchedCount, modifiedCount }) => {
+	if (acknowledged) {
+		error('mongoose updateMany has failed', { acknowledged, matchedCount, modifiedCount });
 	}
-	return { success: ok === 1, modifiedDocuments: nModified };
+	return { success: acknowledged, modifiedDocuments: modifiedCount };
 };
 
 /**
+ * https://mongoosejs.com/docs/6.x/docs/migrating_to_6.html#mongodb-driver-40
  * Converts an mongoose delete many result to an internal TO
- * @param {*} param0
- * @param {1|0} param0.ok 0 for error
- * @param {Integer} param0.n Number of elements matched the given filter
- * @param {Integer} param0.deletedCount Number of elements deleted
+ * @param {Boolean} acknowledged; // Boolean indicating everything went smoothly.
+ * @param {Integer} deletedCount Number of elements deleted
  */
-const deleteManyResult = ({ ok, n, deletedCount }) => {
-	if (ok !== 1) {
-		error('mongoose deleteMany has failed', { ok, n, deletedCount });
+const deleteManyResult = ({ acknowledged, deletedCount }) => {
+	if (!acknowledged) {
+		error('mongoose deleteMany has failed', { acknowledged, deletedCount });
 	}
-	return { success: ok === 1, deletedDocuments: deletedCount };
+	return { success: acknowledged, deletedDocuments: deletedCount };
 };
 module.exports = { updateManyResult, deleteManyResult };

src/components/task/repo/task.repo.integration.test.js

@@ -116,7 +116,7 @@ const db = {};
 // TODO move to homeworks/submission repository, test it there and reuse it here only
 db.findHomeworks = (userId) => HomeworkModel.find({ teacherId: userId }).lean().exec();
 db.findGroupSubmissions = (userId) => SubmissionModel.find({ teamMembers: userId }).lean().exec();
-db.findSubmissions = (userId) => SubmissionModel.find({ stundentId: userId }).lean().exec();
+db.findSubmissions = (userId) => SubmissionModel.find({ studentId: userId }).lean().exec();
 db.findArchivedHomework = (userId) => HomeworkModel.find({ archived: userId }).lean().exec();
 // TODO find solution without cleanup it before
 db.cleanupUnexpectedHomeworks = () =>

src/components/user/repo/user.repo.js

@@ -31,10 +31,10 @@ const replaceUserWithTombstone = async (id, replaceData = {}) => {
 	)
 		.lean()
 		.exec();
-	if (replaceResult.n !== 1) {
+	if (replaceResult.modifiedCount !== 1) {
 		throw new NotFound('could not find user to replace with tombstone');
 	}
-	if (replaceResult.ok !== 1 || replaceResult.nModified !== 1) {
+	if (!replaceResult.acknowledged || replaceResult.modifiedCount !== 1) {
 		throw new GeneralError('db error during replacement of user with tombstone');
 	}
 	return getUser(id);

src/hooks/index.js

@@ -396,6 +396,7 @@ exports.enableQuery = (context) => {
 	if (context.id) {
 		context.params.query = context.params.query || {};
 		context.params.query._id = context.id;
+		context.params.adapter = { multi: ['patch', 'remove'] };
 		context.id = null;
 	}
 };

src/services/activation/services/ActivationModelService.js

@@ -1,4 +1,4 @@
-const feathersMongooseService = require('feathers-mongoose');
+const feathersMongooseService = require('../../../utils/feathers-mongoose');
 const auth = require('@feathersjs/authentication');
 const { iff, isProvider, disallow } = require('feathers-hooks-common');
 const { activationModel } = require('../model');

src/services/activation/utils/generalUtils.js

@@ -25,7 +25,7 @@ const STATE = {
  */
 const deleteEntry = async (ref, entryId) => {
 	try {
-		const res = await (ref.app || ref).service('activationModel').remove({ _id: entryId });
+		const res = await (ref.app || ref).service('activationModel').remove(entryId);
 		return res;
 	} catch (error) {
 		/* eslint-disable-next-line */
@@ -42,14 +42,11 @@ const deleteEntry = async (ref, entryId) => {
  * @returns	{Object}			changed entry
  */
 const setEntryState = async (ref, entryId, state) => {
-	const entry = await (ref.app || ref).service('activationModel').patch(
-		{ _id: entryId },
-		{
-			$set: {
-				state,
-			},
-		}
-	);
+	const entry = await (ref.app || ref).service('activationModel').patch(entryId, {
+		$set: {
+			state,
+		},
+	});
 	return entry;
 };
 
@@ -166,14 +163,11 @@ const sendMail = async (ref, mail, entry) => {
 			content: mail.content,
 		});
 
-		await ref.app.service('activationModel').patch(
-			{ _id: entry._id },
-			{
-				$push: {
-					mailSent: Date.now(),
-				},
-			}
-		);
+		await ref.app.service('activationModel').patch(entry._id, {
+			$push: {
+				mailSent: Date.now(),
+			},
+		});
 	} catch (error) {
 		if (entry.mailSent.length === 0) await deleteEntry(ref, entry._id);
 		throw new Error('Can not send mail with activation link');

src/services/base64Files/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/consent/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/content/index.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 const material = require('./material-model');

src/services/datasources/services/datasources.js

@@ -1,5 +1,5 @@
 const Ajv = require('ajv');
-const service = require('feathers-mongoose');
+const service = require('../../../utils/feathers-mongoose');
 const { authenticate } = require('@feathersjs/authentication');
 const { iff, isProvider, validateSchema, disallow } = require('feathers-hooks-common');
 const { datasourceModel } = require('../model');

src/services/federalState/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/fileStorage/model-service.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { FileModel } = require('./model');
 const hooks = require('./hooks/model-hooks');
 

src/services/helpdesk/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/homework/model-service.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { homeworkModel, submissionModel } = require('./model');
 const hooks = require('./hooks');
 const submissionHooks = require('./hooks/submissions');

src/services/lesson/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/link/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 const { Configuration } = require('@hpi-schul-cloud/commons');
 const queryString = require('qs');
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 const { BadRequest } = require('@feathersjs/errors');

src/services/ltiTool/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { authenticate } = require('@feathersjs/authentication');
 const fs = require('fs');
 const jwt = require('jsonwebtoken');

src/services/news/events/index.js

@@ -7,6 +7,7 @@ const removeTeamNews = (app) => async (deletedTeam) => {
 				target: deletedTeam._id,
 				targetModel: 'teams',
 			},
+			adapter: { multi: ['remove'] },
 		});
 	} catch (e) {
 		logger.warning(`Cannot remove news for team ${deletedTeam._id}`, e);

src/services/news/index.js

@@ -4,7 +4,7 @@
  * The public API has been moved to apps/server/src/modules/news
  */
 
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 
 const { newsModel } = require('./model');
 const newsModelHooks = require('./hooks/newsModel.hooks');

src/services/pseudonym/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/releases/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const request = require('request-promise-native');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');

src/services/role/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/school/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { Configuration } = require('@hpi-schul-cloud/commons');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');

src/services/serviceTemplate/services/modelService.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../../utils/feathers-mongoose');
 const Ajv = require('ajv');
 const auth = require('@feathersjs/authentication');
 const { iff, isProvider, validateSchema, disallow } = require('feathers-hooks-common');

src/services/storageProvider/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/sync/strategies/TSP/SchoolChange.js

@@ -42,6 +42,7 @@ const grantAccessToPrivateFiles = async (app, oldUser, newUser) => {
 			refOwnerModel: 'user',
 			owner: oldUser._id,
 		},
+		adapter: { multi: ['patch'] },
 	};
 	const updateData = {
 		owner: newUser._id,

src/services/system/index.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/teams/helpers.js

@@ -77,7 +77,7 @@ const getTeam = (refClass, teamId) => {
 	// todo: app to this -> this.app
 	const populateParams = {
 		query: {
-			$populate: [{ path: 'roles' }, { path: 'userIds.userId' }],
+			$populate: [{ path: 'userIds.userId' }],
 		},
 	};
 	return refClass.app

src/services/teams/index.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { Configuration } = require('@hpi-schul-cloud/commons');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');

src/services/teams/model.js

@@ -51,6 +51,7 @@ const teamsSchema = getUserGroupSchema({
 	color: { type: String, default: '#ACACAC' },
 	features: [{ type: String, enum: Object.values(TEAM_FEATURES) }],
 	filePermission: [permissionSchema],
+	ltiToolIds: [{ type: Schema.Types.ObjectId, required: true, ref: 'ltiTool' }],
 });
 
 /*

src/services/user-group/hooks/courses.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const { Configuration } = require('@hpi-schul-cloud/commons/lib');
-const { service } = require('feathers-mongoose');
+const { service } = require('../../../utils/feathers-mongoose');
 
 const { BadRequest } = require('../../../errors');
 const globalHooks = require('../../../hooks');

src/services/user-group/services/classModelService.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../../utils/feathers-mongoose');
 const { iff, isProvider, disallow } = require('feathers-hooks-common');
 const auth = require('@feathersjs/authentication');
 

src/services/user-group/services/courseGroupModelService.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../../utils/feathers-mongoose');
 const { iff, isProvider, disallow } = require('feathers-hooks-common');
 const auth = require('@feathersjs/authentication');
 

src/services/user-group/services/courseModelService.js

@@ -1,4 +1,4 @@
-const service = require('feathers-mongoose');
+const service = require('../../../utils/feathers-mongoose');
 const { iff, isProvider, disallow } = require('feathers-hooks-common');
 const auth = require('@feathersjs/authentication');
 

src/services/user/index.js

@@ -1,5 +1,5 @@
 const hooks = require('feathers-hooks-common');
-const service = require('feathers-mongoose');
+const service = require('../../utils/feathers-mongoose');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 

src/services/user/services/AdminUsers.js

@@ -192,6 +192,7 @@ class AdminUsers {
 			await this.updateAccount(email, _id);
 		}
 
+		params.adapter = { multi: ['patch'] };
 		// _id is part of params and will be combined with the schoolId
 		const createdUsers = await this.prepareRoleback(email, _id, () =>
 			this.app.service('usersModel').patch(null, _data, params)