Merge pull request #2584 from overleaf/spd-duplicate-deleted-things

Prevent creation of (and clean up) duplicate deletedUsers and deletedProjects

GitOrigin-RevId: 5e52578b514f05779290c61cf7d4e630cc3ba6f7

services/web/test/unit/src/Project/ProjectDeleterTests.js

@@ -287,11 +287,15 @@ describe('ProjectDeleter', function() {
       this.ProjectMock.expects('remove')
         .chain('exec')
         .resolves()
-      this.DeletedProjectMock.expects('create')
-        .withArgs({
-          project: this.project,
-          deleterData: this.deleterData
-        })
+      this.DeletedProjectMock.expects('update')
+        .withArgs(
+          { 'deleterData.deletedProjectId': this.project._id },
+          {
+            project: this.project,
+            deleterData: this.deleterData
+          },
+          { upsert: true }
+        )
         .resolves()
 
       this.ProjectDeleter.deleteProject(
@@ -309,7 +313,7 @@ describe('ProjectDeleter', function() {
       this.ProjectMock.expects('remove')
         .chain('exec')
         .resolves()
-      this.DeletedProjectMock.expects('create').resolves()
+      this.DeletedProjectMock.expects('update').resolves()
 
       this.ProjectDeleter.deleteProject(
         this.project_id,
@@ -327,7 +331,7 @@ describe('ProjectDeleter', function() {
       this.ProjectMock.expects('remove')
         .chain('exec')
         .resolves()
-      this.DeletedProjectMock.expects('create').resolves()
+      this.DeletedProjectMock.expects('update').resolves()
 
       this.ProjectDeleter.deleteProject(this.project_id, () => {
         sinon.assert.calledWith(
@@ -349,7 +353,7 @@ describe('ProjectDeleter', function() {
         .withArgs({ _id: this.project_id })
         .chain('exec')
         .resolves()
-      this.DeletedProjectMock.expects('create').resolves()
+      this.DeletedProjectMock.expects('update').resolves()
 
       this.ProjectDeleter.deleteProject(this.project_id, () => {
         this.ProjectMock.verify()