pcvolkmer/onkostar-plugin-dnpm
1
0
Fork 0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-03 17:52:53 +00:00
Code Issues Activity

Verwende konkrete Rückgabetypen und füge weitere Prüfungen für InputMap hinzu

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-03-28 14:30:36 +02:00
parent 4c0d94f28e
commit 2402a1ff01
2 changed files with 126 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/DNPM/DNPMHelper.java
View File

@ -83,11 +83,16 @@ public class DNPMHelper implements IProcedureAnalyzer {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Object getVerweise(final Map<String, Object> input) { public List<Map<String, String>> getVerweise(final Map<String, Object> input) {
int ProcedureId = (int) input.get("ProcedureId"); var procedureId = AnalyzerUtils.getRequiredId(input, "ProcedureId");
int PatientId = (int) input.get("PatientId"); var patientId = AnalyzerUtils.getRequiredId(input, "PatientId");
if (procedureId.isEmpty() || patientId.isEmpty()) {
return null;
}
int value = 0; int value = 0;
List<Map<String, String>> VerbundeneFormulare = new ArrayList<Map<String, String>>(); var VerbundeneFormulare = new ArrayList<Map<String, String>>();
try { try {
SessionFactory sessionFactory = onkostarApi.getSessionFactory(); SessionFactory sessionFactory = onkostarApi.getSessionFactory();
@ -99,7 +104,7 @@ public class DNPMHelper implements IProcedureAnalyzer {
"LEFT JOIN data_catalogue_entry ON data_catalogue_entry.data_catalogue_id = data_form_data_catalogue.data_catalogue_id " + "LEFT JOIN data_catalogue_entry ON data_catalogue_entry.data_catalogue_id = data_form_data_catalogue.data_catalogue_id " +
"LEFT JOIN data_catalogue ON data_catalogue.id = data_catalogue_entry.data_catalogue_id " + "LEFT JOIN data_catalogue ON data_catalogue.id = data_catalogue_entry.data_catalogue_id " +
"LEFT JOIN data_form ON data_form.id = prozedur.data_form_id " + "LEFT JOIN data_form ON data_form.id = prozedur.data_form_id " +
"WHERE patient_id = " + PatientId + " " + "WHERE patient_id = " + patientId.get() + " " +
"AND geloescht = 0 " + "AND geloescht = 0 " +
"AND data_catalogue_entry.type = 'formReference' " + "AND data_catalogue_entry.type = 'formReference' " +
"GROUP BY prozedur.id, prozedur.data_form_id, data_catalogue.name, data_catalogue_entry.name"; "GROUP BY prozedur.id, prozedur.data_form_id, data_catalogue.name, data_catalogue_entry.name";
@ -122,7 +127,7 @@ public class DNPMHelper implements IProcedureAnalyzer {
if (query.uniqueResult() != null) { if (query.uniqueResult() != null) {
value = (Integer) query.uniqueResult(); value = (Integer) query.uniqueResult();
} }
if (value == ProcedureId) { if (value == procedureId.get()) {
VerbundeneFormulare.add(Map.of("formular", var.getVerbundenesFormular())); VerbundeneFormulare.add(Map.of("formular", var.getVerbundenesFormular()));
value = 0; value = 0;
} }
@ -150,18 +155,22 @@ public class DNPMHelper implements IProcedureAnalyzer {
return systemtherapieService.getSystemischeTherapienFromDiagnose(diagnoseId.get()); return systemtherapieService.getSystemischeTherapienFromDiagnose(diagnoseId.get());
} }
public Object getProzedurenFromDiagnose(final Map<String, Object> input) { public String getProzedurenFromDiagnose(final Map<String, Object> input) {
String dataForm = (String) input.get("dataForm");
int DiagnoseId = (int) input.get("DiagnoseId");
int PatientId = (int) input.get("PatientId");
// Prozedur, Feldname, Wert // Prozedur, Feldname, Wert
var dataForm = AnalyzerUtils.getRequiredValue(input, "dataForm", String.class);
var diagnoseId = AnalyzerUtils.getRequiredId(input, "DiagnoseId");
var patientId = AnalyzerUtils.getRequiredId(input, "PatientId");
if (dataForm.isEmpty() || diagnoseId.isEmpty() || patientId.isEmpty()) {
return "";
}
List<Object> Formulare = new ArrayList<Object>(); List<Object> Formulare = new ArrayList<Object>();
String jsonStr = ""; String jsonStr = "";
List<Procedure> Prozeduren = onkostarApi.getProceduresByPatientId(PatientId); List<Procedure> Prozeduren = onkostarApi.getProceduresByPatientId(patientId.get());
for (Procedure Prozedur : Prozeduren) { for (Procedure Prozedur : Prozeduren) {
// Formular gehört zur aktuellen Diagnose und hat den angegebenen Namen // Formular gehört zur aktuellen Diagnose und hat den angegebenen Namen
if (Prozedur.getDiseaseIds().contains(DiagnoseId) && Prozedur.getFormName().contains(dataForm)) { if (Prozedur.getDiseaseIds().contains(diagnoseId.get()) && Prozedur.getFormName().contains(dataForm.get())) {
// alle Werte auslesen // alle Werte auslesen
Map<String, Item> Werte = Prozedur.getAllValues(); Map<String, Item> Werte = Prozedur.getAllValues();
Map<String, Object> Values = new HashMap<>(); Map<String, Object> Values = new HashMap<>();

144
src/test/java/DNPM/DNPMHelperTest.java
View File

@ -6,6 +6,7 @@ import org.hibernate.SQLQuery;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@ -60,57 +61,122 @@ class DNPMHelperTest {
assertThat(actual).isNull(); assertThat(actual).isNull();
} }
@Test @Nested
void testShouldReturnFalseIfNoRidAndNoBdCallingUpdateEmpfehlungPrio() { class UpdateEmpfehlungPrioTests {
var actual = dnpmHelper.updateEmpfehlungPrio(new HashMap<>());
@Test
void testShouldReturnFalseIfNoRidAndNoBdCallingUpdateEmpfehlungPrio() {
var actual = dnpmHelper.updateEmpfehlungPrio(new HashMap<>());
assertThat(actual).isEqualTo(false);
}
@Test
void testShouldReturnFalseIfNoRidCallingUpdateEmpfehlungPrio() {
var actual = dnpmHelper.updateEmpfehlungPrio(Map.of("bd", "2023-01-01"));
assertThat(actual).isEqualTo(false);
}
@Test
void testShouldReturnFalseIfNoBdCallingUpdateEmpfehlungPrio() {
var actual = dnpmHelper.updateEmpfehlungPrio(Map.of("rid", 1234));
assertThat(actual).isEqualTo(false);
}
@Test
void testShouldReturnTrueIfRidAndBdPresentCallingUpdateEmpfehlungPrio() {
var sessionFactory = mock(SessionFactory.class);
var session = mock(Session.class);
var query = mock(SQLQuery.class);
when(onkostarApi.getSessionFactory()).thenReturn(sessionFactory);
when(sessionFactory.getCurrentSession()).thenReturn(session);
when(session.createSQLQuery(anyString())).thenReturn(query);
var actual = dnpmHelper.updateEmpfehlungPrio(Map.of("rid", 1234, "bd", "2023-01-01"));
assertThat(actual).isEqualTo(true);
}
@Test
void testShouldCreateSqlQueryWithRidAndBdCallingUpdateEmpfehlungPrio() {
var sessionFactory = mock(SessionFactory.class);
var session = mock(Session.class);
var query = mock(SQLQuery.class);
when(onkostarApi.getSessionFactory()).thenReturn(sessionFactory);
when(sessionFactory.getCurrentSession()).thenReturn(session);
when(session.createSQLQuery(anyString())).thenReturn(query);
dnpmHelper.updateEmpfehlungPrio(Map.of("rid", 1234, "bd", "2023-01-01"));
var argumentCaptor = ArgumentCaptor.forClass(String.class);
verify(session, times(1)).createSQLQuery(argumentCaptor.capture());
assertThat(argumentCaptor.getValue()).isEqualTo("UPDATE prozedur SET beginndatum = '2023-01-01' WHERE id = '1234' ");
}
assertThat(actual).isEqualTo(false);
} }
@Test @Nested
void testShouldReturnFalseIfNoRidCallingUpdateEmpfehlungPrio() { class GetProzedurenFromDiagnoseTests {
var actual = dnpmHelper.updateEmpfehlungPrio(Map.of("bd", "2023-01-01")); @Test
void testShouldReturnEmptyStringOnParamCheckIfNoDataFormParamGiven() {
var actual = dnpmHelper.getProzedurenFromDiagnose(Map.of("DiagnoseId", 1, "PatientId", 2));
assertThat(actual).isEqualTo("");
assertThat(actual).isEqualTo(false); verify(onkostarApi, times(0)).getProceduresByPatientId(anyInt());
}
@Test
void testShouldReturnEmptyStringOnParamCheckIfNoDiagnoseIdParamGiven() {
var actual = dnpmHelper.getProzedurenFromDiagnose(Map.of("dataForm", "OS.Example", "PatientId", 2));
assertThat(actual).isEqualTo("");
verify(onkostarApi, times(0)).getProceduresByPatientId(anyInt());
}
@Test
void testShouldReturnEmptyStringOnParamCheckIfNoPatientIdParamGiven() {
var actual = dnpmHelper.getProzedurenFromDiagnose(Map.of("dataForm", "OS.Example", "DiagnoseId", 1));
assertThat(actual).isEqualTo("");
verify(onkostarApi, times(0)).getProceduresByPatientId(anyInt());
}
@Test
void testShouldRequestProceduresIfRequiredParamsGiven() {
dnpmHelper.getProzedurenFromDiagnose(Map.of("dataForm", "OS.Example", "DiagnoseId", 1, "PatientId", 2));
verify(onkostarApi, times(1)).getProceduresByPatientId(anyInt());
}
} }
@Test @Nested
void testShouldReturnFalseIfNoBdCallingUpdateEmpfehlungPrio() { class GetVerweiseTests {
var actual = dnpmHelper.updateEmpfehlungPrio(Map.of("rid", 1234));
assertThat(actual).isEqualTo(false); @Test
} void testShouldReturnEmptyArrayIfNoProcedureIdParamGiven() {
var actual = dnpmHelper.getVerweise(Map.of("PatientId", 2));
assertThat(actual).isNull();
@Test verify(onkostarApi, times(0)).getSessionFactory();
void testShouldReturnTrueIfRidAndBdPresentCallingUpdateEmpfehlungPrio() { }
var sessionFactory = mock(SessionFactory.class);
var session = mock(Session.class);
var query = mock(SQLQuery.class);
when(onkostarApi.getSessionFactory()).thenReturn(sessionFactory); @Test
when(sessionFactory.getCurrentSession()).thenReturn(session); void testShouldReturnEmptyArrayIfNoPatientIdParamGiven() {
when(session.createSQLQuery(anyString())).thenReturn(query); var actual = dnpmHelper.getVerweise(Map.of("ProcedureId", 1));
assertThat(actual).isNull();
var actual = dnpmHelper.updateEmpfehlungPrio(Map.of("rid", 1234, "bd", "2023-01-01")); verify(onkostarApi, times(0)).getSessionFactory();
}
assertThat(actual).isEqualTo(true); @Test
} void testShouldRequestSessionFactoryIfRequiredParamsGiven() {
dnpmHelper.getVerweise(Map.of("ProcedureId", 1, "PatientId", 2));
verify(onkostarApi, times(1)).getSessionFactory();
}
@Test
void testShouldCreateSqlQueryWithRidAndBdCallingUpdateEmpfehlungPrio() {
var sessionFactory = mock(SessionFactory.class);
var session = mock(Session.class);
var query = mock(SQLQuery.class);
when(onkostarApi.getSessionFactory()).thenReturn(sessionFactory);
when(sessionFactory.getCurrentSession()).thenReturn(session);
when(session.createSQLQuery(anyString())).thenReturn(query);
dnpmHelper.updateEmpfehlungPrio(Map.of("rid", 1234, "bd", "2023-01-01"));
var argumentCaptor = ArgumentCaptor.forClass(String.class);
verify(session, times(1)).createSQLQuery(argumentCaptor.capture());
assertThat(argumentCaptor.getValue()).isEqualTo("UPDATE prozedur SET beginndatum = '2023-01-01' WHERE id = '1234' ");
} }
} }