pcvolkmer/mv64e-onkostar-data
1
0
Fork 0
mirror of https://github.com/pcvolkmer/mv64e-onkostar-data.git synced 2025-09-14 00:12:52 +00:00
Code Activity

refactor: create mapper with catalogue

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2025-06-20 23:12:38 +02:00
parent 60ff180973
commit 865bebcaa6
8 changed files with 46 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapperTest.java
View File

@@ -1,12 +1,12 @@
package dev.pcvolkmer.onco.datamapper;
import dev.pcvolkmer.mv64e.mtb.MtbDiagnosis;
import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.jdbc.core.JdbcTemplate;
import javax.sql.DataSource;
import java.util.List;
@@ -20,14 +20,14 @@ import static org.mockito.Mockito.doAnswer;
@ExtendWith(MockitoExtension.class)
class KpaDiagnosisDataMapperTest {
JdbcTemplate jdbcTemplate;
KpaCatalogue kpaCatalogue;
KpaDiagnosisDataMapper dataMapper;
@BeforeEach
void setUp(@Mock JdbcTemplate jdbcTemplate) {
this.jdbcTemplate = jdbcTemplate;
this.dataMapper = KpaDiagnosisDataMapper.create(jdbcTemplate);
void setUp(@Mock KpaCatalogue kpaCatalogue) {
this.kpaCatalogue = kpaCatalogue;
this.dataMapper = new KpaDiagnosisDataMapper(kpaCatalogue);
}
@Test
@@ -42,9 +42,9 @@ class KpaDiagnosisDataMapperTest {
return testData().get(columnName);
}).when(resultSet).get(anyString());
doAnswer(invocationOnMock -> List.of(resultSet))
.when(jdbcTemplate)
.queryForList(anyString(), anyInt());
doAnswer(invocationOnMock -> resultSet)
.when(kpaCatalogue)
.getById(anyInt());
var actual = this.dataMapper.getById(1);
assertThat(actual).isInstanceOf(MtbDiagnosis.class);

23
src/test/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapperTest.java
View File

@@ -1,17 +1,16 @@
package dev.pcvolkmer.onco.datamapper;
import dev.pcvolkmer.mv64e.mtb.*;
import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.jdbc.core.JdbcTemplate;
import javax.sql.DataSource;
import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
@@ -22,14 +21,14 @@ import static org.mockito.Mockito.doAnswer;
@ExtendWith(MockitoExtension.class)
class KpaPatientDataMapperTest {
JdbcTemplate jdbcTemplate;
KpaCatalogue kpaCatalogue;
KpaPatientDataMapper dataMapper;
@BeforeEach
void setUp(@Mock JdbcTemplate jdbcTemplate) {
this.jdbcTemplate = jdbcTemplate;
this.dataMapper = KpaPatientDataMapper.create(jdbcTemplate);
void setUp(@Mock KpaCatalogue kpaCatalogue) {
this.kpaCatalogue = kpaCatalogue;
this.dataMapper = new KpaPatientDataMapper(kpaCatalogue);
}
@Test
@@ -52,9 +51,9 @@ class KpaPatientDataMapperTest {
return testData.get(columnName);
}).when(resultSet).get(anyString());
doAnswer(invocationOnMock -> List.of(resultSet))
.when(jdbcTemplate)
.queryForList(anyString(), anyInt());
doAnswer(invocationOnMock -> resultSet)
.when(kpaCatalogue)
.getById(anyInt());
var actual = this.dataMapper.getById(1);
assertThat(actual).isInstanceOf(Patient.class);
@@ -81,9 +80,9 @@ class KpaPatientDataMapperTest {
return testData.get(columnName);
}).when(resultSet).get(anyString());
doAnswer(invocationOnMock -> List.of(resultSet))
.when(jdbcTemplate)
.queryForList(anyString(), anyInt());
doAnswer(invocationOnMock -> resultSet)
.when(kpaCatalogue)
.getById(anyInt());
var actual = this.dataMapper.getById(1);
assertThat(actual).isInstanceOf(Patient.class);

23
src/test/java/dev/pcvolkmer/onco/datamapper/PatientDataMapperTest.java
View File

@@ -3,15 +3,14 @@ package dev.pcvolkmer.onco.datamapper;
import dev.pcvolkmer.mv64e.mtb.Address;
import dev.pcvolkmer.mv64e.mtb.GenderCodingCode;
import dev.pcvolkmer.mv64e.mtb.Patient;
import dev.pcvolkmer.onco.datamapper.datacatalogues.PatientCatalogue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.jdbc.core.JdbcTemplate;
import javax.sql.DataSource;
import java.sql.SQLException;
import java.time.Instant;
import java.util.Date;
import java.util.List;
@@ -25,14 +24,14 @@ import static org.mockito.Mockito.doAnswer;
@ExtendWith(MockitoExtension.class)
class PatientDataMapperTest {
JdbcTemplate jdbcTemplate;
PatientCatalogue patientCatalogue;
PatientDataMapper dataMapper;
@BeforeEach
void setUp(@Mock JdbcTemplate jdbcTemplate) {
this.jdbcTemplate = jdbcTemplate;
this.dataMapper = PatientDataMapper.create(jdbcTemplate);
void setUp(@Mock PatientCatalogue patientCatalogue) {
this.patientCatalogue = patientCatalogue;
this.dataMapper = new PatientDataMapper(patientCatalogue);
}
@Test
@@ -55,9 +54,9 @@ class PatientDataMapperTest {
return testData.get(columnName);
}).when(resultSet).get(anyString());
doAnswer(invocationOnMock -> List.of(resultSet))
.when(jdbcTemplate)
.queryForList(anyString(), anyInt());
doAnswer(invocationOnMock -> resultSet)
.when(patientCatalogue)
.getById(anyInt());
var actual = this.dataMapper.getById(1);
assertThat(actual).isInstanceOf(Patient.class);
@@ -82,9 +81,9 @@ class PatientDataMapperTest {
return testData.get(columnName);
}).when(resultSet).get(anyString());
doAnswer(invocationOnMock -> List.of(resultSet))
.when(jdbcTemplate)
.queryForList(anyString(), anyInt());
doAnswer(invocationOnMock -> resultSet)
.when(patientCatalogue)
.getById(anyInt());
var actual = this.dataMapper.getById(1);
assertThat(actual).isInstanceOf(Patient.class);