Merge pull request #2499 from overleaf/revert-2496-cmg-clear-leaving-archived

Revert "Clear archived/trashed status when leaving a project"

GitOrigin-RevId: b6a72b59b95b6783ed19d3dd7e41ac6ce1064a76

services/web/app/src/Features/Collaborators/CollaboratorsHandler.js

@@ -2,7 +2,6 @@ const { callbackify } = require('util')
 const OError = require('@overleaf/o-error')
 const { Project } = require('../../models/Project')
 const ProjectGetter = require('../Project/ProjectGetter')
-const ProjectHelper = require('../Project/ProjectHelper')
 const logger = require('logger-sharelatex')
 const ContactManager = require('../Contacts/ContactManager')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
@@ -28,47 +27,17 @@ module.exports = {
 
 async function removeUserFromProject(projectId, userId) {
   try {
-    const project = await Project.findOne({ _id: projectId }).exec()
-
-    // Deal with the old type of boolean value for archived
-    // In order to clear it
-    if (typeof project.archived === 'boolean') {
-      let archived = ProjectHelper.calculateArchivedArray(
-        project,
-        userId,
-        'ARCHIVE'
-      )
-
-      archived = archived.filter(id => id.toString() !== userId.toString())
-
-      await Project.update(
-        { _id: projectId },
-        {
-          $set: { archived: archived },
-          $pull: {
-            collaberator_refs: userId,
-            readOnly_refs: userId,
-            tokenAccessReadOnly_refs: userId,
-            tokenAccessReadAndWrite_refs: userId,
-            trashed: userId
-          }
-        }
-      )
-    } else {
-      await Project.update(
-        { _id: projectId },
-        {
-          $pull: {
-            collaberator_refs: userId,
-            readOnly_refs: userId,
-            tokenAccessReadOnly_refs: userId,
-            tokenAccessReadAndWrite_refs: userId,
-            archived: userId,
-            trashed: userId
-          }
+    await Project.update(
+      { _id: projectId },
+      {
+        $pull: {
+          collaberator_refs: userId,
+          readOnly_refs: userId,
+          tokenAccessReadOnly_refs: userId,
+          tokenAccessReadAndWrite_refs: userId
         }
-      )
-    }
+      }
+    ).exec()
   } catch (err) {
     throw new OError({
       message: 'problem removing user from project collaborators',

services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js

@@ -27,16 +27,6 @@ describe('CollaboratorsHandler', function() {
       _id: ObjectId()
     }
 
-    this.archivedProject = {
-      _id: ObjectId(),
-      archived: [ObjectId(this.userId)]
-    }
-
-    this.oldArchivedProject = {
-      _id: ObjectId(),
-      archived: true
-    }
-
     this.UserGetter = {
       promises: {
         getUser: sinon.stub().resolves(null)
@@ -56,10 +46,6 @@ describe('CollaboratorsHandler', function() {
         getProject: sinon.stub().resolves(this.project)
       }
     }
-
-    this.ProjectHelper = {
-      calculateArchivedArray: sinon.stub()
-    }
     this.CollaboratorsGetter = {
       promises: {
         getProjectsUserIsMemberOf: sinon.stub()
@@ -76,7 +62,6 @@ describe('CollaboratorsHandler', function() {
         '../../models/Project': { Project },
         '../ThirdPartyDataStore/TpdsProjectFlusher': this.TpdsProjectFlusher,
         '../Project/ProjectGetter': this.ProjectGetter,
-        '../Project/ProjectHelper': this.ProjectHelper,
         '../Errors/Errors': Errors,
         './CollaboratorsGetter': this.CollaboratorsGetter
       }
@@ -88,115 +73,29 @@ describe('CollaboratorsHandler', function() {
   })
 
   describe('removeUserFromProject', function() {
-    describe('a non-archived project', function() {
-      beforeEach(function() {
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: this.project._id
-          })
-          .chain('exec')
-          .resolves(this.project)
-      })
-
-      it('should remove the user from mongo', async function() {
-        this.ProjectMock.expects('update')
-          .withArgs(
-            {
-              _id: this.project._id
-            },
-            {
-              $pull: {
-                collaberator_refs: this.userId,
-                readOnly_refs: this.userId,
-                tokenAccessReadOnly_refs: this.userId,
-                tokenAccessReadAndWrite_refs: this.userId,
-                archived: this.userId,
-                trashed: this.userId
-              }
-            }
-          )
-          .chain('exec')
-          .resolves()
-        await this.CollaboratorsHandler.promises.removeUserFromProject(
-          this.project._id,
-          this.userId
-        )
-      })
-    })
-
-    describe('an archived project, archived with a boolean value', function() {
-      beforeEach(function() {
-        let archived = [ObjectId(this.userId)]
-        this.ProjectHelper.calculateArchivedArray.returns(archived)
-
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: this.oldArchivedProject._id
-          })
-          .chain('exec')
-          .resolves(this.oldArchivedProject)
-      })
-
-      it('should remove the user from mongo', async function() {
-        this.ProjectMock.expects('update')
-          .withArgs(
-            {
-              _id: this.oldArchivedProject._id
-            },
-            {
-              $set: {
-                archived: []
-              },
-              $pull: {
-                collaberator_refs: this.userId,
-                readOnly_refs: this.userId,
-                tokenAccessReadOnly_refs: this.userId,
-                tokenAccessReadAndWrite_refs: this.userId,
-                trashed: this.userId
-              }
-            }
-          )
-          .resolves()
-        await this.CollaboratorsHandler.promises.removeUserFromProject(
-          this.oldArchivedProject._id,
-          this.userId
-        )
-      })
-    })
+    beforeEach(function() {})
 
-    describe('an archived project, archived with an array value', function() {
-      beforeEach(function() {
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: this.archivedProject._id
-          })
-          .chain('exec')
-          .resolves(this.archivedProject)
-      })
-
-      it('should remove the user from mongo', async function() {
-        this.ProjectMock.expects('update')
-          .withArgs(
-            {
-              _id: this.archivedProject._id
-            },
-            {
-              $pull: {
-                collaberator_refs: this.userId,
-                readOnly_refs: this.userId,
-                tokenAccessReadOnly_refs: this.userId,
-                tokenAccessReadAndWrite_refs: this.userId,
-                archived: this.userId,
-                trashed: this.userId
-              }
+    it('should remove the user from mongo', async function() {
+      this.ProjectMock.expects('update')
+        .withArgs(
+          {
+            _id: this.project._id
+          },
+          {
+            $pull: {
+              collaberator_refs: this.userId,
+              readOnly_refs: this.userId,
+              tokenAccessReadOnly_refs: this.userId,
+              tokenAccessReadAndWrite_refs: this.userId
             }
-          )
-          .resolves()
-        await this.CollaboratorsHandler.promises.removeUserFromProject(
-          this.archivedProject._id,
-          this.userId
+          }
         )
-      })
+        .chain('exec')
+        .resolves()
+      await this.CollaboratorsHandler.promises.removeUserFromProject(
+        this.project._id,
+        this.userId
+      )
     })
   })
 
@@ -341,13 +240,6 @@ describe('CollaboratorsHandler', function() {
         'token-read-only-1'
       ]
       for (const projectId of expectedProjects) {
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: projectId
-          })
-          .chain('exec')
-          .resolves({ _id: projectId })
-
         this.ProjectMock.expects('update')
           .withArgs(
             {
@@ -358,12 +250,11 @@ describe('CollaboratorsHandler', function() {
                 collaberator_refs: this.userId,
                 readOnly_refs: this.userId,
                 tokenAccessReadOnly_refs: this.userId,
-                tokenAccessReadAndWrite_refs: this.userId,
-                archived: this.userId,
-                trashed: this.userId
+                tokenAccessReadAndWrite_refs: this.userId
               }
             }
           )
+          .chain('exec')
           .resolves()
       }
       await this.CollaboratorsHandler.promises.removeUserFromAllProjects(