From 9ec4cd31ba61de6664b2ecbd2edefff71b5020b2 Mon Sep 17 00:00:00 2001
From: Kavoos Bojnourdi <kavoos.bojnourdi@edf.fr>
Date: Mon, 10 Aug 2015 21:19:13 +0200
Subject: [PATCH] - Fix GroupPermission table name - Fix UserService - Updated
 tests

---
 .../com/edf/gde/entities/GroupPermission.java |  2 +-
 .../com/edf/gde/services/UserService.java     | 24 +++++++++----------
 .../test/com/edf/gde/dao/UserDaoClient.java   |  2 ++
 3 files changed, 14 insertions(+), 14 deletions(-)

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 c16af48..de48b8d 100644
--- 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
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
  * @author Kavoos
  */
 @Entity(name = "GroupPermission")
-@Table(name = "GROUPPERMISSIONS ")
+@Table(name = "GROUPPERMISSIONS")
 @NamedQueries({
     @NamedQuery(name = "GroupPermission.findAll", query = "SELECT g FROM GroupPermission g"),
     @NamedQuery(name = "GroupPermission.findById", query = "SELECT g FROM GroupPermission g where g.id=:id"),
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 79e96a1..c1eab51 100644
--- 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
@@ -31,11 +31,9 @@ public class UserService extends BaseService {
     public static final int FINDGROUP = 8;
 
     @EJB
-    UserEJB userDAO;
+    UserEJB userDao;
     @EJB
     PermissionsManagerEJB pm;
-    @EJB
-    UserEJB userEJB;
     
     @Override
     public void processRequest(HttpServletRequest request, HttpServletResponse response) {
@@ -44,7 +42,7 @@ public class UserService extends BaseService {
         CommandTO commandTO = getCommand(request);
         CommandResultTO resultTO = new CommandResultTO();
         Credentials credentials = getCredentials(request);
-        userEJB.checkPassword(credentials.getLogin(), credentials.getPassword());
+        userDao.checkPassword(credentials.getLogin(), credentials.getPassword());
         pm.checkPermission(credentials.getLogin(), "UserService", commandTO.getMethod());
         try {
             switch (commandTO.getMethod()) {
@@ -71,7 +69,7 @@ public class UserService extends BaseService {
                 case REMOVEFROMGROUP: {
                     long groupId = commandTO.getLong("groupId");
                     long userId = commandTO.getLong("userId");
-                    userDAO.removeFromGroup(groupId, userId);
+                    userDao.removeFromGroup(groupId, userId);
                 }
                 break;
                 case FINDUSER: {
@@ -87,7 +85,7 @@ public class UserService extends BaseService {
                 break;
                 case DELETEGROUP: {
                     long groupId = commandTO.getLong("id");
-                    userDAO.deleteGroup(groupId);
+                    userDao.deleteGroup(groupId);
                 }
                 break;
                 case ADDTOGROUP: {
@@ -111,36 +109,36 @@ public class UserService extends BaseService {
     }
 
     protected void addToGroup(long groupId, long userId) {
-        userDAO.addToGroup(groupId, userId);
+        userDao.addToGroup(groupId, userId);
     }
     
     protected GroupTO createGroup(String groupName) {
-        Group group = userDAO.createGroup(groupName);
+        Group group = userDao.createGroup(groupName);
         return group.toGroupTO();
     }
 
     protected UserTO createUser(UserTO userTO) {
-        User user = userDAO.createUser(userTO.getName(), userTO.getPassword());
+        User user = userDao.createUser(userTO.getName(), userTO.getPassword());
         return user.toUserTO();
     }
 
     protected boolean deleteUser(long userId) {
-        return userDAO.deleteUser(userId);
+        return userDao.deleteUser(userId);
     }
 
     protected UserTO findUser(String userName) {
-        User user = userDAO.findUser(userName);
+        User user = userDao.findUser(userName);
         UserTO userTO = user.toUserTO();
         userTO.setPassword(null);
         return userTO;
     }
 
     protected GroupTO findGroup(String groupName) {
-        Group group = userDAO.findGroup(groupName);
+        Group group = userDao.findGroup(groupName);
         return group.toGroupTO();
     }
     
     protected boolean deleteGroup(long id) {
-        return userDAO.deleteGroup(id);
+        return userDao.deleteGroup(id);
     }
 }
diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java
index fceaf3a..e305625 100644
--- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java
+++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java
@@ -29,6 +29,8 @@ public class UserDaoClient extends BaseDao {
     
     public UserDaoClient() {
         getContext().setBaseResource("http://localhost:8080/GDE-war/UserService");
+        getContext().setUserName("admin");
+        getContext().setPassword("edf123");
         daoResponseHandler = new DaoResponseHandler();
     }
 
-- 
2.39.2