From c8de3fa5653f4fc8df9561f760aeab9a56e38833 Mon Sep 17 00:00:00 2001
From: pvannierop <pim@thehyve.nl>
Date: Wed, 10 Jan 2024 14:14:52 +0100
Subject: [PATCH] FIXME: duplicate MyBatis mapper fragment

---
 .../cbioportal/persistence/mybatis/StudyMapper.xml    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/org/cbioportal/persistence/mybatis/StudyMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatis/StudyMapper.xml
index 76f7dfed0dd..c057cb5cfd9 100644
--- a/src/main/resources/org/cbioportal/persistence/mybatis/StudyMapper.xml
+++ b/src/main/resources/org/cbioportal/persistence/mybatis/StudyMapper.xml
@@ -35,9 +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,
-        <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">