github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-17 21:05:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle removal of mongoose callback API for UserMemberships

Browse source 
GitOrigin-RevId: 0bdfaf4bfb357d75ee05513cf524540eef7fcec4
This commit is contained in:
andrew rumble 2024-08-02 17:34:03 +01:00 committed by Copybot
parent 330868ff0c
commit 4e2bfd58a1
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
services/web/app/src/Features/UserMembership/UserMembershipsHandler.js
View file

@ -51,11 +51,10 @@ const UserMembershipsHandler = {
} }
const removeOperation = { $pull: {} } const removeOperation = { $pull: {} }
removeOperation.$pull[entityConfig.fields.write] = userId removeOperation.$pull[entityConfig.fields.write] = userId
EntityModels[entityConfig.modelName].updateMany( EntityModels[entityConfig.modelName]
{}, .updateMany({}, removeOperation)
removeOperation, .then(result => callback(null, result))
callback .catch(callback)
)
}, },
getEntitiesByUser(entityConfig, userId, callback) { getEntitiesByUser(entityConfig, userId, callback) {
@ -64,22 +63,19 @@ const UserMembershipsHandler = {
} }
const query = Object.assign({}, entityConfig.baseQuery) const query = Object.assign({}, entityConfig.baseQuery)
query[entityConfig.fields.access] = userId query[entityConfig.fields.access] = userId
EntityModels[entityConfig.modelName].find( EntityModels[entityConfig.modelName]
query, .find(query)
function (error, entities) { .then(entities => {
if (entities == null) { if (entities == null) {
entities = [] entities = []
} }
if (error != null) {
return callback(error)
}
async.mapSeries( async.mapSeries(
entities, entities,
(entity, cb) => entity.fetchV1Data(cb), (entity, cb) => entity.fetchV1Data(cb),
callback callback
) )
} })
) .catch(callback)
}, },
} }

6
services/web/test/unit/src/UserMembership/UserMembershipsHandlerTests.js
View file

@ -21,9 +21,9 @@ describe('UserMembershipsHandler', function () {
beforeEach(function () { beforeEach(function () {
this.user = { _id: new ObjectId() } this.user = { _id: new ObjectId() }
this.Institution = { updateMany: sinon.stub().yields(null) } this.Institution = { updateMany: sinon.stub().resolves(null) }
this.Subscription = { updateMany: sinon.stub().yields(null) } this.Subscription = { updateMany: sinon.stub().resolves(null) }
this.Publisher = { updateMany: sinon.stub().yields(null) } this.Publisher = { updateMany: sinon.stub().resolves(null) }
return (this.UserMembershipsHandler = SandboxedModule.require(modulePath, { return (this.UserMembershipsHandler = SandboxedModule.require(modulePath, {
requires: { requires: {
'../../models/Institution': { '../../models/Institution': {