fix #494: add delete impact confirmations
This commit is contained in:
@@ -1,9 +1,15 @@
|
||||
package com.cloudhandson.vpdbackoffice.web;
|
||||
|
||||
import com.cloudhandson.vpdbackoffice.domain.effective.GroupEffectiveAccessView;
|
||||
import com.cloudhandson.vpdbackoffice.domain.effective.RoleEffectiveImpactView;
|
||||
import com.cloudhandson.vpdbackoffice.domain.group.GroupCreateCommand;
|
||||
import com.cloudhandson.vpdbackoffice.service.AppException;
|
||||
import com.cloudhandson.vpdbackoffice.service.EffectiveMatrixService;
|
||||
import com.cloudhandson.vpdbackoffice.service.GroupService;
|
||||
import com.cloudhandson.vpdbackoffice.service.PermissionService;
|
||||
import com.cloudhandson.vpdbackoffice.service.UserService;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
@@ -17,20 +23,32 @@ public class GroupController {
|
||||
private final GroupService groupService;
|
||||
private final UserService userService;
|
||||
private final PermissionService permissionService;
|
||||
private final EffectiveMatrixService effectiveMatrixService;
|
||||
|
||||
public GroupController(GroupService groupService, UserService userService, PermissionService permissionService) {
|
||||
public GroupController(
|
||||
GroupService groupService,
|
||||
UserService userService,
|
||||
PermissionService permissionService,
|
||||
EffectiveMatrixService effectiveMatrixService
|
||||
) {
|
||||
this.groupService = groupService;
|
||||
this.userService = userService;
|
||||
this.permissionService = permissionService;
|
||||
this.effectiveMatrixService = effectiveMatrixService;
|
||||
}
|
||||
|
||||
@GetMapping("/groups")
|
||||
public String groups(Model model) {
|
||||
var matrix = effectiveMatrixService.matrix();
|
||||
model.addAttribute("groups", groupService.findAll());
|
||||
model.addAttribute("users", userService.findAll());
|
||||
model.addAttribute("roles", permissionService.findRoles());
|
||||
model.addAttribute("groupUsers", groupService.findGroupUsers());
|
||||
model.addAttribute("groupRoles", groupService.findGroupRoles());
|
||||
model.addAttribute("groupImpactByGroupId", matrix.groups().stream()
|
||||
.collect(Collectors.toMap(GroupEffectiveAccessView::groupId, impact -> impact)));
|
||||
model.addAttribute("roleImpactByRoleId", matrix.roles().stream()
|
||||
.collect(Collectors.toMap(RoleEffectiveImpactView::roleId, impact -> impact)));
|
||||
return "groups";
|
||||
}
|
||||
|
||||
@@ -50,10 +68,15 @@ public class GroupController {
|
||||
public String active(
|
||||
@RequestParam long groupId,
|
||||
@RequestParam boolean active,
|
||||
@RequestParam(defaultValue = "false") boolean confirmImpact,
|
||||
RedirectAttributes redirectAttributes
|
||||
) {
|
||||
groupService.setActive(groupId, active);
|
||||
redirectAttributes.addFlashAttribute("message", "그룹 상태를 변경했습니다.");
|
||||
try {
|
||||
groupService.setActive(groupId, active, active || confirmImpact);
|
||||
redirectAttributes.addFlashAttribute("message", "그룹 상태를 변경했습니다.");
|
||||
} catch (AppException exception) {
|
||||
redirectAttributes.addFlashAttribute("error", exception.getMessage());
|
||||
}
|
||||
return "redirect:/groups";
|
||||
}
|
||||
|
||||
@@ -72,10 +95,15 @@ public class GroupController {
|
||||
public String removeUser(
|
||||
@RequestParam long groupId,
|
||||
@RequestParam long userId,
|
||||
@RequestParam(defaultValue = "false") boolean confirmImpact,
|
||||
RedirectAttributes redirectAttributes
|
||||
) {
|
||||
groupService.removeUser(groupId, userId);
|
||||
redirectAttributes.addFlashAttribute("message", "그룹 사용자를 해제했습니다.");
|
||||
try {
|
||||
groupService.removeUser(groupId, userId, confirmImpact);
|
||||
redirectAttributes.addFlashAttribute("message", "그룹 사용자를 해제했습니다.");
|
||||
} catch (AppException exception) {
|
||||
redirectAttributes.addFlashAttribute("error", exception.getMessage());
|
||||
}
|
||||
return "redirect:/groups";
|
||||
}
|
||||
|
||||
@@ -94,10 +122,15 @@ public class GroupController {
|
||||
public String removeRole(
|
||||
@RequestParam long groupId,
|
||||
@RequestParam long roleId,
|
||||
@RequestParam(defaultValue = "false") boolean confirmImpact,
|
||||
RedirectAttributes redirectAttributes
|
||||
) {
|
||||
groupService.removeRole(groupId, roleId);
|
||||
redirectAttributes.addFlashAttribute("message", "그룹 역할을 해제했습니다.");
|
||||
try {
|
||||
groupService.removeRole(groupId, roleId, confirmImpact);
|
||||
redirectAttributes.addFlashAttribute("message", "그룹 역할을 해제했습니다.");
|
||||
} catch (AppException exception) {
|
||||
redirectAttributes.addFlashAttribute("error", exception.getMessage());
|
||||
}
|
||||
return "redirect:/groups";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user