Просмотр исходного кода

Change to using project_id rather than user_id in references index.

Shane Kilkelly 10 лет назад
Родитель
Сommit
c9db11edbe

+ 5 - 6
services/web/app/coffee/Features/ReferencesSearch/ReferencesSearchController.coffee

@@ -9,21 +9,20 @@ module.exports = ReferencesSearchController =
 
 
 	indexFile: (req, res) ->
 	indexFile: (req, res) ->
 		project_id = req.params.Project_id
 		project_id = req.params.Project_id
-		user_id = req.session.user._id
 		doc_id = req.body.docId
 		doc_id = req.body.docId
-		logger.log {project_id, user_id, doc_id}, "indexing references"
+		logger.log {project_id, doc_id}, "indexing references"
 
 
 		if !doc_id
 		if !doc_id
-			logger.log project_id: project_id, user_id: user_id, "no fileUrl supplied"
+			logger.log project_id: project_id, "no fileUrl supplied"
 			return res.send 400
 			return res.send 400
 		ProjectLocator.findElement {project_id: project_id, element_id: doc_id, type: 'doc'}, (err, doc) ->
 		ProjectLocator.findElement {project_id: project_id, element_id: doc_id, type: 'doc'}, (err, doc) ->
 			if err?
 			if err?
-				logger.err {err, project_id, user_id, doc_id}, "error finding element for downloading file"
+				logger.err {err, project_id, doc_id}, "error finding doc to index"
 				return res.send 500
 				return res.send 500
 			doc_url = ReferencesSearchController._buildDocUrl project_id, doc_id
 			doc_url = ReferencesSearchController._buildDocUrl project_id, doc_id
-			ReferencesSearchHandler.indexFile user_id, doc_url, (err) ->
+			ReferencesSearchHandler.indexFile project_id, doc_url, (err) ->
 				if err
 				if err
-					logger.err {err, project_id, user_id, doc_id}, "error indexing references file"
+					logger.err {err, project_id, doc_id}, "error indexing references file"
 					return res.send 500
 					return res.send 500
 
 
 				res.send 200
 				res.send 200

+ 4 - 4
services/web/app/coffee/Features/ReferencesSearch/ReferencesSearchHandler.coffee

@@ -8,9 +8,9 @@ fiveMinsInMs = oneMinInMs * 5
 
 
 module.exports = ReferencesSearchHandler =
 module.exports = ReferencesSearchHandler =
 
 
-	indexFile: (user_id, file_url, callback = (err)->) ->
-		logger.log {user_id, file_url}, "sending index request to references api"
-		url = "#{settings.apis.references.url}/user/#{user_id}"
+	indexFile: (project_id, file_url, callback = (err)->) ->
+		logger.log {project_id, file_url}, "sending index request to references api"
+		url = "#{settings.apis.references.url}/project/#{project_id}"
 		request.post {
 		request.post {
 			url: url
 			url: url
 			json:
 			json:
@@ -22,5 +22,5 @@ module.exports = ReferencesSearchHandler =
 				return callback(null)
 				return callback(null)
 			else
 			else
 				err = new Error("references api responded with non-success code: #{res.statusCode}")
 				err = new Error("references api responded with non-success code: #{res.statusCode}")
-				logger.log {err, user_id, file_url}, "error updating references"
+				logger.log {err, project_id, file_url}, "error updating references"
 				return callback(err)
 				return callback(err)