1. Remove typeId and filename for artifacts - use file's name itself as the artifact name

2. Prevent sort by name for review type (text field cannot be sorted in ES)

Author: callmekatootie

docs/swagger.yaml

@@ -469,17 +469,7 @@ paths:
           name: artifact
           type: file
           required: true
-          description: Artifact to be uploaded
-        - in: formData
-          name: typeId
-          required: true
-          type: string
-          example: 'c56a4180-65aa-42ec-a945-5fd21dec0503'    
-        - in: formData
-          name: filename
-          required: true
-          type: string
-          example: 'genericFilename'
+          description: Artifact to be uploaded. Pass the name of the artifact along with the data
       responses:
         200:
           description: Artifact created successfully
@@ -1781,7 +1771,7 @@ parameters:
   fileParam:
     name: file
     in: path
-    description: artifact id
+    description: artifact id (its filename)
     required: true
     type: string
 

src/services/ArtifactService.js

@@ -89,7 +89,7 @@ function * createArtifact (files, submissionId, entity) {
   logger.info('Creating a new Artifact')
   if (files && files.artifact) {
     const uFileType = fileTypeFinder(files.artifact.data).ext // File type of uploaded file
-    fileName = `${submissionId}/${entity.filename}.${uFileType}`
+    fileName = `${submissionId}/${files.artifact.name}.${uFileType}`
     let exist
     // Check the existence of file in S3 bucket
     try {
@@ -100,7 +100,7 @@ function * createArtifact (files, submissionId, entity) {
     }
 
     if (exist) {
-      throw new errors.HttpStatusError(409, `Artifact ${entity.filename}.${uFileType} already exists for Submission ${submissionId}`)
+      throw new errors.HttpStatusError(409, `Artifact ${files.artifact.name}.${uFileType} already exists for Submission ${submissionId}`)
     }
     // Upload the artifact to S3
     yield _uploadToS3(files.artifact, fileName)
@@ -113,10 +113,7 @@ function * createArtifact (files, submissionId, entity) {
 createArtifact.schema = {
   files: joi.any().required(),
   submissionId: joi.string().guid().required(),
-  entity: joi.object().keys({
-    typeId: joi.string().uuid().required(),
-    filename: joi.string().required()
-  }).required()
+  entity: joi.object()
 }
 
 /**

src/services/ReviewTypeService.js

@@ -67,7 +67,7 @@ const listReviewTypesQuerySchema = {
 
 listReviewTypesQuerySchema.sortBy = joi.string().valid(_.difference(
   Object.keys(listReviewTypesQuerySchema),
-  ['page', 'perPage', 'orderBy']
+  ['page', 'perPage', 'orderBy', 'name']
 ))
 
 listReviewTypes.schema = {