Merge pull request #11 from icgc-argo/RC/2.0.0

RC/2.0.0
icgc-argo · Jun 23, 2020 · 248fe9b · 248fe9b
2 parents d5f3390 + eea2818
commit 248fe9b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>bio.overture</groupId>
     <artifactId>song-search</artifactId>
-    <version>1.0.1</version>
+    <version>2.0.0</version>
     <name>song-search</name>
     <description>GQL microservice for searching maestro generated song indexes</description>
 

diff --git a/src/main/java/bio/overture/songsearch/graphql/EntityDataFetcher.java b/src/main/java/bio/overture/songsearch/graphql/EntityDataFetcher.java
@@ -48,7 +48,7 @@ public DataFetcher getDataFetcher() {
                     }
                   }
                   if (RUN_ENTITY.equals(values.get("__typename"))) {
-                    final Object runId = values.get("runName"); // todo: will become runId after reindex
+                    final Object runId = values.get("runId");
                     if (runId instanceof String) {
                       return new Run(
                           (String) runId,

diff --git a/src/main/java/bio/overture/songsearch/model/Run.java b/src/main/java/bio/overture/songsearch/model/Run.java
@@ -19,7 +19,7 @@
 public class Run {
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
-    private String runName; // todo: will become runId after reindex
+    private String runId;
 
     private List<Analysis> producedAnalyses;
 

diff --git a/src/main/resources/schema.graphql b/src/main/resources/schema.graphql
@@ -135,8 +135,8 @@ input Page {
     from: Int!
 }
 
-type Run @key(fields: "runName") @extends {
-    runName: ID! @external # todo: runName will become runId after reindex
+type Run @key(fields: "runId") @extends {
+    runId: ID! @external
     producedAnalyses: [Analysis]
     inputAnalyses: String
 }