RaidBuilder/RaidBuilderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

User tab working

Browse Source
This commit is contained in:
Mattrixwv
2025-03-09 19:49:45 -04:00
parent 63486457fe
commit 5dc0ab1e10
6 changed files with 197 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/main/java/com/mattrixwv/raidbuilder/controller/AccountController.java
View File

@@ -18,9 +18,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
import com.mattrixwv.raidbuilder.entity.RaidGroupPermission;
import com.mattrixwv.raidbuilder.service.AccountService; 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.AccountPermissionType;
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -33,6 +37,7 @@ import lombok.extern.slf4j.Slf4j;
public class AccountController{ public class AccountController{
private final ObjectMapper mapper; private final ObjectMapper mapper;
private final AccountService accountService; private final AccountService accountService;
private final RaidGroupPermissionService rgpService;
@GetMapping @GetMapping
@@ -53,6 +58,69 @@ public class AccountController{
return accounts; 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 @PostMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN}) @AccountAuthorization(permissions = {AccountPermissionType.ADMIN})
public ObjectNode createAccount(@RequestBody Account account){ public ObjectNode createAccount(@RequestBody Account account){
@@ -99,6 +167,30 @@ public class AccountController{
return countNode; 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") @PutMapping("/{accountId}/forcePasswordReset")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN}) @AccountAuthorization(permissions = {AccountPermissionType.ADMIN})
public ObjectNode forcePasswordReset(@PathVariable("accountId") UUID accountId){ public ObjectNode forcePasswordReset(@PathVariable("accountId") UUID accountId){

13
src/main/java/com/mattrixwv/raidbuilder/repository/account/AccountCustomRepository.java
View File

@@ -1,5 +1,18 @@
package com.mattrixwv.raidbuilder.repository.account; package com.mattrixwv.raidbuilder.repository.account;
import java.util.List;
import java.util.UUID;
import org.springframework.data.domain.PageRequest;
import com.mattrixwv.raidbuilder.entity.Account;
public interface AccountCustomRepository{ public interface AccountCustomRepository{
public List<Account> findAllAccountsByRaidGroupId(UUID raidGroupId, PageRequest pageRequest);
public List<Account> findAllAccountsByRaidGroupId(UUID raidGroupId, String searchTerm, PageRequest pageRequest);
public long countByRaidGroupId(UUID raidGroupId);
public long countByRaidGroupId(UUID raidGroupId, String searchTerm);
} }

71
src/main/java/com/mattrixwv/raidbuilder/repository/account/AccountRepositoryImpl.java
View File

@@ -1,9 +1,80 @@
package com.mattrixwv.raidbuilder.repository.account; package com.mattrixwv.raidbuilder.repository.account;
import java.util.List;
import java.util.UUID;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort.Order;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.mattrixwv.raidbuilder.entity.Account;
import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
@Repository @Repository
@RequiredArgsConstructor
public class AccountRepositoryImpl implements AccountCustomRepository{ public class AccountRepositoryImpl implements AccountCustomRepository{
private final EntityManager entityManager;
public List<Account> findAllAccountsByRaidGroupId(UUID raidGroupId, PageRequest pageRequest){
Order order = pageRequest.getSort().toList().get(0);
return entityManager.createQuery("""
SELECT a FROM Account a
INNER JOIN RaidGroupPermission rgp ON a.accountId = rgp.accountId
WHERE rgp.raidGroupId = :raidGroupId
ORDER BY :orderBy
""", Account.class)
.setParameter("raidGroupId", raidGroupId)
.setParameter("orderBy", order.getProperty() + " " + order.getDirection())
.setFirstResult(pageRequest.getPageNumber() * pageRequest.getPageSize())
.setMaxResults(pageRequest.getPageSize())
.getResultList();
}
public List<Account> findAllAccountsByRaidGroupId(UUID raidGroupId, String searchTerm, PageRequest pageRequest){
Order order = pageRequest.getSort().toList().get(0);
return entityManager.createQuery("""
SELECT a FROM Account a
INNER JOIN RaidGroupPermission rgp ON a.accountId = rgp.accountId
WHERE rgp.raidGroupId = :raidGroupId
AND LOWER(a.username) LIKE LOWER(:searchTerm)
ORDER BY :orderBy
""", Account.class)
.setParameter("raidGroupId", raidGroupId)
.setParameter("searchTerm", "%" + searchTerm + "%")
.setParameter("orderBy", order.getProperty() + " " + order.getDirection())
.setFirstResult(pageRequest.getPageNumber() * pageRequest.getPageSize())
.setMaxResults(pageRequest.getPageSize())
.getResultList();
}
public long countByRaidGroupId(UUID raidGroupId){
return entityManager.createQuery("""
SELECT COUNT(a) FROM Account a
INNER JOIN RaidGroupPermission rgp ON a.accountId = rgp.accountId
WHERE rgp.raidGroupId = :raidGroupId
""", Long.class)
.setParameter("raidGroupId", raidGroupId)
.getSingleResult();
}
public long countByRaidGroupId(UUID raidGroupId, String searchTerm){
return entityManager.createQuery("""
SELECT COUNT(a) FROM Account a
INNER JOIN RaidGroupPermission rgp ON a.accountId = rgp.accountId
WHERE rgp.raidGroupId = :raidGroupId
AND LOWER(a.username) LIKE LOWER(:searchTerm)
""", Long.class)
.setParameter("raidGroupId", raidGroupId)
.setParameter("searchTerm", "%" + searchTerm + "%")
.getSingleResult();
}
} }

1
src/main/java/com/mattrixwv/raidbuilder/repository/raid_group_permission/RaidGroupPermissionRepository.java
View File

@@ -16,4 +16,5 @@ public interface RaidGroupPermissionRepository extends RaidGroupPermissionCustom
public List<RaidGroupPermission> findAllByAccountId(UUID accountId); public List<RaidGroupPermission> findAllByAccountId(UUID accountId);
public RaidGroupPermission findByAccountIdAndRaidGroupId(UUID accountId, UUID raidGroupId);
} }

16
src/main/java/com/mattrixwv/raidbuilder/service/AccountService.java
View File

@@ -149,6 +149,22 @@ public class AccountService implements UserDetailsService{
return accountRepository.countByUsernameContainingIgnoreCase(searchTerm); return accountRepository.countByUsernameContainingIgnoreCase(searchTerm);
} }
public List<Account> getAccountsByRaidGroupId(UUID raidGroupId, int page, int pageSize){
return accountRepository.findAllAccountsByRaidGroupId(raidGroupId, PageRequest.of(page, pageSize, Sort.by("username").ascending()));
}
public List<Account> getAccountsByRaidGroupId(UUID raidGroupId, int page, int pageSize, String searchTerm){
return accountRepository.findAllAccountsByRaidGroupId(raidGroupId, searchTerm, PageRequest.of(page, pageSize, Sort.by("username").ascending()));
}
public long getAccountsByRaidGroupIdCount(UUID raidGroupId){
return accountRepository.countByRaidGroupId(raidGroupId);
}
public long getAccountsByRaidGroupIdCount(UUID raidGroupId, String searchTerm){
return accountRepository.countByRaidGroupId(raidGroupId, searchTerm);
}
//! UserDetailsService //! UserDetailsService
@Override @Override

4
src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupPermissionService.java
View File

@@ -42,4 +42,8 @@ public class RaidGroupPermissionService{
public List<RaidGroupPermission> getByAccountId(UUID accountId){ public List<RaidGroupPermission> getByAccountId(UUID accountId){
return raidGroupPermissionRepository.findAllByAccountId(accountId); return raidGroupPermissionRepository.findAllByAccountId(accountId);
} }
public RaidGroupPermission getByAccountIdAndRaidGroupId(UUID accountId, UUID raidGroupId){
return raidGroupPermissionRepository.findByAccountIdAndRaidGroupId(accountId, raidGroupId);
}
} }