From d9d9ee9541699e33b29f470c76b9f36a9f025a16 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Tue, 30 Jul 2019 09:28:33 +0100 Subject: [PATCH] Merge pull request #2023 from overleaf/spd-fix-deleted-project-expiry Fix not-found error when cleaning up deleted projects GitOrigin-RevId: db3d0f8756319dbeb7ff753a8603cf61b9fb8a0c --- services/web/app/src/Features/Project/ProjectDeleter.js | 2 +- services/web/test/unit/src/Project/ProjectDeleterTests.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js index 084a3b9c4a..4a58cda4c6 100644 --- a/services/web/app/src/Features/Project/ProjectDeleter.js +++ b/services/web/app/src/Features/Project/ProjectDeleter.js @@ -103,7 +103,7 @@ const ProjectDeleter = { deletedProjects, function(deletedProject, cb) { ProjectDeleter.expireDeletedProject( - deletedProject.deletedProjectId, + deletedProject.deleterData.deletedProjectId, cb ) }, diff --git a/services/web/test/unit/src/Project/ProjectDeleterTests.js b/services/web/test/unit/src/Project/ProjectDeleterTests.js index f7dab8324e..32bda4d700 100644 --- a/services/web/test/unit/src/Project/ProjectDeleterTests.js +++ b/services/web/test/unit/src/Project/ProjectDeleterTests.js @@ -58,7 +58,8 @@ describe('ProjectDeleter', () => { .subtract(95, 'days') .toDate(), deleterId: '588f3ddae8ebc1bac07c9fa4', - deleterIpAddress: '172.19.0.1' + deleterIpAddress: '172.19.0.1', + deletedProjectId: '5cf9270b4eff6e186cf8b05e' }, project: { _id: '5cf9270b4eff6e186cf8b05e' @@ -359,7 +360,7 @@ describe('ProjectDeleter', () => { it('should call expireDeletedProject', done => { expect(this.ProjectDeleter.expireDeletedProject).to.have.been.calledWith( - this.deletedProjects[0].deletedProjectId + this.deletedProjects[0].deleterData.deletedProjectId ) done() })