- Group management, final commit.

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java
index d0b576c48daddd372283707ab75ce0f57d4af6a6..ac57a6c0f619ba9370c6a60855ab379caa175989 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java
@@ -83,6 +83,11 @@ public class UserDAO {
         return group;
     }
 
+    /**
+     *
+     * @param name
+     * @return
+     */
     private boolean groupExists(String name) {
         Group group = null;
         Query q = em.createNamedQuery("Group.findByName");
@@ -212,6 +217,11 @@ public class UserDAO {
         return false;
     }
 
+    /**
+     *
+     * @param groupId
+     * @return
+     */
     public boolean deleteGroup(long groupId) {
         Group group = findGroup(groupId);
         if (group != null) {

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java
index ceb8c9e1f31d27d0792153aa478031733c2b1388..948aba6ffd0ab13fb7958284594b0d6dead976c0 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java
@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.edf.gde.entities;
 
 import com.edf.gde.transferables.FileTO;

diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java
index cfd1ce0059bd739612aa6fd658a1f35bf61a8e03..1715d1ca27092794eecebb754a479411fe64d332 100644 (file)
--- a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java
+++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java
@@ -55,12 +55,6 @@ public class UserService extends BaseService {
                     setResult(resultTO, groupTO);
                 }
                 break;
-                case ADDTOGROUP: {
-                    long groupId = commandTO.getLong("id");
-                    LongListTO listTO = fromJson(commandTO.getData(), LongListTO.class);
-                    userDAO.addToGroup(groupId, listTO.getList());
-                }
-                break;
                 case REMOVEFROMGROUP: {
                     long groupId = commandTO.getLong("groupId");
                     long userId = commandTO.getLong("userId");
@@ -83,6 +77,12 @@ public class UserService extends BaseService {
                     userDAO.deleteGroup(groupId);
                 }
                 break;
+                case ADDTOGROUP: {
+                    long groupId = commandTO.getLong("groupId");
+                    long userId = commandTO.getLong("userId");
+                    addToGroup(groupId, userId);
+                }
+                break;
             }
         } catch (RuntimeException ex) {
             // Return error on any error...
@@ -97,6 +97,10 @@ public class UserService extends BaseService {
         resultTO.setData(toJson(data));
     }
 
+    protected void addToGroup(long groupId, long userId) {
+        userDAO.addToGroup(groupId, userId);
+    }
+    
     protected GroupTO createGroup(String groupName) {
         Group group = userDAO.createGroup(groupName);
         return group.toGroupTO();

diff --git a/projects/GDE_App/src/GDE_DB_Init.sql b/projects/GDE_App/src/GDE_DB_Init.sql
index 809cb64d8c1dd43c35c788079dafff19a58ab4d6..0d7d0941f6b79e9d08bbc52bd0c4dc94cffb3ecf 100644 (file)
--- a/projects/GDE_App/src/GDE_DB_Init.sql
+++ b/projects/GDE_App/src/GDE_DB_Init.sql
@@ -21,9 +21,10 @@ CREATE INDEX users_username_index ON USERS(userName);
 DROP TABLE IF EXISTS USERGROUP CASCADE;
 CREATE TABLE USERGROUP (
     id bigint NOT NULL PRIMARY KEY,
-    groupId bigint references GROUP_(id),
-    userId bigint references USERS(id)
+    groupId bigint references GROUP_(id) on delete cascade,
+    userId bigint references USERS(id)  on delete cascade
 );
+create index usergroup_groupId_idx ON USERGROUP(groupId);
 
 DROP TABLE IF EXISTS USERPERMISSIONS CASCADE;
 CREATE TABLE USERPERMISSIONS (