FIXME: duplicate MyBatis mapper fragment

cBioPortal · Jan 17, 2024 · cf65392 · cf65392
1 parent c981a9b
commit cf65392
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/resources/org/cbioportal/persistence/mybatis/StudyMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatis/StudyMapper.xml
@@ -35,10 +35,14 @@
         COUNT(CASE WHEN sample_list.STABLE_ID = CONCAT(cancer_study.CANCER_STUDY_IDENTIFIER,'_protein_quantification') THEN 1 ELSE NULL END) AS massSpectrometrySampleCount,
         COUNT(CASE WHEN sample_list.STABLE_ID = CONCAT(cancer_study.CANCER_STUDY_IDENTIFIER,'_3way_complete') THEN 1 ELSE NULL END) AS completeSampleCount,
         IFNULL(treatment.count, 0 ) as treatmentCount,
-        COALESCE(structural_variant.count, 0) as structuralVariantCount,
-        <include refid="org.cbioportal.persistence.mybatis.CancerTypeMapper.select">
-            <property name="prefix" value="typeOfCancer."/>
-        </include>
+        type_of_cancer.TYPE_OF_CANCER_ID AS "typeOfCancer.typeOfCancerId"
+        <if test="projection == 'SUMMARY' || projection == 'DETAILED'">
+            ,
+            type_of_cancer.NAME AS "typeOfCancer.name",
+            type_of_cancer.DEDICATED_COLOR AS "typeOfCancer.dedicatedColor",
+            type_of_cancer.SHORT_NAME AS "typeOfCancer.shortName",
+            type_of_cancer.PARENT AS "typeOfCancer.parent"
+        </if>
     </sql>
 
     <sql id="from">