From cdcdb21eca393b17ac5d075c5a002d30ccf038c5 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Fri, 4 Sep 2026 08:14:28 +0200 Subject: refactor: remove deprecated ConsentManagerService (#294) --- .../dev/dnpm/oshelper/analyzer/ConsentManager.java | 17 +-- .../dnpm/oshelper/config/PluginConfiguration.java | 6 - .../services/consent/ConsentManagerService.java | 48 ------- .../consent/ConsentManagerServiceFactory.java | 45 ------ .../services/consent/MrConsentManagerService.java | 153 --------------------- .../services/consent/UkwConsentManagerService.java | 93 ------------- 6 files changed, 2 insertions(+), 360 deletions(-) delete mode 100644 src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerService.java delete mode 100644 src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactory.java delete mode 100644 src/main/java/dev/dnpm/oshelper/services/consent/MrConsentManagerService.java delete mode 100644 src/main/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerService.java (limited to 'src/main') diff --git a/src/main/java/dev/dnpm/oshelper/analyzer/ConsentManager.java b/src/main/java/dev/dnpm/oshelper/analyzer/ConsentManager.java index 924e726..946c5e0 100644 --- a/src/main/java/dev/dnpm/oshelper/analyzer/ConsentManager.java +++ b/src/main/java/dev/dnpm/oshelper/analyzer/ConsentManager.java @@ -23,7 +23,6 @@ import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.analysis.AnalyzerRequirement; -import dev.dnpm.oshelper.services.consent.ConsentManagerServiceFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,13 +32,8 @@ public class ConsentManager extends Analyzer { private final IOnkostarApi onkostarApi; - private final ConsentManagerServiceFactory consentManagerServiceFactory; - - public ConsentManager( - final IOnkostarApi onkostarApi, - final ConsentManagerServiceFactory consentManagerServiceFactory) { + public ConsentManager(final IOnkostarApi onkostarApi) { this.onkostarApi = onkostarApi; - this.consentManagerServiceFactory = consentManagerServiceFactory; } @Override @@ -70,13 +64,6 @@ public class ConsentManager extends Analyzer { @Override public void analyze(Procedure prozedur, Disease erkrankung) { - var consentManagerService = consentManagerServiceFactory.currentUsableInstance(); - if (!consentManagerService.canApply(prozedur)) { - logger.error( - "Fehler im ConsentManagement: Kann Prozedur mit Formularnamen '{}' nicht anwenden", - prozedur.getFormName()); - return; - } - consentManagerService.applyConsent(prozedur); + // Left for removal } } diff --git a/src/main/java/dev/dnpm/oshelper/config/PluginConfiguration.java b/src/main/java/dev/dnpm/oshelper/config/PluginConfiguration.java index 3e2ea44..5fc80d0 100644 --- a/src/main/java/dev/dnpm/oshelper/config/PluginConfiguration.java +++ b/src/main/java/dev/dnpm/oshelper/config/PluginConfiguration.java @@ -25,7 +25,6 @@ import dev.dnpm.oshelper.atc.services.CsvAgentCodeService; import dev.dnpm.oshelper.atc.services.OnkostarAgentCodeService; import dev.dnpm.oshelper.database.SettingsRepository; import dev.dnpm.oshelper.services.*; -import dev.dnpm.oshelper.services.consent.ConsentManagerServiceFactory; import dev.dnpm.oshelper.services.molekulargenetik.MolekulargenetikFormService; import dev.dnpm.oshelper.services.molekulargenetik.OsMolekulargenetikFormService; import dev.dnpm.oshelper.services.strahlentherapie.DefaultStrahlentherapieService; @@ -76,11 +75,6 @@ public class PluginConfiguration { return new DefaultStrahlentherapieService(onkostarApi, settingsService); } - @Bean - public ConsentManagerServiceFactory consentManagerServiceFactory(final IOnkostarApi onkostarApi) { - return new ConsentManagerServiceFactory(onkostarApi); - } - @Bean public TherapieplanServiceFactory therapieplanServiceFactory( final IOnkostarApi onkostarApi, diff --git a/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerService.java b/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerService.java deleted file mode 100644 index edfeddd..0000000 --- a/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerService.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of onkostar-plugin-dnpm - * - * Copyright (C) 2023-2026 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package dev.dnpm.oshelper.services.consent; - -import de.itc.onkostar.api.Procedure; - -/** - * Schnittstelle für die Anwendung von Consent-Änderungen - * - * @since 0.2.0 - */ -@Deprecated(forRemoval = true, since = "2.0.0") -public interface ConsentManagerService { - - /** - * Wende Consent an, wenn dieses Consent-Formular gespeichert wird - * - * @param procedure Prozedur des Consent-Formulars - */ - void applyConsent(Procedure procedure); - - /** - * Optionale Prüfung, ob die angegebene Prozedur angewendet werden kann. - * - * @param procedure Anzuwendende Prozedur - * @return Gibt true zurück, wenn die Prozedur angewendet werden kann. - */ - default boolean canApply(Procedure procedure) { - return null != procedure; - } -} diff --git a/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactory.java b/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactory.java deleted file mode 100644 index 81d864b..0000000 --- a/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactory.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of onkostar-plugin-dnpm - * - * Copyright (C) 2023-2026 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package dev.dnpm.oshelper.services.consent; - -import de.itc.onkostar.api.IOnkostarApi; - -@Deprecated(forRemoval = true, since = "2.0.0") -public class ConsentManagerServiceFactory { - - private final IOnkostarApi onkostarApi; - - public ConsentManagerServiceFactory(final IOnkostarApi onkostarApi) { - this.onkostarApi = onkostarApi; - } - - public ConsentManagerService currentUsableInstance() { - var consentFormName = onkostarApi.getGlobalSetting("consentform"); - - switch (consentFormName) { - case "Excel-Formular": - return new UkwConsentManagerService(this.onkostarApi); - case "MR.Consent": - return new MrConsentManagerService(this.onkostarApi); - default: - return procedure -> {}; - } - } -} diff --git a/src/main/java/dev/dnpm/oshelper/services/consent/MrConsentManagerService.java b/src/main/java/dev/dnpm/oshelper/services/consent/MrConsentManagerService.java deleted file mode 100644 index c01568a..0000000 --- a/src/main/java/dev/dnpm/oshelper/services/consent/MrConsentManagerService.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * This file is part of onkostar-plugin-dnpm - * - * Copyright (C) 2023-2026 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package dev.dnpm.oshelper.services.consent; - -import de.itc.onkostar.api.IOnkostarApi; -import de.itc.onkostar.api.Item; -import de.itc.onkostar.api.Procedure; -import dev.dnpm.oshelper.VerweisVon; -import java.util.List; -import java.util.Map; -import org.hibernate.SQLQuery; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.transform.Transformers; -import org.hibernate.type.StandardBasicTypes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Detailimplementierung für das Formular `MR.Consent` - * - * @since 0.2.0 - */ -@Deprecated(forRemoval = true, since = "2.0.0") -public class MrConsentManagerService implements ConsentManagerService { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private final IOnkostarApi onkostarApi; - - public MrConsentManagerService(final IOnkostarApi onkostarApi) { - this.onkostarApi = onkostarApi; - } - - @Override - public boolean canApply(Procedure procedure) { - return null != procedure && procedure.getFormName().equals("MR.Consent"); - } - - /** - * Wende Consent an, wenn dieses Consent-Formular gespeichert wird - * - * @param procedure Prozedur des Consent-Formulars - */ - @Override - public void applyConsent(Procedure procedure) { - int value = 0; - try { - SessionFactory sessionFactory = onkostarApi.getSessionFactory(); - Session session = sessionFactory.getCurrentSession(); - // geänderte Werte checken - String sql1 = - "select id, max(timestamp) AS datum from aenderungsprotokoll where entity_id = '" - + procedure.getId() - + "'"; - SQLQuery query1 = - session - .createSQLQuery(sql1) - .addScalar("id", StandardBasicTypes.INTEGER) - .addScalar("datum", StandardBasicTypes.TIMESTAMP); - logger.info("Wert-Check: {}", query1.uniqueResult()); - - String sql = - "SELECT prozedur.id AS procedure_id, prozedur.data_form_id, data_catalogue.name AS data_catalogue, data_catalogue_entry.name AS data_catalogue_entry, data_form.description AS formname, prozedur.beginndatum AS datum " - + "FROM prozedur " - + "LEFT JOIN data_form_data_catalogue ON data_form_data_catalogue.data_form_id = prozedur.data_form_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_form ON data_form.id = prozedur.data_form_id " - + "WHERE patient_id = " - + procedure.getPatientId() - + " " - + "AND geloescht = 0 " - + "AND data_catalogue_entry.type = 'formReference' " - + "GROUP BY prozedur.id, prozedur.data_form_id, data_catalogue.name, data_catalogue_entry.name"; - - SQLQuery query = - session - .createSQLQuery(sql) - .addScalar("procedure_id", StandardBasicTypes.INTEGER) - .addScalar("data_form_id", StandardBasicTypes.INTEGER) - .addScalar("data_catalogue", StandardBasicTypes.STRING) - .addScalar("data_catalogue_entry", StandardBasicTypes.STRING) - .addScalar("formname", StandardBasicTypes.STRING) - .addScalar("datum", StandardBasicTypes.DATE); - - query.setResultTransformer(Transformers.aliasToBean(VerweisVon.class)); - - @SuppressWarnings("unchecked") - List result = query.list(); - - for (VerweisVon verweisVon : result) { - sql = verweisVon.getSQL(); - query = session.createSQLQuery(sql).addScalar("value", StandardBasicTypes.INTEGER); - if (query.uniqueResult() != null) { - value = (Integer) query.uniqueResult(); - } - if (value == procedure.getId()) { - saveReferencedProcedure(procedure, verweisVon); - value = 0; - } - } - } catch (RuntimeException e) { - logger.error("Sonstiger Fehler bei der Ausführung von analyze()", e); - } - } - - private void saveReferencedProcedure(Procedure prozedur, VerweisVon verweisVon) { - Procedure andereprozedur = onkostarApi.getProcedure(verweisVon.getProcedure_id()); - try { - Map felder = prozedur.getAllValues(); - for (Map.Entry feld : felder.entrySet()) { - if (feld.getKey().startsWith("Consent")) { - if (feld.getKey().equals("ConsentStatusEinwilligungDNPM")) { - switch (feld.getValue().getValue().toString()) { - case "z": - andereprozedur.setValue(feld.getKey(), new Item(feld.getKey(), "active")); - break; - case "a": - case "w": - andereprozedur.setValue(feld.getKey(), new Item(feld.getKey(), "rejected")); - break; - default: - break; - } - } else { - andereprozedur.setValue(feld.getKey(), prozedur.getValue(feld.getKey())); - } - } - } - onkostarApi.saveProcedure(andereprozedur); - } catch (Exception e) { - logger.error("Kann Prozedur nicht speichern", e); - } - } -} diff --git a/src/main/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerService.java b/src/main/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerService.java deleted file mode 100644 index 32f7219..0000000 --- a/src/main/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerService.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * This file is part of onkostar-plugin-dnpm - * - * Copyright (C) 2023-2026 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package dev.dnpm.oshelper.services.consent; - -import de.itc.onkostar.api.IOnkostarApi; -import de.itc.onkostar.api.Item; -import de.itc.onkostar.api.Procedure; -import java.util.Comparator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Detailimplementierung für das Formular `Excel-Formular` - * - * @since 0.2.0 - */ -@Deprecated(forRemoval = true, since = "2.0.0") -public class UkwConsentManagerService implements ConsentManagerService { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private final IOnkostarApi onkostarApi; - - public UkwConsentManagerService(final IOnkostarApi onkostarApi) { - this.onkostarApi = onkostarApi; - } - - @Override - public boolean canApply(Procedure procedure) { - return null != procedure && procedure.getFormName().equals("Excel-Formular"); - } - - /** - * Wende Consent an, wenn dieses Consent-Formular gespeichert wird - * - * @param procedure Prozedur des Consent-Formulars - */ - @Override - public void applyConsent(Procedure procedure) { - var refdnpmklinikanamnese = procedure.getValue("refdnpmklinikanamnese").getInt(); - var dnpmKlinikAnamnese = this.onkostarApi.getProcedure(refdnpmklinikanamnese); - - if (null == dnpmKlinikAnamnese) { - return; - } - - var consents = procedure.getSubProceduresMap().get("ufdnpmconsent"); - - if (null == consents) { - return; - } - - consents.stream() - .max(Comparator.comparing(Procedure::getStartDate)) - .ifPresent( - lastConsent -> { - var date = lastConsent.getStartDate(); - var status = lastConsent.getValue("status"); - if (null == date || null == status || status.getString().isBlank()) { - logger.warn("Kein DNPM-Einwilligungstatus angegeben"); - return; - } - - dnpmKlinikAnamnese.setValue( - "ConsentStatusEinwilligungDNPM", new Item("Einwilligung", status.getString())); - dnpmKlinikAnamnese.setValue( - "ConsentDatumEinwilligungDNPM", new Item("DatumEinwilligung", date)); - - try { - onkostarApi.saveProcedure(dnpmKlinikAnamnese, false); - } catch (Exception e) { - logger.error("Kann DNPM-Einwilligungstatus nicht aktualisieren", e); - } - }); - } -} -- cgit v1.2.3