github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

check for duplicates in putElement

Browse source
This commit is contained in:
Brian Gough 2018-01-19 12:01:23 +00:00
parent 81406d1f49
commit 82a9fc97d9
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
View file

@ -170,7 +170,8 @@ module.exports = ProjectEntityHandler =
if project_or_id._id? # project if project_or_id._id? # project
return cb(null, project_or_id) return cb(null, project_or_id)
else # id else # id
return ProjectGetter.getProjectWithOnlyFolders project_or_id, cb # need to retrieve full project structure to check for duplicates
return ProjectGetter.getProject project_or_id, {}, cb
getProject (error, project) -> getProject (error, project) ->
if err? if err?
logger.err project_id:project_id, err:err, "error getting project for add doc" logger.err project_id:project_id, err:err, "error getting project for add doc"
@ -207,7 +208,7 @@ module.exports = ProjectEntityHandler =
ProjectEntityHandler.addDoc project_id, null, name, lines, callback ProjectEntityHandler.addDoc project_id, null, name, lines, callback
addFileWithoutUpdatingHistory: (project_id, folder_id, fileName, path, userId, callback = (error, fileRef, folder_id, path, fileStoreUrl) ->)-> addFileWithoutUpdatingHistory: (project_id, folder_id, fileName, path, userId, callback = (error, fileRef, folder_id, path, fileStoreUrl) ->)->
ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) -> ProjectGetter.getProject project_id, {}, (err, project) ->
if err? if err?
logger.err project_id:project_id, err:err, "error getting project for add file" logger.err project_id:project_id, err:err, "error getting project for add file"
return callback(err) return callback(err)
@ -606,19 +607,32 @@ module.exports = ProjectEntityHandler =
newPath = newPath =
fileSystem: "#{path.fileSystem}/#{element.name}" fileSystem: "#{path.fileSystem}/#{element.name}"
mongo: path.mongo mongo: path.mongo
id = element._id+'' ProjectEntityHandler.checkElementName folder, element.name, (err) =>
element._id = require('mongoose').Types.ObjectId(id) return callback(err) if err?
conditions = _id:project._id id = element._id+''
mongopath = "#{path.mongo}.#{type}" element._id = require('mongoose').Types.ObjectId(id)
update = "$push":{} conditions = _id:project._id
update["$push"][mongopath] = element mongopath = "#{path.mongo}.#{type}"
logger.log project_id: project._id, element_id: element._id, fileType: type, folder_id: folder_id, mongopath:mongopath, "adding element to project" update = "$push":{}
Project.findOneAndUpdate conditions, update, {"new": true}, (err, project)-> update["$push"][mongopath] = element
if err? logger.log project_id: project._id, element_id: element._id, fileType: type, folder_id: folder_id, mongopath:mongopath, "adding element to project"
logger.err err: err, project_id: project._id, 'error saving in putElement project' Project.findOneAndUpdate conditions, update, {"new": true}, (err, project)->
return callback(err) if err?
callback(err, {path:newPath}, project) logger.err err: err, project_id: project._id, 'error saving in putElement project'
return callback(err)
callback(err, {path:newPath}, project)
checkElementName: (folder, name, callback = (err) ->) ->
# check if the name is already taken by a doc, file or
# folder. If so, return an error "file already exists".
err = new Errors.InvalidNameError("file already exists")
for doc in folder?.docs or []
return callback(err) if doc.name is name
for file in folder?.fileRefs or []
return callback(err) if file.name is name
for folder in folder?.folders or []
return callback(err) if folder.name is name
callback()
confirmFolder = (project, folder_id, callback)-> confirmFolder = (project, folder_id, callback)->
logger.log folder_id:folder_id, project_id:project._id, "confirming folder in project" logger.log folder_id:folder_id, project_id:project._id, "confirming folder in project"