Merge branch 'master' into Aug-15-2023-news-release

cBioPortal · Aug 22, 2023 · 92bc93e · 92bc93e
2 parents 2599d46 + feec2e3
commit 92bc93e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -5,6 +5,7 @@ on:
       - master
       - release-*
       - rc
+      - rfc*
       - demo-*
       - fusion-sv-migration
       - redis-branch-up-to-date

diff --git a/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java b/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java
@@ -48,8 +48,8 @@ public class ExpressionEnrichmentUtil {
 
     private static final double LOG2 = Math.log(2);
     private static final String RNA_SEQ = "rna_seq";
-    private static final String POS = "true";
-    private static final String NEG = "false";
+    private static final List<String> posTypeList = Arrays.asList("true", "yes");
+    private static final List<String> negTypeList = Arrays.asList("false", "no");
     private static final String ALTERED = "1";
     private static final String UNALTERED = "0";
     public <T extends MolecularAlteration, S extends ExpressionEnrichment> List<S> getEnrichments(
@@ -205,7 +205,15 @@ public <T extends MolecularAlteration, S extends ExpressionEnrichment> List<S> g
                 List<String> molecularDataValues = group.getValue().stream()
                     .map(sampleIndex -> ma.getSplitValues()[sampleIndex])
                     .filter(StringUtils::isNotEmpty)
-                    .map(a -> a.equals(POS) ? ALTERED : UNALTERED)
+                    .map(a ->{
+                        if (posTypeList.contains(a)) {
+                            return ALTERED;
+                        } else if (negTypeList.contains(a)) {
+                            return UNALTERED;
+                        } else {
+                            return a;
+                        }
+                    })
                     .collect(Collectors.toList());
 
                 // ignore group if there are less than 2 values