pcvolkmer/onkostar-plugin-dnpm
1
0
Fork 0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-02 01:02:55 +00:00
Code Issues Activity

Issue #42: Verschiebe Pluginklassen in Paket 'analyzer' und passe an

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-08-29 09:19:33 +02:00
parent e60e0953f5
commit b8e795d22e
7 changed files with 14 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/DNPM/ConsentManager.java → src/main/java/DNPM/analyzer/ConsentManager.java
View File

@ -1,16 +1,14 @@
package DNPM;
package DNPM.analyzer;
import DNPM.services.consent.ConsentManagerServiceFactory;
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 de.itc.onkostar.api.analysis.IProcedureAnalyzer;
import de.itc.onkostar.api.analysis.OnkostarPluginType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ConsentManager implements IProcedureAnalyzer {
public class ConsentManager extends Analyzer {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@ -31,26 +29,11 @@ public class ConsentManager implements IProcedureAnalyzer {
return "Aktualisiert Consent Daten in verknüpften Formularen";
}
@Override
public String getName() {
return "Consent Manager";
}
@Override
public AnalyzerRequirement getRequirement() {
return AnalyzerRequirement.PROCEDURE;
}
@Override
public OnkostarPluginType getType() {
return OnkostarPluginType.ANALYZER;
}
@Override
public String getVersion() {
return "0.3.0";
}
@Override
public boolean isRelevantForAnalyzer(Procedure prozedur, Disease erkrankung) {
return prozedur.getFormName().equals(onkostarApi.getGlobalSetting("consentform"));

32
src/main/java/DNPM/DNPMHelper.java → src/main/java/DNPM/analyzer/DNPMHelper.java
View File

@ -1,6 +1,6 @@
package DNPM;
package DNPM.analyzer;
import DNPM.analyzer.AnalyzerUtils;
import DNPM.VerweisVon;
import DNPM.security.IllegalSecuredObjectAccessException;
import DNPM.security.PermissionType;
import DNPM.security.PersonPoolBasedPermissionEvaluator;
@ -11,8 +11,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 de.itc.onkostar.api.analysis.IProcedureAnalyzer;
import de.itc.onkostar.api.analysis.OnkostarPluginType;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@ -27,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class DNPMHelper implements IProcedureAnalyzer {
public class DNPMHelper extends BackendService {
private static final Logger logger = LoggerFactory.getLogger(DNPMHelper.class);
@ -41,29 +39,12 @@ public class DNPMHelper implements IProcedureAnalyzer {
final IOnkostarApi onkostarApi,
final SystemtherapieService systemtherapieService,
final PersonPoolBasedPermissionEvaluator permissionEvaluator
) {
) {
this.onkostarApi = onkostarApi;
this.systemtherapieService = systemtherapieService;
this.personPoolBasedPermissionEvaluator = permissionEvaluator;
}
@Override
public OnkostarPluginType getType() {
// Typ des Plugins
// Für das Interface IProcedureAnalyzer gültig sind ANALYZER und BACKEND_SERVICE
return OnkostarPluginType.BACKEND_SERVICE;
}
@Override
public String getVersion() {
return "0.4.0";
}
@Override
public String getName() {
return "UMR DNPM";
}
@Override
public String getDescription() {
return "Methoden für DNPM-Formulare";
@ -90,11 +71,6 @@ public class DNPMHelper implements IProcedureAnalyzer {
return false;
}
@Override
public void analyze(Procedure entry, Disease currentDisease) {
// wird nicht benötigt, da dass Plugin nicht ausgeführt wird
}
@SuppressWarnings("unchecked")
public List<Map<String, String>> getVerweise(final Map<String, Object> input) {
var procedureId = AnalyzerUtils.getRequiredId(input, "ProcedureId");

26
src/main/java/DNPM/Merkmalskatalog.java → src/main/java/DNPM/analyzer/Merkmalskatalog.java
View File

@ -1,12 +1,9 @@
package DNPM;
package DNPM.analyzer;
import DNPM.analyzer.AnalyzerUtils;
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 de.itc.onkostar.api.analysis.IProcedureAnalyzer;
import de.itc.onkostar.api.analysis.OnkostarPluginType;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@ -17,7 +14,7 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Map;
public class Merkmalskatalog implements IProcedureAnalyzer {
public class Merkmalskatalog extends BackendService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@ -27,21 +24,6 @@ public class Merkmalskatalog implements IProcedureAnalyzer {
this.onkostarApi = onkostarApi;
}
@Override
public OnkostarPluginType getType() {
return OnkostarPluginType.BACKEND_SERVICE;
}
@Override
public String getVersion() {
return "0.3.0";
}
@Override
public String getName() {
return "UMR Merkmalskatalog";
}
@Override
public String getDescription() {
return "Methoden für Merkmalskataloge";
@ -67,10 +49,6 @@ public class Merkmalskatalog implements IProcedureAnalyzer {
return false;
}
@Override
public void analyze(Procedure procedure, Disease disease) {
}
public List<String[]> getMerkmalskatalog(final Map<String, Object> input) {
var merkmalskatalog = AnalyzerUtils.getRequiredValue(input, "Merkmalskatalog", String.class);
var spalten = AnalyzerUtils.getRequiredValue(input, "Spalten", String.class);

6
src/main/resources/de/itc/onkostar/library/moduleContext.xml
View File

@ -10,14 +10,14 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean id="DNPMHelper" class="DNPM.DNPMHelper">
<bean id="DNPMHelper" class="DNPM.analyzer.DNPMHelper">
<constructor-arg ref="localOnkostarApi" />
<constructor-arg ref="systemtherapieService" />
</bean>
<bean id="Merkmalskatalog" class="DNPM.Merkmalskatalog">
<bean id="Merkmalskatalog" class="DNPM.analyzer.Merkmalskatalog">
<constructor-arg ref="localOnkostarApi" />
</bean>
<bean id="ConsentManager" class="DNPM.ConsentManager">
<bean id="ConsentManager" class="DNPM.analyzer.ConsentManager">
<constructor-arg ref="localOnkostarApi" />
<constructor-arg ref="consentManagerServiceFactory" />
</bean>

1
src/test/java/DNPM/ConsentManagerTest.java
View File

@ -1,5 +1,6 @@
package DNPM;
import DNPM.analyzer.ConsentManager;
import DNPM.services.consent.ConsentManagerServiceFactory;
import DNPM.services.consent.MrConsentManagerService;
import de.itc.onkostar.api.IOnkostarApi;

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

@ -1,5 +1,6 @@
package DNPM;
import DNPM.analyzer.DNPMHelper;
import DNPM.security.IllegalSecuredObjectAccessException;
import DNPM.security.PermissionType;
import DNPM.security.PersonPoolBasedPermissionEvaluator;

1
src/test/java/DNPM/MerkmalskatalogTest.java
View File

@ -1,5 +1,6 @@
package DNPM;
import DNPM.analyzer.Merkmalskatalog;
import de.itc.onkostar.api.IOnkostarApi;
import org.hibernate.SQLQuery;
import org.hibernate.Session;