[web] remove deledFiles collection (#25750)

* [history-v1] remove processing of deleted files when back-filling hashes

* [web] remove deledFiles collection

GitOrigin-RevId: 7c080e564f7d7acb33ebe7ebe012f415a847d0df

services/web/app/src/Features/Project/ProjectDeleter.js

@@ -324,19 +324,6 @@ async function undeleteProject(projectId, options = {}) {
     })
     restored.deletedDocs = []
   }
-  if (restored.deletedFiles && restored.deletedFiles.length > 0) {
-    filterDuplicateDeletedFilesInPlace(restored)
-    const deletedFiles = restored.deletedFiles.map(file => {
-      // break free from the model
-      file = file.toObject()
-
-      // add projectId
-      file.projectId = projectId
-      return file
-    })
-    await db.deletedFiles.insertMany(deletedFiles)
-    restored.deletedFiles = []
-  }
 
   // we can't use Mongoose to re-insert the project, as it won't
   // create a new document with an _id already specified. We need to
@@ -388,7 +375,6 @@ async function expireDeletedProject(projectId) {
       ),
       FilestoreHandler.promises.deleteProject(deletedProject.project._id),
       ChatApiHandler.promises.destroyProject(deletedProject.project._id),
-      hardDeleteDeletedFiles(deletedProject.project._id),
       ProjectAuditLogEntry.deleteMany({ projectId }),
       Modules.promises.hooks.fire('projectExpired', deletedProject.project._id),
     ])
@@ -409,31 +395,3 @@ async function expireDeletedProject(projectId) {
     throw error
   }
 }
-
-function filterDuplicateDeletedFilesInPlace(project) {
-  const fileIds = new Set()
-  project.deletedFiles = project.deletedFiles.filter(file => {
-    const id = file._id.toString()
-    if (fileIds.has(id)) return false
-    fileIds.add(id)
-    return true
-  })
-}
-
-let deletedFilesProjectIdIndexExist
-async function doesDeletedFilesProjectIdIndexExist() {
-  if (typeof deletedFilesProjectIdIndexExist !== 'boolean') {
-    // Resolve this about once. No need for locking or retry handling.
-    deletedFilesProjectIdIndexExist =
-      await db.deletedFiles.indexExists('projectId_1')
-  }
-  return deletedFilesProjectIdIndexExist
-}
-
-async function hardDeleteDeletedFiles(projectId) {
-  if (!(await doesDeletedFilesProjectIdIndexExist())) {
-    // Running the deletion command w/o index would kill mongo performance
-    return
-  }
-  return db.deletedFiles.deleteMany({ projectId })
-}

services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js

@@ -15,7 +15,6 @@ const ProjectGetter = require('./ProjectGetter')
 const ProjectLocator = require('./ProjectLocator')
 const FolderStructureBuilder = require('./FolderStructureBuilder')
 const SafePath = require('./SafePath')
-const { DeletedFile } = require('../../models/DeletedFile')
 const { iterablePaths } = require('./IterablePath')
 
 const LOCK_NAMESPACE = 'mongoTransaction'
@@ -72,7 +71,6 @@ module.exports = {
     'changes',
   ]),
   createNewFolderStructure: callbackify(wrapWithLock(createNewFolderStructure)),
-  _insertDeletedFileReference: callbackify(_insertDeletedFileReference),
   _putElement: callbackifyMultiResult(_putElement, ['result', 'project']),
   _confirmFolder,
   promises: {
@@ -87,7 +85,6 @@ module.exports = {
     deleteEntity: wrapWithLock(deleteEntity),
     renameEntity: wrapWithLock(renameEntity),
     createNewFolderStructure: wrapWithLock(createNewFolderStructure),
-    _insertDeletedFileReference,
     _putElement,
   },
 }
@@ -162,7 +159,6 @@ async function replaceFileWithNew(projectId, fileId, newFileRef, userId) {
     element_id: fileId,
     type: 'file',
   })
-  await _insertDeletedFileReference(projectId, fileRef)
   const newProject = await Project.findOneAndUpdate(
     { _id: project._id, [path.mongo]: { $exists: true } },
     {
@@ -480,17 +476,6 @@ async function renameEntity(projectId, entityId, entityType, newName, userId) {
   }
 }
 
-async function _insertDeletedFileReference(projectId, fileRef) {
-  await DeletedFile.create({
-    projectId,
-    _id: fileRef._id,
-    name: fileRef.name,
-    linkedFileData: fileRef.linkedFileData,
-    hash: fileRef.hash,
-    deletedAt: new Date(),
-  })
-}
-
 async function _removeElementFromMongoArray(
   modelId,
   path,

services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js

@@ -1627,8 +1627,6 @@ const ProjectEntityUpdateHandler = {
           entry.path,
           userId
         )
-      } else if (entry.type === 'file') {
-        await ProjectEntityUpdateHandler._cleanUpFile(project, entry.entity)
       }
     }
     return subtreeListing
@@ -1679,13 +1677,6 @@ const ProjectEntityUpdateHandler = {
 
     return await DocumentUpdaterHandler.promises.deleteDoc(projectId, docId)
   },
-
-  async _cleanUpFile(project, file) {
-    return await ProjectEntityMongoUpdateHandler.promises._insertDeletedFileReference(
-      project._id,
-      file
-    )
-  },
 }
 
 /**

services/web/app/src/infrastructure/mongodb.js

@@ -33,7 +33,6 @@ addConnectionDrainer('mongodb', async () => {
 const internalDb = mongoClient.db()
 const db = {
   contacts: internalDb.collection('contacts'),
-  deletedFiles: internalDb.collection('deletedFiles'),
   deletedProjects: internalDb.collection('deletedProjects'),
   deletedSubscriptions: internalDb.collection('deletedSubscriptions'),
   deletedUsers: internalDb.collection('deletedUsers'),

services/web/app/src/models/DeletedFile.js

@@ -1,21 +0,0 @@
-const mongoose = require('../infrastructure/Mongoose')
-const { Schema } = mongoose
-
-const DeletedFileSchema = new Schema(
-  {
-    name: String,
-    projectId: Schema.ObjectId,
-    created: {
-      type: Date,
-    },
-    linkedFileData: { type: Schema.Types.Mixed },
-    hash: {
-      type: String,
-    },
-    deletedAt: { type: Date },
-  },
-  { collection: 'deletedFiles', minimize: false }
-)
-
-exports.DeletedFile = mongoose.model('DeletedFile', DeletedFileSchema)
-exports.DeletedFileSchema = DeletedFileSchema

services/web/app/src/models/Project.js

@@ -12,18 +12,6 @@ const DeletedDocSchema = new Schema({
   deletedAt: { type: Date },
 })
 
-const DeletedFileSchema = new Schema({
-  name: String,
-  created: {
-    type: Date,
-  },
-  linkedFileData: { type: Schema.Types.Mixed },
-  hash: {
-    type: String,
-  },
-  deletedAt: { type: Date },
-})
-
 const ProjectSchema = new Schema(
   {
     name: { type: String, default: 'new project' },
@@ -54,7 +42,6 @@ const ProjectSchema = new Schema(
     archived: { type: Schema.Types.Mixed },
     trashed: [{ type: ObjectId, ref: 'User' }],
     deletedDocs: [DeletedDocSchema],
-    deletedFiles: [DeletedFileSchema],
     imageName: { type: String },
     brandVariationId: { type: String },
     track_changes: { type: Object },

services/web/migrations/20210310111225_create_deletedFiles_projectId_index.mjs

@@ -1,4 +1,5 @@
 import Helpers from './lib/helpers.mjs'
+import { getCollectionInternal } from '../app/src/infrastructure/mongodb.js'
 
 const tags = ['server-ce', 'server-pro', 'saas']
 
@@ -11,14 +12,17 @@ const indexes = [
   },
 ]
 
-const migrate = async client => {
-  const { db } = client
-  await Helpers.addIndexesToCollection(db.deletedFiles, indexes)
+async function getCollection() {
+  // NOTE: The deletedFiles collection is not available to the application as it has been retired. Fetch it here.
+  return await getCollectionInternal('deletedFiles')
 }
 
-const rollback = async client => {
-  const { db } = client
-  await Helpers.dropIndexesFromCollection(db.deletedFiles, indexes)
+const migrate = async () => {
+  await Helpers.addIndexesToCollection(await getCollection(), indexes)
+}
+
+const rollback = async () => {
+  await Helpers.dropIndexesFromCollection(await getCollection(), indexes)
 }
 
 export default {

services/web/migrations/20210727123346_ce_sp_backfill_deleted_files.mjs

@@ -1,14 +1,8 @@
-import runScript from '../scripts/back_fill_deleted_files.mjs'
-
 const tags = ['server-ce', 'server-pro', 'saas']
 
 const migrate = async client => {
-  const options = {
-    performCleanup: true,
-    letUserDoubleCheckInputsFor: 10,
-    fixPartialInserts: true,
-  }
-  await runScript(options)
+  // Skip back-filling. The deletedFiles collection will be deleted in a following migration.
+  // The projects.deletedFiles array will be purged as part of the later migration as well.
 }
 
 const rollback = async client => {}

services/web/migrations/20250519101127_drop_deletedFiles.mjs

@@ -0,0 +1,50 @@
+import Helpers from './lib/helpers.mjs'
+import { getCollectionInternal, db } from '../app/src/infrastructure/mongodb.js'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
+
+const tags = ['server-ce', 'server-pro', 'saas']
+
+const indexes = [
+  {
+    key: {
+      projectId: 1,
+    },
+    name: 'projectId_1',
+  },
+]
+
+async function getCollection() {
+  // NOTE: The deletedFiles collection is not available to the application as it has been retired. Fetch it here.
+  return await getCollectionInternal('deletedFiles')
+}
+
+const migrate = async () => {
+  const collection = await getCollection()
+
+  // Purge legacy deletedFiles array from project records.
+  await batchedUpdate(
+    db.projects,
+    { deletedFiles: { $exists: true } },
+    { $unset: { deletedFiles: 1 } }
+  )
+
+  // Purge legacy deletedFiles array from soft-deleted project records.
+  await batchedUpdate(
+    db.deletedProjects,
+    { 'project.deletedFiles': { $exists: true } },
+    { $unset: { 'project.deletedFiles': 1 } }
+  )
+
+  // Drop historic deletedFiles records
+  await collection.drop()
+}
+
+const rollback = async () => {
+  await Helpers.addIndexesToCollection(await getCollection(), indexes)
+}
+
+export default {
+  tags,
+  migrate,
+  rollback,
+}

services/web/scripts/back_fill_deleted_files.mjs

@@ -1,133 +0,0 @@
-import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
-import { promiseMapWithLimit, promisify } from '@overleaf/promise-utils'
-import { db } from '../app/src/infrastructure/mongodb.js'
-import _ from 'lodash'
-import { fileURLToPath } from 'node:url'
-
-const sleep = promisify(setTimeout)
-
-async function main(options) {
-  if (!options) {
-    options = {}
-  }
-  _.defaults(options, {
-    writeConcurrency: parseInt(process.env.WRITE_CONCURRENCY, 10) || 10,
-    performCleanup: process.argv.includes('--perform-cleanup'),
-    fixPartialInserts: process.argv.includes('--fix-partial-inserts'),
-    letUserDoubleCheckInputsFor: parseInt(
-      process.env.LET_USER_DOUBLE_CHECK_INPUTS_FOR || 10 * 1000,
-      10
-    ),
-  })
-
-  await letUserDoubleCheckInputs(options)
-
-  await batchedUpdate(
-    db.projects,
-    // array is not empty ~ array has one item
-    { 'deletedFiles.0': { $exists: true } },
-    async projects => {
-      await processBatch(projects, options)
-    },
-    { _id: 1, deletedFiles: 1 }
-  )
-}
-
-async function processBatch(projects, options) {
-  await promiseMapWithLimit(
-    options.writeConcurrency,
-    projects,
-    async project => {
-      await processProject(project, options)
-    }
-  )
-}
-
-async function processProject(project, options) {
-  await backFillFiles(project, options)
-
-  if (options.performCleanup) {
-    await cleanupProject(project)
-  }
-}
-
-async function backFillFiles(project, options) {
-  const projectId = project._id
-  filterDuplicatesInPlace(project)
-  project.deletedFiles.forEach(file => {
-    file.projectId = projectId
-  })
-
-  if (options.fixPartialInserts) {
-    await fixPartialInserts(project)
-  } else {
-    await db.deletedFiles.insertMany(project.deletedFiles)
-  }
-}
-
-function filterDuplicatesInPlace(project) {
-  const fileIds = new Set()
-  project.deletedFiles = project.deletedFiles.filter(file => {
-    const id = file._id.toString()
-    if (fileIds.has(id)) return false
-    fileIds.add(id)
-    return true
-  })
-}
-
-async function fixPartialInserts(project) {
-  const seenFileIds = new Set(
-    (
-      await db.deletedFiles
-        .find(
-          { _id: { $in: project.deletedFiles.map(file => file._id) } },
-          { projection: { _id: 1 } }
-        )
-        .toArray()
-    ).map(file => file._id.toString())
-  )
-  project.deletedFiles = project.deletedFiles.filter(file => {
-    const id = file._id.toString()
-    if (seenFileIds.has(id)) return false
-    seenFileIds.add(id)
-    return true
-  })
-  if (project.deletedFiles.length > 0) {
-    await db.deletedFiles.insertMany(project.deletedFiles)
-  }
-}
-
-async function cleanupProject(project) {
-  await db.projects.updateOne(
-    { _id: project._id },
-    { $set: { deletedFiles: [] } }
-  )
-}
-
-async function letUserDoubleCheckInputs(options) {
-  if (options.performCleanup) {
-    console.error('BACK FILLING AND PERFORMING CLEANUP')
-  } else {
-    console.error(
-      'BACK FILLING ONLY - You will need to rerun with --perform-cleanup'
-    )
-  }
-  console.error(
-    'Waiting for you to double check inputs for',
-    options.letUserDoubleCheckInputsFor,
-    'ms'
-  )
-  await sleep(options.letUserDoubleCheckInputsFor)
-}
-
-export default main
-
-if (fileURLToPath(import.meta.url) === process.argv[1]) {
-  try {
-    await main()
-    process.exit(0)
-  } catch (error) {
-    console.error({ error })
-    process.exit(1)
-  }
-}

services/web/scripts/count_files_in_projects.mjs

@@ -19,7 +19,6 @@ async function countFiles() {
       console.error(
         projectId,
         files.length,
-        (project.deletedFiles && project.deletedFiles.length) || 0,
         docs.length,
         (project.deletedDocs && project.deletedDocs.length) || 0
       )

services/web/scripts/count_project_size.mjs

@@ -43,7 +43,6 @@ async function countProjectFiles() {
       console.error(
         projectId,
         files.length,
-        (project.deletedFiles && project.deletedFiles.length) || 0,
         docs.length,
         (project.deletedDocs && project.deletedDocs.length) || 0,
         fileSize,

services/web/test/acceptance/src/BackFillDeletedFilesTests.mjs

@@ -1,176 +0,0 @@
-import { exec } from 'node:child_process'
-import { promisify } from 'node:util'
-import { expect } from 'chai'
-import logger from '@overleaf/logger'
-import { db, ObjectId } from '../../../app/src/infrastructure/mongodb.js'
-import UserHelper from './helpers/User.mjs'
-
-const User = UserHelper.promises
-
-async function getDeletedFiles(projectId) {
-  return (await db.projects.findOne({ _id: projectId })).deletedFiles
-}
-
-async function setDeletedFiles(projectId, deletedFiles) {
-  await db.projects.updateOne({ _id: projectId }, { $set: { deletedFiles } })
-}
-
-async function unsetDeletedFiles(projectId) {
-  await db.projects.updateOne(
-    { _id: projectId },
-    { $unset: { deletedFiles: 1 } }
-  )
-}
-
-describe('BackFillDeletedFiles', function () {
-  let user, projectId1, projectId2, projectId3, projectId4, projectId5
-
-  beforeEach('create projects', async function () {
-    user = new User()
-    await user.login()
-
-    projectId1 = new ObjectId(await user.createProject('project1'))
-    projectId2 = new ObjectId(await user.createProject('project2'))
-    projectId3 = new ObjectId(await user.createProject('project3'))
-    projectId4 = new ObjectId(await user.createProject('project4'))
-    projectId5 = new ObjectId(await user.createProject('project5'))
-  })
-
-  let fileId1, fileId2, fileId3, fileId4
-  beforeEach('create files', function () {
-    // take a short cut and just allocate file ids
-    fileId1 = new ObjectId()
-    fileId2 = new ObjectId()
-    fileId3 = new ObjectId()
-    fileId4 = new ObjectId()
-  })
-  const otherFileDetails = {
-    name: 'universe.jpg',
-    linkedFileData: null,
-    hash: 'ed19e7d6779b47d8c63f6fa5a21954dcfb6cac00',
-    deletedAt: new Date(),
-    __v: 0,
-  }
-  let deletedFiles1, deletedFiles2, deletedFiles3
-  beforeEach('set deletedFiles details', async function () {
-    deletedFiles1 = [
-      { _id: fileId1, ...otherFileDetails },
-      { _id: fileId2, ...otherFileDetails },
-    ]
-    deletedFiles2 = [{ _id: fileId3, ...otherFileDetails }]
-    await setDeletedFiles(projectId1, deletedFiles1)
-    await setDeletedFiles(projectId2, deletedFiles2)
-
-    // a project without deletedFiles entries
-    await setDeletedFiles(projectId3, [])
-    // a project without deletedFiles array
-    await unsetDeletedFiles(projectId4)
-    // duplicate entry
-    deletedFiles3 = [
-      { _id: fileId4, ...otherFileDetails },
-      { _id: fileId4, ...otherFileDetails },
-    ]
-    await setDeletedFiles(projectId5, deletedFiles3)
-  })
-
-  async function runScript(args = []) {
-    let result
-    try {
-      result = await promisify(exec)(
-        ['LET_USER_DOUBLE_CHECK_INPUTS_FOR=1', 'VERBOSE_LOGGING=true']
-          .concat(['node', 'scripts/back_fill_deleted_files.mjs'])
-          .concat(args)
-          .join(' ')
-      )
-    } catch (error) {
-      // dump details like exit code, stdErr and stdOut
-      logger.error({ error }, 'script failed')
-      throw error
-    }
-    const { stdout: stdOut } = result
-
-    expect(stdOut).to.match(
-      new RegExp(`Running update on batch with ids .+${projectId1}`)
-    )
-    expect(stdOut).to.match(
-      new RegExp(`Running update on batch with ids .+${projectId2}`)
-    )
-    expect(stdOut).to.not.match(
-      new RegExp(`Running update on batch with ids .+${projectId3}`)
-    )
-    expect(stdOut).to.not.match(
-      new RegExp(`Running update on batch with ids .+${projectId4}`)
-    )
-    expect(stdOut).to.match(
-      new RegExp(`Running update on batch with ids .+${projectId5}`)
-    )
-  }
-
-  function checkAreFilesBackFilled() {
-    it('should back fill file and set projectId', async function () {
-      const docs = await db.deletedFiles
-        .find({}, { sort: { _id: 1 } })
-        .toArray()
-      expect(docs).to.deep.equal([
-        { _id: fileId1, projectId: projectId1, ...otherFileDetails },
-        { _id: fileId2, projectId: projectId1, ...otherFileDetails },
-        { _id: fileId3, projectId: projectId2, ...otherFileDetails },
-        { _id: fileId4, projectId: projectId5, ...otherFileDetails },
-      ])
-    })
-  }
-
-  describe('back fill only', function () {
-    beforeEach('run script', runScript)
-
-    checkAreFilesBackFilled()
-
-    it('should leave the deletedFiles as is', async function () {
-      expect(await getDeletedFiles(projectId1)).to.deep.equal(deletedFiles1)
-      expect(await getDeletedFiles(projectId2)).to.deep.equal(deletedFiles2)
-      expect(await getDeletedFiles(projectId5)).to.deep.equal(deletedFiles3)
-    })
-  })
-
-  describe('back fill and cleanup', function () {
-    beforeEach('run script with cleanup flag', async function () {
-      await runScript(['--perform-cleanup'])
-    })
-
-    checkAreFilesBackFilled()
-
-    it('should cleanup the deletedFiles', async function () {
-      expect(await getDeletedFiles(projectId1)).to.deep.equal([])
-      expect(await getDeletedFiles(projectId2)).to.deep.equal([])
-      expect(await getDeletedFiles(projectId5)).to.deep.equal([])
-    })
-  })
-
-  describe('fix partial inserts and cleanup', function () {
-    beforeEach('simulate one missing insert', async function () {
-      await setDeletedFiles(projectId1, [deletedFiles1[0]])
-    })
-    beforeEach('run script with cleanup flag', async function () {
-      await runScript(['--perform-cleanup'])
-    })
-    beforeEach('add case for one missing file', async function () {
-      await setDeletedFiles(projectId1, deletedFiles1)
-    })
-    beforeEach('add cases for no more files to insert', async function () {
-      await setDeletedFiles(projectId2, deletedFiles2)
-      await setDeletedFiles(projectId5, deletedFiles3)
-    })
-
-    beforeEach('fixing partial insert and cleanup', async function () {
-      await runScript(['--fix-partial-inserts', '--perform-cleanup'])
-    })
-
-    checkAreFilesBackFilled()
-
-    it('should cleanup the deletedFiles', async function () {
-      expect(await getDeletedFiles(projectId1)).to.deep.equal([])
-      expect(await getDeletedFiles(projectId2)).to.deep.equal([])
-      expect(await getDeletedFiles(projectId5)).to.deep.equal([])
-    })
-  })
-})

services/web/test/acceptance/src/DeletionTests.mjs

@@ -252,81 +252,6 @@ describe('Deleting a project', function () {
     })
   })
 
-  describe('when the project has deleted files', function () {
-    beforeEach('get rootFolder id', function (done) {
-      this.user.getProject(this.projectId, (error, project) => {
-        if (error) return done(error)
-        this.rootFolder = project.rootFolder[0]._id
-        done()
-      })
-    })
-
-    let allFileIds
-    beforeEach('reset allFileIds', function () {
-      allFileIds = []
-    })
-    function createAndDeleteFile(name) {
-      let fileId
-      beforeEach(`create file ${name}`, function (done) {
-        this.user.uploadExampleFileInProject(
-          this.projectId,
-          this.rootFolder,
-          name,
-          (error, theFileId) => {
-            fileId = theFileId
-            allFileIds.push(theFileId)
-            done(error)
-          }
-        )
-      })
-      beforeEach(`delete file ${name}`, function (done) {
-        this.user.deleteItemInProject(this.projectId, 'file', fileId, done)
-      })
-    }
-    for (const name of ['a.png', 'another.png']) {
-      createAndDeleteFile(name)
-    }
-
-    it('should have two deleteFiles entries', async function () {
-      const files = await db.deletedFiles
-        .find({}, { sort: { _id: 1 } })
-        .toArray()
-      expect(files).to.have.length(2)
-      expect(files.map(file => file._id.toString())).to.deep.equal(allFileIds)
-    })
-
-    describe('When the deleted project is expired', function () {
-      beforeEach('soft delete the project', function (done) {
-        this.user.deleteProject(this.projectId, done)
-      })
-      beforeEach('hard delete the project', function (done) {
-        request.post(
-          `/internal/project/${this.projectId}/expire-deleted-project`,
-          {
-            auth: {
-              user: settings.apis.web.user,
-              pass: settings.apis.web.pass,
-              sendImmediately: true,
-            },
-          },
-          (error, res) => {
-            expect(error).not.to.exist
-            expect(res.statusCode).to.equal(200)
-
-            done()
-          }
-        )
-      })
-
-      it('should cleanup the deleteFiles', async function () {
-        const files = await db.deletedFiles
-          .find({}, { sort: { _id: 1 } })
-          .toArray()
-        expect(files).to.deep.equal([])
-      })
-    })
-  })
-
   describe('When the project has docs', function () {
     beforeEach(function (done) {
       this.user.getProject(this.projectId, (error, project) => {

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

@@ -99,10 +99,6 @@ describe('ProjectDeleter', function () {
     }
 
     this.db = {
-      deletedFiles: {
-        indexExists: sinon.stub().resolves(false),
-        deleteMany: sinon.stub(),
-      },
       projects: {
         insertOne: sinon.stub().resolves(),
       },

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

@@ -4,7 +4,6 @@ const tk = require('timekeeper')
 const Errors = require('../../../../app/src/Features/Errors/Errors')
 const { ObjectId } = require('mongodb-legacy')
 const SandboxedModule = require('sandboxed-module')
-const { DeletedFile } = require('../helpers/models/DeletedFile')
 const { Project } = require('../helpers/models/Project')
 
 const MODULE_PATH =
@@ -77,7 +76,6 @@ describe('ProjectEntityMongoUpdateHandler', function () {
     }
 
     this.FolderModel = sinon.stub()
-    this.DeletedFileMock = sinon.mock(DeletedFile)
     this.ProjectMock = sinon.mock(Project)
     this.ProjectEntityHandler = {
       getAllEntitiesFromProject: sinon.stub(),
@@ -197,7 +195,6 @@ describe('ProjectEntityMongoUpdateHandler', function () {
         '../Cooldown/CooldownManager': this.CooldownManager,
         '../../models/Folder': { Folder: this.FolderModel },
         '../../infrastructure/LockManager': this.LockManager,
-        '../../models/DeletedFile': { DeletedFile },
         '../../models/Project': { Project },
         './ProjectEntityHandler': this.ProjectEntityHandler,
         './ProjectLocator': this.ProjectLocator,
@@ -208,7 +205,6 @@ describe('ProjectEntityMongoUpdateHandler', function () {
   })
 
   afterEach(function () {
-    this.DeletedFileMock.restore()
     this.ProjectMock.restore()
     tk.reset()
   })
@@ -374,17 +370,6 @@ describe('ProjectEntityMongoUpdateHandler', function () {
         linkedFileData: { some: 'data' },
         hash: 'some-hash',
       }
-      // Add a deleted file record
-      this.DeletedFileMock.expects('create')
-        .withArgs({
-          projectId: this.project._id,
-          _id: this.file._id,
-          name: this.file.name,
-          linkedFileData: this.file.linkedFileData,
-          hash: this.file.hash,
-          deletedAt: sinon.match.date,
-        })
-        .resolves()
       // Update the file in place
       this.ProjectMock.expects('findOneAndUpdate')
         .withArgs(
@@ -421,7 +406,6 @@ describe('ProjectEntityMongoUpdateHandler', function () {
     })
 
     it('updates the database', function () {
-      this.DeletedFileMock.verify()
       this.ProjectMock.verify()
     })
   })
@@ -1059,29 +1043,6 @@ describe('ProjectEntityMongoUpdateHandler', function () {
     })
   })
 
-  describe('_insertDeletedFileReference', function () {
-    beforeEach(async function () {
-      this.DeletedFileMock.expects('create')
-        .withArgs({
-          projectId: this.project._id,
-          _id: this.file._id,
-          name: this.file.name,
-          linkedFileData: this.file.linkedFileData,
-          hash: this.file.hash,
-          deletedAt: sinon.match.date,
-        })
-        .resolves()
-      await this.subject.promises._insertDeletedFileReference(
-        this.project._id,
-        this.file
-      )
-    })
-
-    it('should update the database', function () {
-      this.DeletedFileMock.verify()
-    })
-  })
-
   describe('createNewFolderStructure', function () {
     beforeEach(function () {
       this.mockRootFolder = 'MOCK_ROOT_FOLDER'

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

@@ -133,7 +133,6 @@ describe('ProjectEntityUpdateHandler', function () {
         addFolder: sinon.stub(),
         _confirmFolder: sinon.stub(),
         _putElement: sinon.stub(),
-        _insertDeletedFileReference: sinon.stub(),
         replaceFileWithNew: sinon.stub(),
         mkdirp: sinon.stub(),
         moveEntity: sinon.stub(),
@@ -2572,7 +2571,6 @@ describe('ProjectEntityUpdateHandler', function () {
       this.ProjectEntityUpdateHandler.promises.unsetRootDoc = sinon
         .stub()
         .resolves()
-      this.ProjectEntityMongoUpdateHandler.promises._insertDeletedFileReference.resolves()
     })
 
     describe('a file', function () {
@@ -2592,12 +2590,6 @@ describe('ProjectEntityUpdateHandler', function () {
           )
       })
 
-      it('should insert the file into the deletedFiles collection', function () {
-        this.ProjectEntityMongoUpdateHandler.promises._insertDeletedFileReference
-          .calledWith(this.project._id, this.entity)
-          .should.equal(true)
-      })
-
       it('should not delete the file from FileStoreHandler', function () {
         this.FileStoreHandler.promises.deleteFile
           .calledWith(projectId, this.entityId)
@@ -2696,7 +2688,6 @@ describe('ProjectEntityUpdateHandler', function () {
         }
 
         this.ProjectEntityUpdateHandler._cleanUpDoc = sinon.stub().resolves()
-        this.ProjectEntityUpdateHandler._cleanUpFile = sinon.stub().resolves()
         const path = '/folder'
         this.newProject = 'new-project'
         this.subtreeListing =
@@ -2711,17 +2702,6 @@ describe('ProjectEntityUpdateHandler', function () {
           )
       })
 
-      it('should clean up all sub files', function () {
-        this.ProjectEntityUpdateHandler._cleanUpFile.should.have.been.calledWith(
-          this.project,
-          this.file1
-        )
-        this.ProjectEntityUpdateHandler._cleanUpFile.should.have.been.calledWith(
-          this.project,
-          this.file2
-        )
-      })
-
       it('should clean up all sub docs', function () {
         this.ProjectEntityUpdateHandler._cleanUpDoc
           .calledWith(

services/web/test/unit/src/helpers/models/DeletedFile.js

@@ -1,3 +0,0 @@
-const mockModel = require('../MockModel')
-
-module.exports = mockModel('DeletedFile')