From 20c7db4cee1668c8aafd8c08e2243b3be8e3163b Mon Sep 17 00:00:00 2001
From: "Zhaoyuan (Ryan) Fu" <fuzhaoyuan@gmail.com>
Date: Mon, 7 Oct 2024 18:08:28 -0400
Subject: [PATCH] try to fix mutation part SQL

---
 .../persistence/mybatisclickhouse/StudyViewMapper.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml
index 7bcbe126ff0..f589768a829 100644
--- a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml
+++ b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml
@@ -137,8 +137,8 @@
             genetic_profile.name AS label,
             count(sample_profile.genetic_profile_id) AS count
         FROM sample_profile
-            JOIN sample_derived ON sample_profile.sample_id=sample_derived.internal_id
-            JOIN genetic_profile on sample_profile.genetic_profile_id = genetic_profile.genetic_profile_id
+            LEFT JOIN sample_derived ON sample_profile.sample_id=sample_derived.internal_id
+            LEFT JOIN genetic_profile on sample_profile.genetic_profile_id = genetic_profile.genetic_profile_id
         <where>
             genetic_profile.genetic_alteration_type != 'MUTATION_EXTENDED' AND
             <include refid="applyStudyViewFilter">
@@ -155,11 +155,10 @@
             JOIN sample_derived sd ON sgp.sample_unique_id = sd.sample_unique_id
             JOIN sample_profile sp ON sd.internal_id = sp.sample_id
             JOIN genetic_profile gp ON sp.genetic_profile_id = gp.genetic_profile_id
-        WHERE
-            <include refid="applyStudyViewFilter">
-                <property name="filter_type" value="'SAMPLE_ID_ONLY'"/>
-            </include>
+        WHERE 
+            sgp.sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>)
             AND sgp.alteration_type = 'MUTATION_EXTENDED'
+        GROUP BY gp.stable_id, gp.name
     </select>
 
     <!-- for /sample-lists-counts/fetch (returns CaseListDataCount) -->