diff options
7 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/DNPM/analyzer/DNPMHelper.java b/src/main/java/DNPM/analyzer/DNPMHelper.java index 9bfa04a..c6d3d47 100644 --- a/src/main/java/DNPM/analyzer/DNPMHelper.java +++ b/src/main/java/DNPM/analyzer/DNPMHelper.java @@ -252,7 +252,7 @@ public class DNPMHelper extends BackendService { } if (personPoolBasedPermissionEvaluator.hasPermission(SecurityContextHolder.getContext().getAuthentication(), patient, PermissionType.READ)) { - return systemtherapieService.ecogSatus(patient); + return systemtherapieService.ecogStatus(patient); } throw new IllegalSecuredObjectAccessException("Kein Zugriff auf diesen Patienten"); diff --git a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java b/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java index af7fb9d..f886f3d 100644 --- a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java +++ b/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java @@ -89,7 +89,7 @@ public class SystemtherapieAnalyzer extends Analyzer { return; } - var ecogFromCompleted = systemtherapieService.ecogSatus(procedure.getPatient()) + var ecogFromCompleted = systemtherapieService.ecogStatus(procedure.getPatient()) .stream() .filter(ecogStatusWithDate -> ecogStatusWithDate.getDate().after(disease.getDiagnosisDate())) .collect(Collectors.toList()); diff --git a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java b/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java index 377e3d9..58b2b78 100644 --- a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java +++ b/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java @@ -62,7 +62,7 @@ public class DefaultSystemtherapieService implements SystemtherapieService { */ @Override public Optional<String> latestEcogStatus(Patient patient) { - return ecogSatus(patient).stream() + return ecogStatus(patient).stream() .max(Comparator.comparing(EcogStatusWithDate::getDate)) .map(EcogStatusWithDate::getStatus); } @@ -74,7 +74,7 @@ public class DefaultSystemtherapieService implements SystemtherapieService { * @return Eine Liste mit Datum und ECOG-Status als String */ @Override - public List<EcogStatusWithDate> ecogSatus(Patient patient) { + public List<EcogStatusWithDate> ecogStatus(Patient patient) { return patient.getDiseases().stream() .flatMap(disease -> onkostarApi.getProceduresForDiseaseByForm(disease.getId(), getFormName()).stream()) .filter(procedure -> procedure.getEditState() == ProcedureEditStateType.COMPLETED) diff --git a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java b/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java index a664c05..ea26c0c 100644 --- a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java +++ b/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java @@ -41,7 +41,7 @@ public interface SystemtherapieService { * @param patient Der zu verwendende Patient * @return Eine Liste mit Datum und ECOG-Status als String */ - List<EcogStatusWithDate> ecogSatus(Patient patient); + List<EcogStatusWithDate> ecogStatus(Patient patient); /** * Datenklasse zum Abbilden des ECOG-Status und Datum diff --git a/src/test/java/DNPM/DNPMHelperTest.java b/src/test/java/DNPM/DNPMHelperTest.java index 7fd8b63..edebf7b 100644 --- a/src/test/java/DNPM/DNPMHelperTest.java +++ b/src/test/java/DNPM/DNPMHelperTest.java @@ -270,7 +270,7 @@ class DNPMHelperTest { dnpmHelper.getEcogStatus(Map.of("PatientId", 42)); var argumentCaptor = ArgumentCaptor.forClass(Patient.class); - verify(systemtherapieService, times(1)).ecogSatus(argumentCaptor.capture()); + verify(systemtherapieService, times(1)).ecogStatus(argumentCaptor.capture()); assertThat(argumentCaptor.getValue()).isNotNull(); assertThat(argumentCaptor.getValue().getId()).isEqualTo(42); } diff --git a/src/test/java/DNPM/analyzer/SystemtherapieAnalyzerTest.java b/src/test/java/DNPM/analyzer/SystemtherapieAnalyzerTest.java index 4028aec..1fa57c0 100644 --- a/src/test/java/DNPM/analyzer/SystemtherapieAnalyzerTest.java +++ b/src/test/java/DNPM/analyzer/SystemtherapieAnalyzerTest.java @@ -55,7 +55,7 @@ class SystemtherapieAnalyzerTest { final var procedureDate = daysPassed(1); doAnswer(invocationOnMock -> List.of(new SystemtherapieService.EcogStatusWithDate(ecogDate, "0"))) - .when(systemtherapieService).ecogSatus(any(Patient.class)); + .when(systemtherapieService).ecogStatus(any(Patient.class)); var patient = new Patient(onkostarApi); patient.setId(1); @@ -89,7 +89,7 @@ class SystemtherapieAnalyzerTest { final var procedureDate = daysPassed(1); doAnswer(invocationOnMock -> List.of()) - .when(systemtherapieService).ecogSatus(any(Patient.class)); + .when(systemtherapieService).ecogStatus(any(Patient.class)); var patient = new Patient(onkostarApi); patient.setId(1); @@ -115,7 +115,7 @@ class SystemtherapieAnalyzerTest { final var procedureDate = daysPassed(1); doAnswer(invocationOnMock -> List.of(new SystemtherapieService.EcogStatusWithDate(ecogDate, "0"))) - .when(systemtherapieService).ecogSatus(any(Patient.class)); + .when(systemtherapieService).ecogStatus(any(Patient.class)); var patient = new Patient(onkostarApi); patient.setId(1); diff --git a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java b/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java index 7852187..686a44a 100644 --- a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java +++ b/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java @@ -123,7 +123,7 @@ class DefaultSystemtherapieServiceTest { var patient = new Patient(onkostarApi); patient.setId(1); - var actual = service.ecogSatus(patient); + var actual = service.ecogStatus(patient); assertThat(actual) .isNotNull() |