Move metadata hiding logic from controller to service

Author: meshde

src/controllers/SubmissionController.js

@@ -2,7 +2,6 @@
  * Submission Controller
  */
 
-const _ = require('lodash')
 const SubmissionService = require('../services/SubmissionService')
 const helper = require('../common/helper')
 
@@ -38,13 +37,7 @@ function * downloadSubmission (req, res) {
  * @param res the http response
  */
 function * listSubmissions (req, res) {
-  const data = yield SubmissionService.listSubmissions(req.query)
-  data.rows = _.map(data.rows, (submission) => {
-    if (submission.review) {
-      submission.review = helper.cleanseReviews(submission.review, req.authUser.roles)
-    }
-    return submission
-  })
+  const data = yield SubmissionService.listSubmissions(req.authUser, req.query)
   helper.setPaginationHeaders(req, res, data)
 }
 

src/services/SubmissionService.js

@@ -174,11 +174,19 @@ function * downloadSubmission (authUser, submissionId) {
 
 /**
  * Function to list submissions from Elastic Search
+ * @param {Object} authUser Authenticated User
  * @param {Object} query Query filters passed in HTTP request
  * @return {Object} Data fetched from ES
  */
-function * listSubmissions (query) {
-  return yield helper.fetchFromES(query, helper.camelize(table))
+function * listSubmissions (authUser, query) {
+  const data = yield helper.fetchFromES(query, helper.camelize(table))
+  data.rows = _.map(data.rows, (submission) => {
+    if (submission.review) {
+      submission.review = helper.cleanseReviews(submission.review, authUser.roles)
+    }
+    return submission
+  })
+  return data
 }
 
 const listSubmissionsQuerySchema = {
@@ -209,6 +217,7 @@ listSubmissionsQuerySchema.sortBy = joi.string().valid(_.difference(
 ))
 
 listSubmissions.schema = {
+  authUser: joi.object().required(),
   query: joi.object().keys(listSubmissionsQuerySchema).with('orderBy', 'sortBy')
 }