Issue phenotips#77: Top exomiser hits now uses the variant display ta…

…ble from variant store application
mjshepherd · May 25, 2015 · 4128899 · 4128899
1 parent fb6625c
commit 4128899
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 348 deletions.
diff --git a/...ta-impl/src/main/java/org/phenotips/data/similarity/script/ExomiserViewScriptService.java b/...ta-impl/src/main/java/org/phenotips/data/similarity/script/ExomiserViewScriptService.java
@@ -89,36 +89,56 @@ public boolean hasGenotype(Patient patient)
      */
     public JSONArray getTopGenesAsJSON(Patient patient, int g, int v)
     {
-        JSONArray result = new JSONArray();
+        JSONArray variantsJSON = new JSONArray();
+
         if (patient == null || g < 0) {
-            return result;
+            return variantsJSON;
         }
 
         boolean restrictGenes =
             (!this.pm.getPatientAccess(patient).hasAccessLevel(this.editAccess) && g > MAXIMUM_UNPRIVILEGED_GENES);
         int maxGenes = restrictGenes ? MAXIMUM_UNPRIVILEGED_GENES : g;
 
         Exome patientExome = this.exomeManager.getExome(patient);
+
         for (String geneName : patientExome.getTopGenes(maxGenes)) {
-            JSONObject geneJSON = new JSONObject();
-            geneJSON.element("name", geneName);
-            geneJSON.element("score", patientExome.getGeneScore(geneName));
 
-            JSONArray variantsJSON = new JSONArray();
+            Double geneScore = patientExome.getGeneScore(geneName);
+
+
+            List<Variant> topVariants = patientExome.getTopVariants(geneName);
+
             boolean restrictVariants = (!this.pm.getPatientAccess(patient).hasAccessLevel(this.editAccess)
                 && v > MAXIMUM_UNPRIVILEGED_VARIANTS);
             int maxVars = restrictVariants ? MAXIMUM_UNPRIVILEGED_VARIANTS : v;
-            List<Variant> topVariants = patientExome.getTopVariants(geneName);
             maxVars = Math.min(maxVars, topVariants.size());
+
             for (int i = 0; i < maxVars; i++) {
                 Variant variant = topVariants.get(i);
                 if (variant != null) {
-                    variantsJSON.add(variant.toJSON());
+                    variantsJSON.add(this.mapToGAVariantJSON(variant, geneName, geneScore));
                 }
             }
-            geneJSON.element("variants", variantsJSON);
-            result.add(geneJSON);
         }
-        return result;
+        return variantsJSON;
+    }
+
+    private JSONObject mapToGAVariantJSON(Variant variant, String geneName, Double geneScore)
+    {
+        JSONObject resultJson = new JSONObject();
+        resultJson.put("start", variant.getPosition());
+        resultJson.put("referenceBases", variant.getRef());
+        resultJson.put("alternateBases", variant.getAlt());
+        resultJson.put("referenceName", variant.getChrom());
+        resultJson.put("end", variant.getPosition() + variant.getAlt().length());
+
+        JSONObject infoJson = new JSONObject();
+        infoJson.put("EXOMISER_VARIANT_SCORE", variant.getScore());
+        infoJson.put("EXOMISER_GENE_VARIANT_SCORE", geneScore);
+        infoJson.put("GENE_EFFECT", variant.getAnnotation("FUNCTIONAL_CLASS"));
+        infoJson.put("GENE", geneName);
+
+        resultJson.put("info", infoJson);
+        return resultJson;
     }
 }