(no commit message)

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java
index 94011c89125f244d1b344c84b9270c4122aa7a3b..80b895bdd7a570b7b4aa2a05eec08f782f74662b 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/common/PermissionManager.java
@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 /**
  *
@@ -13,31 +15,18 @@ public class PermissionManager {
     /**
      * MAP<K,V>
      * K = Service name
-     * V = Set of user Id
+     * V = Set of group Id
      */
-    Map<String, Set<Long>> userPermissions;
-
-    public PermissionManager() {
-        userPermissions = new HashMap<>();
+    private EntityManager em;
+    public PermissionManager(EntityManager em) {
+        this.em = em;
     }
     
-    public synchronized void addUser(String serviceName, long userId) {
-        Set<Long> users = userPermissions.get(serviceName);
-        if (users == null) {
-            users = new HashSet<>();
-            users.add(userId);
-            userPermissions.put(serviceName, users);
-        } else {
-            users.add(userId);
-        }
+    public synchronized void addGroup(long groupId, String serviceName, String methodName) {
     }
     
-    public synchronized boolean isValid(String serviceName, long userId) {
-        Set<Long> users = userPermissions.get(serviceName);
-        if (users == null) {
-            return false;
-        }
-        return users.contains(userId);
+    public synchronized boolean checkPermission(long userId, String serviceName, String methodeName) {
+        return false;
     }
     
 }

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java
index f93752e73bcb0118f72b9c8e50a2e78372ce5d85..b17ffa60d14582d1d39d108c9f53cb5343e4faaa 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ApplicationEJB.java
@@ -32,7 +32,7 @@ public class ApplicationEJB {
     @PostConstruct
     private void init() {
         userFiles = new HashMap<>();
-        permissionManager = new PermissionManager();
+        permissionManager = new PermissionManager(em);
     }
 
     /**

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java
index a8521a1c46aec7145e088f1fdb8047a50a7f143a..2ec7b2802b1f7f61c6ee2496907ec74a3feb637f 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java
@@ -17,15 +17,19 @@ import javax.validation.constraints.NotNull;
  *
  * @author Kavoos
  */
-@Entity(name = "UserPermission")
-@Table(name = "USERPERMISSIONS")
+@Entity(name = "GroupPermission")
+@Table(name = "GROUPPERMISSIONS ")
 @NamedQueries({
-    @NamedQuery(name = "UserPermission.findAll", query = "SELECT u FROM User u"),
-    @NamedQuery(name = "UserPermission.findById", query = "SELECT u FROM User u where u.id=:id"),
-    @NamedQuery(name = "UserPermission.findByName", query = "SELECT u FROM User u where u.name=:username")
+    @NamedQuery(name = "GroupPermission.findAll", query = "SELECT g FROM GroupPermission g"),
+    @NamedQuery(name = "GroupPermission.findById", query = "SELECT g FROM GroupPermission g where g.id=:id"),
+    @NamedQuery(name = "GroupPermission.findByName", query = "SELECT g FROM GroupPermission g where g.name=:username"),
+    @NamedQuery(name = "GroupPermission.findPermission", query = "SELECT g from GroupPermission g where "
+            + "g.groupId=:groupId "
+            + "and g.serviceName=:serviceName "
+            + "and g.methodName=:methodName")
 })
 
-public class UserPermission implements Serializable {
+public class GroupPermission implements Serializable {
 
     @Id
     @Basic(optional = false)
@@ -41,7 +45,7 @@ public class UserPermission implements Serializable {
     @Column(name="methodName")
     String methodName;
 
-    public UserPermission() {
+    public GroupPermission() {
     }
 
     public Long getId() {

diff --git a/projects/GDE_App/src/GDE_DB_Init.sql b/projects/GDE_App/src/GDE_DB_Init.sql
index 0d7d0941f6b79e9d08bbc52bd0c4dc94cffb3ecf..19c986d8fe426e6447e084d4eb9284192bc131ee 100644 (file)
--- a/projects/GDE_App/src/GDE_DB_Init.sql
+++ b/projects/GDE_App/src/GDE_DB_Init.sql
@@ -26,8 +26,8 @@ CREATE TABLE USERGROUP (
 );
 create index usergroup_groupId_idx ON USERGROUP(groupId);
 
-DROP TABLE IF EXISTS USERPERMISSIONS CASCADE;
-CREATE TABLE USERPERMISSIONS (
+DROP TABLE IF EXISTS GROUPPERMISSIONS CASCADE;
+CREATE TABLE GROUPPERMISSIONS (
     id bigint NOT NULL PRIMARY KEY,
     groupId bigint references GROUP_(id),
     serviceName varchar(255) not null,