Added delete a user service ,Added remove icon and refresh the user list

after remove

Author: gmkumar2005

codebrag-dao/src/main/scala/com/softwaremill/codebrag/dao/user/SQLUserDAO.scala

@@ -31,7 +31,7 @@ class SQLUserDAO(val database: SQLDatabase) extends UserDAO with SQLUserSchema {
   }
 
   def findById(userId: ObjectId) = findOneWhere(_.id === userId)
-
+ 
   def findByEmail(email: String) = findOneWhere(_.emailLowerCase === email.toLowerCase)
 
   def findByLowerCasedLogin(login: String) = db.withTransaction { implicit session =>
@@ -124,7 +124,7 @@ class SQLUserDAO(val database: SQLDatabase) extends UserDAO with SQLUserSchema {
     } yield (u, a, s, l)
     userQuery.firstOption.map(queryUserAliases).map(untuple)
   }
-
+  
   private def queryUserAliases(tuple: (UserTuple, SQLAuth, SQLSettings, SQLLastNotif))(implicit session: Session) = {
     val userId = tuple._1._1
     val aliases = userAliases.where(_.userId === userId).list()
@@ -135,4 +135,11 @@ class SQLUserDAO(val database: SQLDatabase) extends UserDAO with SQLUserSchema {
     val aliases = userAliases.where(_.userId === tuple._1).list()
     (tuple._1, tuple._2, tuple._3, tuple._4, UserAliases(aliases.map(_.toUserAlias)))
   }
-}
+
+  def delete(userId: ObjectId) {
+    db.withTransaction { implicit session =>
+      users.filter(_.id === userId).delete
+    }
+  }
+
+}

codebrag-dao/src/main/scala/com/softwaremill/codebrag/dao/user/UserDAO.scala

@@ -40,4 +40,7 @@ trait UserDAO {
   def countAll(): Long
 
   def countAllActive(): Long
+
+  def delete(userId: ObjectId)
+
 }

codebrag-rest/src/main/scala/com/softwaremill/codebrag/rest/UsersServlet.scala

@@ -34,8 +34,12 @@ class UsersServlet(
       case _ => scalatra.Ok()
     }
   }
-
+delete("/:id") {
+    haltIfNotAuthenticated()
+    modifyUserUseCase.delete(new ObjectId(params("id")))
+  }
 }
+  
 
 object UsersServlet {
   val MappingPath = "users"

codebrag-service/src/main/scala/com/softwaremill/codebrag/usecases/user/ModifyUserDetailsUseCase.scala

@@ -51,4 +51,8 @@ class ModifyUserDetailsUseCase(protected val userDao: UserDAO) extends Logging {
     validate(checkUserActive, changeOwnFlagsCheck)
   }
 
+ def delete(userId: ObjectId) = {
+	userDao.delete(userId)
+  }
+
 }

codebrag-ui/app/scripts/users/manageUsersPopupCtrl.js

@@ -26,17 +26,37 @@ angular.module('codebrag.userMgmt')
             });
         };
 
+		$scope.deleteUser = function(userId) {
+		    $scope.flash.clear();
+		    var userData = { userId: userId };		  
+		    userMgmtService.deleteUser(userId).then(deleteSuccess, deleteFailed('active', userId))
+		    userMgmtService.loadUsers().then(function(users) {
+	            $scope.users = users;
+	        });
+		};
+
         $scope.askForNewPassword = function(user) {
             $scope.flash.clear();
             var modal = popupsService.openSetUserPasswordPopup(user);
             modal.result.then(function() {
                 $scope.flash.add('info', 'User password changed');
             });
         };
+        function deleteSuccess() {
+            $scope.flash.add('error', 'User is removed');
+        }
 
         function modifySuccess() {
             $scope.flash.add('info', 'User details changed');
         }
+	 function deleteFailed(flag, userId) {
+            return function(errorsMap) {              
+                $scope.flash.add('error', 'Could not change user details');
+                flattenErrorsMap(errorsMap).forEach(function(error) {
+                    $scope.flash.add('error', error);
+                });
+            }
+        }
 
         function modifyFailed(flag, user) {
             return function(errorsMap) {

codebrag-ui/app/scripts/users/userMgmtService.js

@@ -19,6 +19,11 @@ angular.module('codebrag.userMgmt')
             return $http.put(modifyUserUrl, userData).then(null, modifyUserFailed);
         };
 
+        this.deleteUser = function(userId) {
+			var modifyUserUrl = [usersApiUrl, '/', userId].join('');
+			return $http.delete(modifyUserUrl).then(null, modifyUserFailed);
+        };
+
         function modifyUserFailed(response) {
             return $q.reject(response.data);
         }
@@ -34,4 +39,4 @@ angular.module('codebrag.userMgmt')
             $modal.open(config)
         }
 
-    });
+    });

codebrag-ui/app/views/popups/manageUsers.html

@@ -21,17 +21,21 @@ <h1>Manage team members
                     </th>
                     <th class="cell-centered">
                         <div class="thead">Admin?</div>
-                    </th>
+                    </th>			
                     <th>
                         <div class="thead">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
                     </th>
+		<th class="cell-centered">
+                        <div class="thead">&nbsp;&nbsp;</div>
+                    </th>
                 </thead>
                 <tbody>
                     <tr ng-repeat="user in users">
                         <td class="user-email">{{ user.email}}</td>
                         <td class="cell-centered"><input type="checkbox" ng-model="user.active" ng-click="modifyUser(user, 'active')" ng-disabled="user.locked"/></td>
                         <td class="cell-centered"><input type="checkbox" ng-model="user.admin" ng-click="modifyUser(user, 'admin')" ng-disabled="user.locked"/></td>
                         <td><button class="link" ng-disabled="!user.active" ng-click="askForNewPassword(user)">Set&nbsp;password</button></td>
+						<td><i class="icon-remove" ng-hide="user.admin" ng-disabled="user.locked" ng-click="deleteUser(user.userId)"></i></td>						
                     </tr>
                 </tbody>
             </table>
@@ -45,4 +49,4 @@ <h1>Manage team members
     <span class="close-btn" ng-click="$close()">
         <i class="icon-remove"></i>
     </span>
-</div>
+</div>