refactor: rename catalogue classes

src/main/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapper.java

@@ -1,13 +1,11 @@
 package dev.pcvolkmer.onco.datamapper;
 
 import dev.pcvolkmer.mv64e.mtb.Coding;
-import dev.pcvolkmer.mv64e.mtb.Mtb;
 import dev.pcvolkmer.mv64e.mtb.MtbDiagnosis;
-import dev.pcvolkmer.onco.datamapper.datacatalogues.Kpa;
+import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
 import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import javax.sql.DataSource;
 import java.sql.SQLException;
 
 /**
@@ -20,18 +18,18 @@ public class KpaDiagnosisDataMapper implements DataMapper<MtbDiagnosis> {
 
     private final JdbcTemplate jdbcTemplate;
 
-    KpaDiagnosisDataMapper(final JdbcTemplate jdbcTemplate) {
+    private KpaDiagnosisDataMapper(final JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
     /**
      * Create instance of the mapper class
      *
-     * @param dataSource The datasource to be used
+     * @param jdbcTemplate The Spring JdbcTemplate to be used
      * @return The initialized mapper
      */
-    public static KpaDiagnosisDataMapper create(final DataSource dataSource) {
-        return new KpaDiagnosisDataMapper(new JdbcTemplate(dataSource));
+    public static KpaDiagnosisDataMapper create(final JdbcTemplate jdbcTemplate) {
+        return new KpaDiagnosisDataMapper(jdbcTemplate);
     }
 
     /**
@@ -42,7 +40,7 @@ public class KpaDiagnosisDataMapper implements DataMapper<MtbDiagnosis> {
      */
     @Override
     public MtbDiagnosis getById(int id) {
-        var kpa = Kpa.create(this.jdbcTemplate);
+        var kpa = KpaCatalogue.create(this.jdbcTemplate);
         var data = kpa.getById(id);
 
         var builder =  MtbDiagnosis.builder();

src/main/java/dev/pcvolkmer/onco/datamapper/MtbDataMapper.java

@@ -1,10 +1,14 @@
 package dev.pcvolkmer.onco.datamapper;
 
 import dev.pcvolkmer.mv64e.mtb.Mtb;
-import dev.pcvolkmer.onco.datamapper.datacatalogues.Kpa;
+import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
+import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
+import java.util.List;
 
 /**
  * Mapper class to load and map Mtb files from database
@@ -14,6 +18,8 @@ import javax.sql.DataSource;
  */
 public class MtbDataMapper implements DataMapper<Mtb> {
 
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
     private final JdbcTemplate jdbcTemplate;
 
     MtbDataMapper(final JdbcTemplate jdbcTemplate) {
@@ -30,15 +36,35 @@ public class MtbDataMapper implements DataMapper<Mtb> {
         return new MtbDataMapper(new JdbcTemplate(dataSource));
     }
 
+    /**
+     * Create instance of the mapper class
+     *
+     * @param jdbcTemplate The Spring JdbcTemplate to be used
+     * @return The initialized mapper
+     */
+    public static MtbDataMapper create(final JdbcTemplate jdbcTemplate) {
+        return new MtbDataMapper(jdbcTemplate);
+    }
+
     /**
      * Loads and maps a Mtb file using the root procedures database id
      *
-     * @param id The database id of the root procedure data set
+     * @param kpaId The database id of the root procedure data set
      * @return The loaded Mtb file
      */
     @Override
-    public Mtb getById(int id) {
-        return Mtb.builder().build();
+    public Mtb getById(int kpaId) {
+        var diagnosisDataMapper = KpaDiagnosisDataMapper.create(jdbcTemplate);
+        var resultBuilder = Mtb.builder();
+
+        try {
+            resultBuilder
+                    .diagnoses(List.of(diagnosisDataMapper.getById(kpaId)));
+        } catch (DataAccessException e) {
+            logger.error("Error while getting Mtb.", e);
+        }
+
+        return resultBuilder.build();
     }
 
     /**
@@ -48,7 +74,7 @@ public class MtbDataMapper implements DataMapper<Mtb> {
      * @return The loaded Mtb file
      */
     public Mtb getByCaseId(String caseId) {
-        var kpa = Kpa.create(this.jdbcTemplate);
+        var kpa = KpaCatalogue.create(this.jdbcTemplate);
         return this.getById(
                 kpa.getProcedureIdByCaseId(caseId)
         );

src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/KpaCatalogue.java

@@ -11,16 +11,16 @@ import java.sql.ResultSet;
  * @author Paul-Christian Volkmer
  * @since 0.1
  */
-public class Kpa {
+public class KpaCatalogue {
 
     private final JdbcTemplate jdbcTemplate;
 
-    private Kpa(JdbcTemplate jdbcTemplate) {
+    private KpaCatalogue(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    public static Kpa create(JdbcTemplate jdbcTemplate) {
-        return new Kpa(jdbcTemplate);
+    public static KpaCatalogue create(JdbcTemplate jdbcTemplate) {
+        return new KpaCatalogue(jdbcTemplate);
     }
 
     /**