[CAT-205] Add result file version to workflow submission query (#43)

* result file version as optional input

* remove accidentaly space

Author: goatrocks

src/main/java/com/indico/mutation/WorkflowSubmission.kt

@@ -5,8 +5,9 @@ import com.indico.IndicoClient
 import com.indico.exceptions.IndicoMutationException
 import com.indico.graphql.WorkflowSubmissionGraphQL
 import com.indico.graphql.inputs.FileInput
+import com.indico.graphql.enums.SubmissionResultVersion as GraphQlResultVersion
+import com.indico.type.SubmissionResultVersion
 import org.apache.logging.log4j.LogManager
-import org.json.JSONArray
 import java.io.IOException
 import java.util.*
 
@@ -15,6 +16,7 @@ class WorkflowSubmission(private val client: IndicoClient) : Mutation<List<Int?>
     private var id = 0
     private var duplicationId: UUID? = null
     private var streams: Map<String, ByteArray>? = null
+    private var resultFileVersion: SubmissionResultVersion? = null
     private val logger = LogManager.getLogger(javaClass)
 
     /**
@@ -58,12 +60,16 @@ class WorkflowSubmission(private val client: IndicoClient) : Mutation<List<Int?>
         return this
     }
 
+    fun resultFileVersion(version: SubmissionResultVersion?): WorkflowSubmission{
+        resultFileVersion = version
+        return this
+    }
+
     /**
      * Executes request and returns Submissions
      * @return Integer List
      */
     override fun execute(): List<Int?>? {
-        var fileMetadata: JSONArray
         val files: MutableList<FileInput> = ArrayList<FileInput>()
         try {
             if (this.files != null) {
@@ -78,10 +84,18 @@ class WorkflowSubmission(private val client: IndicoClient) : Mutation<List<Int?>
         if (duplicationId == null) {
             duplicationId = UUID.randomUUID()
         }
+
+        val resultVersion =
+            if(resultFileVersion != null)
+                OptionalInput.Defined(GraphQlResultVersion.valueOf(resultFileVersion.toString()))
+            else OptionalInput.Undefined
+
         return try {
             val call = WorkflowSubmissionGraphQL(
                 WorkflowSubmissionGraphQL.Variables(
-                    files = files, workflowId = id, duplicationId = OptionalInput.Defined(duplicationId.toString())))
+                    files = files, workflowId = id, duplicationId = OptionalInput.Defined(duplicationId.toString()),
+                    resultVersion = resultVersion
+               ))
             val response = client.execute(call)
             handleErrors(response)
             val workflowSubmission = response.data!!.workflowSubmission!!
@@ -95,4 +109,4 @@ class WorkflowSubmission(private val client: IndicoClient) : Mutation<List<Int?>
             throw IndicoMutationException("Call to submit submission failed", ex)
         }
     }
-}
+}

src/main/java/com/indico/type/SubmissionResultVersion.kt

@@ -0,0 +1,12 @@
+package com.indico.type
+
+/***
+ * Submission results file version.
+ */
+enum class SubmissionResultVersion {
+    ONE,
+    TWO,
+    THREE,
+    LATEST,
+    OLDEST_SUPPORTED
+}

src/main/resources/WorkflowSubmissionGraphQL.graphql

@@ -1,5 +1,5 @@
-mutation WorkflowSubmissionGraphQL($duplicationId: String, $workflowId: Int!, $files: [FileInput]!, $recordSubmission: Boolean) {
-    workflowSubmission(duplicationId: $duplicationId, workflowId: $workflowId, files: $files, recordSubmission: $recordSubmission) {
+mutation WorkflowSubmissionGraphQL($duplicationId: String, $workflowId: Int!, $files: [FileInput]!, $resultVersion:SubmissionResultVersion) {
+    workflowSubmission(duplicationId: $duplicationId, workflowId: $workflowId, files: $files, resultVersion: $resultVersion) {
         submissionIds
         isDuplicateRequest
     }

src/main/resources/schema.graphql

@@ -2448,6 +2448,7 @@ enum SubmissionResultVersion {
   OLDEST_SUPPORTED
   ONE
   TWO
+  THREE
 }
 
 "An enumeration."

src/test/java/com/indico/main.java

@@ -15,6 +15,7 @@
 import com.indico.storage.Blob;
 import com.indico.storage.RetrieveBlob;
 import com.indico.type.JobStatus;
+import com.indico.type.SubmissionResultVersion;
 import com.indico.type.SubmissionStatus;
 
 import java.util.ArrayList;