pcvolkmer/mv64e-onkostar-data
1
0
Fork 0
mirror of https://github.com/pcvolkmer/mv64e-onkostar-data.git synced 2025-07-02 02:22:54 +00:00
Code Activity

refactor: extract single result set mapping

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2025-06-21 16:28:53 +02:00
parent 6f59bf767a
commit e578d36e1b
7 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/AbstractKpaTherapieverlaufDataMapper.java
View File

@ -1,6 +1,7 @@
package dev.pcvolkmer.onco.datamapper.mapper;
import dev.pcvolkmer.mv64e.mtb.*;
import dev.pcvolkmer.onco.datamapper.datacatalogues.AbstractSubformDataCatalogue;
import java.io.IOException;
import java.util.Arrays;
@ -12,7 +13,11 @@ import java.util.stream.Collectors;
* @author Paul-Christian Volkmer
* @since 0.1
*/
public abstract class AbstractKpaTherapieverlaufDataMapper<T> implements SubformDataMapper<T> {
public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSubformDataMapper<T> {
AbstractKpaTherapieverlaufDataMapper(AbstractSubformDataCatalogue catalogue) {
super(catalogue);
}
protected MtbTherapyIntentCoding getMtbTherapyIntentCoding(String value) {
if (value == null || !Arrays.stream(MtbTherapyIntentCodingCode.values()).map(MtbTherapyIntentCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
@ -125,7 +130,7 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> implements Subform
}
protected OncoProcedureCoding getOncoProcedureCoding(String value) {
if (value == null || ! Arrays.stream(OncoProcedureCodingCode.values()).map(OncoProcedureCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
if (value == null || !Arrays.stream(OncoProcedureCodingCode.values()).map(OncoProcedureCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null;
}

44
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/AbstractSubformDataMapper.java Normal file
View File

@ -0,0 +1,44 @@
package dev.pcvolkmer.onco.datamapper.mapper;
import dev.pcvolkmer.onco.datamapper.ResultSet;
import dev.pcvolkmer.onco.datamapper.datacatalogues.AbstractSubformDataCatalogue;
import java.util.List;
import java.util.stream.Collectors;
/**
* Abstract common implementation for all subform data mappers
*
* @since 0.1
* @author Paul-Christian Volkmer
* @param <T> The destination type
*/
public abstract class AbstractSubformDataMapper<T> implements SubformDataMapper<T> {
protected AbstractSubformDataCatalogue catalogue;
protected AbstractSubformDataMapper(AbstractSubformDataCatalogue catalogue) {
this.catalogue = catalogue;
}
/**
* Loads a data set from database and maps it into destination data type
* @param parentId The database id of the parent procedure data set
* @return The data set to be loaded
*/
@Override
public List<T> getByParentId(final int parentId) {
return catalogue.getAllByParentId(parentId)
.stream()
.map(this::map)
.collect(Collectors.toList());
}
/**
* Maps a single result set into destination object
* @param resultSet The result set to start from
* @return The destination object
*/
protected abstract T map(ResultSet resultSet);
}

9
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java
View File

@ -19,12 +19,10 @@ import java.util.stream.Collectors;
* @author Paul-Christian Volkmer
* @since 0.1
*/
public class KpaEcogDataMapper implements SubformDataMapper<PerformanceStatus> {
private final EcogCatalogue catalogue;
public class KpaEcogDataMapper extends AbstractSubformDataMapper<PerformanceStatus> {
public KpaEcogDataMapper(final EcogCatalogue catalogue) {
this.catalogue = catalogue;
super(catalogue);
}
/**
@ -48,7 +46,8 @@ public class KpaEcogDataMapper implements SubformDataMapper<PerformanceStatus> {
.collect(Collectors.toList());
}
private PerformanceStatus map(final ResultSet resultSet) {
@Override
protected PerformanceStatus map(final ResultSet resultSet) {
var builder = PerformanceStatus.builder();
builder
.id(resultSet.getProcedureId().toString())

22
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapper.java
View File

@ -1,14 +1,11 @@
package dev.pcvolkmer.onco.datamapper.mapper;
import dev.pcvolkmer.mv64e.mtb.*;
import dev.pcvolkmer.mv64e.mtb.OncoProcedure;
import dev.pcvolkmer.mv64e.mtb.PeriodDate;
import dev.pcvolkmer.mv64e.mtb.Reference;
import dev.pcvolkmer.onco.datamapper.ResultSet;
import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* Mapper class to load and map prozedur data from database table 'dk_dnpm_uf_prozedur'
*
@ -17,10 +14,8 @@ import java.util.stream.Collectors;
*/
public class KpaProzedurDataMapper extends AbstractKpaTherapieverlaufDataMapper<OncoProcedure> {
private final ProzedurCatalogue catalogue;
public KpaProzedurDataMapper(final ProzedurCatalogue catalogue) {
this.catalogue = catalogue;
super(catalogue);
}
/**
@ -36,14 +31,7 @@ public class KpaProzedurDataMapper extends AbstractKpaTherapieverlaufDataMapper<
}
@Override
public List<OncoProcedure> getByParentId(final int parentId) {
return catalogue.getAllByParentId(parentId)
.stream()
.map(this::map)
.collect(Collectors.toList());
}
private OncoProcedure map(final ResultSet resultSet) {
protected OncoProcedure map(final ResultSet resultSet) {
var diseases = catalogue.getDiseases(resultSet.getProcedureId());
if (diseases.size() != 1) {

16
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapper.java
View File

@ -6,9 +6,6 @@ import dev.pcvolkmer.mv64e.mtb.Reference;
import dev.pcvolkmer.onco.datamapper.ResultSet;
import dev.pcvolkmer.onco.datamapper.datacatalogues.TherapielinieCatalogue;
import java.util.List;
import java.util.stream.Collectors;
/**
* Mapper class to load and map prozedur data from database table 'dk_dnpm_therapielinie'
*
@ -17,10 +14,8 @@ import java.util.stream.Collectors;
*/
public class KpaTherapielinieDataMapper extends AbstractKpaTherapieverlaufDataMapper<MtbSystemicTherapy> {
private final TherapielinieCatalogue catalogue;
public KpaTherapielinieDataMapper(final TherapielinieCatalogue catalogue) {
this.catalogue = catalogue;
super(catalogue);
}
/**
@ -36,14 +31,7 @@ public class KpaTherapielinieDataMapper extends AbstractKpaTherapieverlaufDataMa
}
@Override
public List<MtbSystemicTherapy> getByParentId(final int parentId) {
return catalogue.getAllByParentId(parentId)
.stream()
.map(this::map)
.collect(Collectors.toList());
}
private MtbSystemicTherapy map(final ResultSet resultSet) {
protected MtbSystemicTherapy map(final ResultSet resultSet) {
var diseases = catalogue.getDiseases(resultSet.getProcedureId());
if (diseases.size() != 1) {

17
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTumorausbreitungDataMapper.java
View File

@ -6,7 +6,6 @@ import dev.pcvolkmer.onco.datamapper.datacatalogues.TumorausbreitungCatalogue;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@ -16,12 +15,10 @@ import java.util.stream.Collectors;
* @author Paul-Christian Volkmer
* @since 0.1
*/
public class KpaTumorausbreitungDataMapper implements SubformDataMapper<TumorStaging> {
private final TumorausbreitungCatalogue catalogue;
public class KpaTumorausbreitungDataMapper extends AbstractSubformDataMapper<TumorStaging> {
public KpaTumorausbreitungDataMapper(final TumorausbreitungCatalogue catalogue) {
this.catalogue = catalogue;
super(catalogue);
}
/**
@ -37,15 +34,7 @@ public class KpaTumorausbreitungDataMapper implements SubformDataMapper<TumorSta
}
@Override
public List<TumorStaging> getByParentId(final int parentId) {
return catalogue.getAllByParentId(parentId)
.stream()
.map(this::map)
.sorted(Comparator.comparing(TumorStaging::getDate))
.collect(Collectors.toList());
}
private TumorStaging map(final ResultSet resultSet) {
protected TumorStaging map(final ResultSet resultSet) {
var builder = TumorStaging.builder();
builder
.date(resultSet.getDate("zeitpunkt"))

7
src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTumorausbreitungDataMapperTest.java
View File

@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class KpaTumorausbreitungDataMapperTest {
@ -60,16 +59,10 @@ class KpaTumorausbreitungDataMapperTest {
return testData.get(columnName);
}).when(resultSet).getDate(anyString());
when(resultSet.getProcedureId()).thenReturn(1);
doAnswer(invocationOnMock -> List.of(resultSet))
.when(catalogue)
.getAllByParentId(anyInt());
doAnswer(invocationOnMock -> List.of(resultSet))
.when(catalogue)
.getDiseases(anyInt());
var actualList = this.dataMapper.getByParentId(1);
assertThat(actualList).hasSize(1);