zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve delete message.

Browse Source 
Add unit test.
This commit is contained in:
Paulo Gustavo Veiga
2014-01-25 12:31:14 -03:00
parent a8f7d28c11
commit adfc6c08f2
11 changed files with 173 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
View File

@@ -45,6 +45,6 @@ public interface UserManager {
public User createUser(User user, Collaborator col);
public void deleteUser(User user);
public void removeUser(@NotNull User user);
}

3
wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
View File

@@ -110,9 +110,8 @@ public class UserManagerImpl
}
@Override
public void deleteUser(@NotNull final User user) {
public void removeUser(@NotNull final User user) {
getHibernateTemplate().delete(user);
getHibernateTemplate().flush();
}
public void auditLogin(@NotNull AccessAuditory accessAuditory) {

8
wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
View File

@@ -79,7 +79,7 @@ public class AccountController extends BaseController {
throw new IllegalArgumentException("Firstname can not be null");
}
final User user = Utils.getUser();
final User user = Utils.getUser(true);
user.setFirstname(firstname);
userService.updateUser(user);
}
@@ -91,7 +91,7 @@ public class AccountController extends BaseController {
throw new IllegalArgumentException("lastname can not be null");
}
final User user = Utils.getUser();
final User user = Utils.getUser(true);
user.setLastname(lastname);
userService.updateUser(user);
}
@@ -109,7 +109,7 @@ public class AccountController extends BaseController {
userService.updateUser(user);
}
@RequestMapping(method = RequestMethod.DELETE, value = "account", consumes = {"text/plain"})
@RequestMapping(method = RequestMethod.DELETE, value = "account")
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void deleleteUser() throws WiseMappingException
@@ -120,7 +120,7 @@ public class AccountController extends BaseController {
final Mindmap mindmap = collaboration.getMindMap();
mindmapService.removeMindmap(mindmap,user);
}
userService.deleteUser(user);
userService.removeUser(user);
}

3
wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
View File

@@ -18,7 +18,6 @@
package com.wisemapping.rest;
import com.mangofactory.swagger.annotations.ApiModel;
import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.model.AuthenticationType;
import com.wisemapping.model.Collaboration;
@@ -146,7 +145,7 @@ public class AdminController extends BaseController {
mindmapService.removeMindmap(mindmap,user);
}
userService.deleteUser(user);
userService.removeUser(user);
}
@ApiOperation("Note: Administration permissions required.")

5
wise-webapp/src/main/java/com/wisemapping/security/Utils.java
View File

@@ -21,12 +21,9 @@ package com.wisemapping.security;
import com.wisemapping.model.User;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import javax.servlet.http.HttpServletRequest;
final public class Utils {
private Utils() {
}
@@ -37,7 +34,7 @@ final public class Utils {
return getUser(false);
}
@Nullable
@NotNull
public static User getUser(boolean forceCheck) {
User result = null;
final Authentication auth = SecurityContextHolder.getContext().getAuthentication();

2
wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
View File

@@ -46,8 +46,6 @@ public interface MindmapService {
void removeCollaboration(@NotNull Mindmap mindmap, @NotNull Collaboration collaboration) throws CollaborationException;
void addTags(@NotNull Mindmap mindmap, String tags);
void removeMindmap(@NotNull final Mindmap mindmap, @NotNull final User user) throws WiseMappingException;
List<Mindmap> search(MindMapCriteria criteria);

22
wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
View File

@@ -231,28 +231,6 @@ public class MindmapServiceImpl
return collaborator;
}
@Override
public void addTags(@NotNull Mindmap mindmap, String tags) {
mindmap.setTags(tags);
mindmapManager.updateMindmap(mindmap, false);
if (tags != null && tags.length() > 0) {
final String tag[] = tags.split(TAG_SEPARATOR);
final User user = mindmap.getCreator();
// Add new Tags to User
boolean updateUser = false;
for (String userTag : tag) {
if (!user.getTags().contains(userTag)) {
user.getTags().add(userTag);
updateUser = true;
}
}
if (updateUser) {
//update user
userService.updateUser(user);
}
}
}
@Override
public List<MindMapHistory> findMindmapHistory(int mindmapId) {

2
wise-webapp/src/main/java/com/wisemapping/service/UserService.java
View File

@@ -38,7 +38,7 @@ public interface UserService {
public void resetPassword(@NotNull String email) throws InvalidUserEmailException, InvalidAuthSchemaException;
public void deleteUser(@NotNull User user);
public void removeUser(@NotNull User user);
public void auditLogin(@NotNull User user);

6
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@@ -102,8 +102,10 @@ public class UserServiceImpl
}
@Override
public void deleteUser(@NotNull User user) {
userManager.deleteUser(user);
public void removeUser(@NotNull User user) {
// Force object reload before removing....
final User userBy = userManager.getUserBy(user.getEmail());
userManager.removeUser(userBy);
}
@Override