Issue #24: Extrahiere Service mit Datenbankanfragen

1 files changed, 9 insertions, 40 deletions

diff --git a/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java b/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java
index 4ba19dc..912a19c 100644
--- a/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java
+++ b/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java
@@ -1,15 +1,11 @@
 package DNPM.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
-import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
-import javax.sql.DataSource;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Permission-Evaluator zur Auswertung der Berechtigung auf Objekte aufgrund der Formularberechtigung
@@ -17,8 +13,8 @@ import java.util.List;
 @Component
 public class FormBasedPermissionEvaluator extends AbstractDelegatedPermissionEvaluator {
 
-    public FormBasedPermissionEvaluator(final IOnkostarApi onkostarApi, final DataSource dataSource) {
-        super(onkostarApi, dataSource);
+    public FormBasedPermissionEvaluator(final IOnkostarApi onkostarApi, final SecurityService securityService) {
+        super(onkostarApi, securityService);
     }
 
     /**
@@ -32,15 +28,11 @@ public class FormBasedPermissionEvaluator extends AbstractDelegatedPermissionEva
      */
     @Override
     public boolean hasPermission(Authentication authentication, Object targetObject, Object permissionType) {
-        if (permissionType instanceof PermissionType) {
-            if (targetObject instanceof Patient) {
-                return true;
-            } else if (targetObject instanceof Procedure) {
-                return getFormNamesForPermission(authentication, (PermissionType)permissionType)
-                        .contains(((Procedure)targetObject).getFormName());
-            }
+        if (permissionType instanceof PermissionType && targetObject instanceof Procedure) {
+            return this.securityService.getFormNamesForPermission(authentication, (PermissionType)permissionType)
+                    .contains(((Procedure)targetObject).getFormName());
         }
-        return false;
+        return true;
     }
 
     /**
@@ -55,36 +47,13 @@ public class FormBasedPermissionEvaluator extends AbstractDelegatedPermissionEva
      */
     @Override
     public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permissionType) {
-        if (targetId instanceof Integer) {
-            if (PATIENT.equals(targetType)) {
-                return true;
-            }
+        if (permissionType instanceof PermissionType && targetId instanceof Integer && PROCEDURE.equals(targetType)) {
             var procedure = this.onkostarApi.getProcedure((int)targetId);
             if (null != procedure) {
-                return getFormNamesForPermission(authentication, (PermissionType) permissionType).contains(procedure.getFormName());
+                return this.securityService.getFormNamesForPermission(authentication, (PermissionType) permissionType).contains(procedure.getFormName());
             }
         }
-        return false;
-    }
-
-    List<String> getFormNamesForPermission(Authentication authentication, PermissionType permissionType) {
-
-        var sql = "SELECT df.name FROM formular_usergroup_zugriff " +
-                " JOIN data_form df ON formular_usergroup_zugriff.formular_id = df.id " +
-                " JOIN usergroup u ON formular_usergroup_zugriff.usergroup_id = u.id " +
-                " JOIN akteur_usergroup au ON u.id = au.usergroup_id " +
-                " JOIN akteur a on au.akteur_id = a.id " +
-                " WHERE a.login = ? AND a.aktiv AND a.anmelden_moeglich ";
-
-        if (PermissionType.READ_WRITE == permissionType) {
-            sql += " AND formular_usergroup_zugriff.bearbeiten ";
-        }
-
-        var userDetails = (UserDetails)authentication.getPrincipal();
-
-        return jdbcTemplate
-                .query(sql, new Object[]{userDetails.getUsername()}, (rs, rowNum) -> rs.getString("name"));
+        return true;
     }
 
-
 }