User tab working
This commit is contained in:
@@ -18,9 +18,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ArrayNode;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
|
||||
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
|
||||
import com.mattrixwv.raidbuilder.entity.Account;
|
||||
import com.mattrixwv.raidbuilder.entity.RaidGroupPermission;
|
||||
import com.mattrixwv.raidbuilder.service.AccountService;
|
||||
import com.mattrixwv.raidbuilder.service.RaidGroupPermissionService;
|
||||
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.AccountPermissionType;
|
||||
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -33,6 +37,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
public class AccountController{
|
||||
private final ObjectMapper mapper;
|
||||
private final AccountService accountService;
|
||||
private final RaidGroupPermissionService rgpService;
|
||||
|
||||
|
||||
@GetMapping
|
||||
@@ -53,6 +58,69 @@ public class AccountController{
|
||||
return accounts;
|
||||
}
|
||||
|
||||
@GetMapping("/raidGroup/{raidGroupId}")
|
||||
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
|
||||
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN})
|
||||
public List<Account> getAccountsByRaidGroup(@PathVariable("raidGroupId") UUID raidGroupId, @RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam(value = "searchTerm", required = false) String searchTerm){
|
||||
log.info("Getting accounts by raid group {}", raidGroupId);
|
||||
|
||||
|
||||
List<Account> accounts;
|
||||
if(searchTerm == null){
|
||||
accounts = accountService.getAccountsByRaidGroupId(raidGroupId, page, pageSize);
|
||||
}
|
||||
else{
|
||||
accounts = accountService.getAccountsByRaidGroupId(raidGroupId, page, pageSize, searchTerm);
|
||||
}
|
||||
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
@GetMapping("/{accountId}/raidGroup/{raidGroupId}/permission")
|
||||
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
|
||||
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN})
|
||||
public ObjectNode getAccountPermission(@PathVariable("accountId") UUID accountId, @PathVariable("raidGroupId") UUID raidGroupId){
|
||||
log.info("Getting account permission for account {} and raid group {}", accountId, raidGroupId);
|
||||
|
||||
|
||||
RaidGroupPermission permission = rgpService.getByAccountIdAndRaidGroupId(accountId, raidGroupId);
|
||||
|
||||
ObjectNode returnNode = mapper.createObjectNode();
|
||||
returnNode.put("status", "success");
|
||||
returnNode.put("permission", permission.getPermission().name());
|
||||
|
||||
|
||||
return returnNode;
|
||||
}
|
||||
|
||||
@PutMapping("/{accountId}/raidGroup/{raidGroupId}/permission")
|
||||
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
|
||||
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN})
|
||||
public ObjectNode updateAccountPermission(@PathVariable("accountId") UUID accountId, @PathVariable("raidGroupId") UUID raidGroupId, @RequestBody ObjectNode permissionNode){
|
||||
log.info("Updating account permission for account {} and raid group {}", accountId, raidGroupId);
|
||||
|
||||
|
||||
RaidGroupPermission existingPermission = rgpService.getByAccountIdAndRaidGroupId(accountId, raidGroupId);
|
||||
ObjectNode returnNode = mapper.createObjectNode();
|
||||
if(existingPermission == null){
|
||||
returnNode.put("status", "error");
|
||||
ArrayNode arrayNode = mapper.createArrayNode();
|
||||
arrayNode.add("Account does not have permission to raid group");
|
||||
returnNode.set("errors", arrayNode);
|
||||
}
|
||||
else{
|
||||
RaidGroupPermissionType permission = RaidGroupPermissionType.valueOf(permissionNode.get("permission").asText());
|
||||
existingPermission.setPermission(permission);
|
||||
rgpService.createRaidGroupPermission(existingPermission);
|
||||
|
||||
returnNode.put("status", "success");
|
||||
}
|
||||
|
||||
|
||||
return returnNode;
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN})
|
||||
public ObjectNode createAccount(@RequestBody Account account){
|
||||
@@ -99,6 +167,30 @@ public class AccountController{
|
||||
return countNode;
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/raidGroup/{raidGroupId}/count")
|
||||
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
|
||||
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN})
|
||||
public ObjectNode getAccountsCountByRaidGroup(@PathVariable("raidGroupId") UUID raidGroupId, @RequestParam(name = "searchTerm", required = false) String searchTerm){
|
||||
log.info("Getting accounts count by raid group {}", raidGroupId);
|
||||
|
||||
|
||||
Long accountsCount;
|
||||
if(searchTerm == null){
|
||||
accountsCount = accountService.getAccountsByRaidGroupIdCount(raidGroupId);
|
||||
}
|
||||
else{
|
||||
accountsCount = accountService.getAccountsByRaidGroupIdCount(raidGroupId, searchTerm);
|
||||
}
|
||||
|
||||
ObjectNode countNode = mapper.createObjectNode();
|
||||
countNode.put("count", accountsCount);
|
||||
countNode.put("status", "success");
|
||||
|
||||
|
||||
return countNode;
|
||||
}
|
||||
|
||||
@PutMapping("/{accountId}/forcePasswordReset")
|
||||
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN})
|
||||
public ObjectNode forcePasswordReset(@PathVariable("accountId") UUID accountId){
|
||||
|
||||
Reference in New Issue
Block a user