Person tab working

This commit is contained in:
2025-03-08 13:26:59 -05:00
parent 3e0996c432
commit 868daeb517
17 changed files with 579 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ package com.mattrixwv.raidbuilder.controller;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
@@ -13,7 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.entity.GameClass;
import com.mattrixwv.raidbuilder.service.GameClassService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -21,12 +25,15 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@RequestMapping("/icons")
@RequiredArgsConstructor
public class IconController{
private final GameClassService gameClassService;
//Properties
@Value("${uploadFileDirectory}")
private String uploadFileDirectory;
@GetMapping("/gameIcons/{gameIconName}")
@GetMapping("/game/{gameIconName}")
@AccountAuthorization(permissions = {})
public ResponseEntity<byte[]> getGameIcons(@PathVariable("gameIconName") String gameIconName) throws IOException{
log.info("Getting game icon {}", gameIconName);
@@ -38,7 +45,7 @@ public class IconController{
return ResponseEntity.ok().body(resource);
}
@GetMapping("/raidGroupIcons/{raidGroupIconName}")
@GetMapping("/raidGroup/{raidGroupIconName}")
@AccountAuthorization(permissions = {})
public ResponseEntity<byte[]> getRaidGroupIcons(@PathVariable("raidGroupIconName") String raidGroupIconName) throws IOException{
log.info("Getting raid group icon {}", raidGroupIconName);
@@ -50,7 +57,7 @@ public class IconController{
return ResponseEntity.ok().body(resource);
}
@GetMapping("/gameClassIcons/{gameClassIconName}")
@GetMapping("/gameClass/{gameClassIconName}")
@AccountAuthorization(permissions = {})
public ResponseEntity<byte[]> getGameClassIcons(@PathVariable("gameClassIconName") String gameClassIconName) throws IOException{
log.info("Getting game class icon {}", gameClassIconName);
@@ -59,6 +66,22 @@ public class IconController{
byte[] resource = Files.readAllBytes(Path.of(uploadFileDirectory + "/gameClassIcons/" + gameClassIconName));
return ResponseEntity.ok().body(resource);
}
@GetMapping("/gameClass/id/{gameClassId}")
@AccountAuthorization(permissions = {})
public ResponseEntity<byte[]> getGameClassIcons(@PathVariable("gameClassId") UUID gameClassId) throws IOException{
log.info("Getting game class icon {}", gameClassId);
GameClass gameClass = gameClassService.getById(gameClassId);
byte[] resource = null;
if((gameClass != null) && (gameClass.getGameClassIcon() != null)){
resource = Files.readAllBytes(Path.of(uploadFileDirectory + "/gameClassIcons/" + gameClass.getGameClassIcon()));
}
return ResponseEntity.ok().body(resource);
}
}

View File

@@ -0,0 +1,81 @@
package com.mattrixwv.raidbuilder.controller;
import java.util.List;
import java.util.UUID;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.PersonCharacter;
import com.mattrixwv.raidbuilder.service.PersonCharacterService;
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.AccountPermissionType;
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@RequestMapping("/raidGroup/{raidGroupId}/person/{personId}/character")
@RequiredArgsConstructor
public class PersonCharacterController{
private final PersonCharacterService personCharacterService;
@GetMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER, RaidGroupPermissionType.RAIDER})
public List<PersonCharacter> getPersonCharactersForPerson(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId){
log.info("Getting person characters for person {}", personId);
return personCharacterService.getByPersonId(personId);
}
@PostMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public PersonCharacter createPersonCharacter(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId, @RequestBody PersonCharacter personCharacter){
log.info("Creating person character {} for person {}", personCharacter.getCharacterName(), personId);
personCharacter.setPersonId(personId);
personCharacter = personCharacterService.createPersonCharacter(personCharacter);
return personCharacter;
}
@PutMapping("/{characterId}")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public PersonCharacter updatePersonCharacter(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId, @PathVariable("characterId") UUID characterId, @RequestBody PersonCharacter personCharacter){
log.info("Updating person character {} for person {}", personCharacter.getCharacterName(), personId);
personCharacter.setPersonCharacterId(characterId);
personCharacter.setPersonId(personId);
personCharacter = personCharacterService.updatePersonCharacter(personCharacter);
return personCharacter;
}
@DeleteMapping("/{characterId}")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public void deletePersonCharacter(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId, @PathVariable("characterId") UUID characterId){
log.info("Deleting person character {} for person {}", characterId, personId);
personCharacterService.deletePersonCharacter(characterId);
}
}

View File

@@ -0,0 +1,149 @@
package com.mattrixwv.raidbuilder.controller;
import java.util.List;
import java.util.UUID;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
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.Person;
import com.mattrixwv.raidbuilder.service.PersonService;
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.AccountPermissionType;
import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@RequestMapping("/raidGroup/{raidGroupId}/person")
@RequiredArgsConstructor
public class PersonController{
private final ObjectMapper mapper;
private final PersonService personService;
@GetMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER, RaidGroupPermissionType.RAIDER})
public List<Person> getPeople(@PathVariable("raidGroupId") UUID raidGroupId, @RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam(name = "searchTerm", required = false) String searchTerm){
log.info("Getting people for raid group: {} page {} of size {} with search term {}", raidGroupId, page, pageSize, searchTerm);
List<Person> people;
if(searchTerm == null){
people = personService.getPeopleByRaidGroup(raidGroupId, page, pageSize);
}
else{
people = personService.getPeopleByRaidGroup(raidGroupId, page, pageSize, searchTerm);
}
return people;
}
@GetMapping("/count")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER, RaidGroupPermissionType.RAIDER})
public ObjectNode getPeopleCount(@PathVariable("raidGroupId") UUID raidGroupId, @RequestParam(name = "searchTerm", required = false) String searchTerm){
log.info("Getting people count for raid group {}", raidGroupId);
long peopleCount;
if(searchTerm == null){
peopleCount = personService.getPeopleCountByRaidGroup(raidGroupId);
}
else{
peopleCount = personService.getPeopleCountByRaidGroup(raidGroupId, searchTerm);
}
ObjectNode countNode = mapper.createObjectNode();
countNode.put("count", peopleCount);
countNode.put("status", "success");
return countNode;
}
@GetMapping("/{personId}")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER, RaidGroupPermissionType.RAIDER})
public Person getPerson(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId){
log.info("Getting person for raid group {}", raidGroupId);
Person person = personService.getPerson(personId, raidGroupId);
return person;
}
@PostMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public Person createPerson(@PathVariable("raidGroupId") UUID raidGroupId, @RequestBody Person person){
log.info("Creating person for raid group {}", raidGroupId);
person.setRaidGroupId(raidGroupId);
person = personService.createPerson(person);
return person;
}
@PutMapping("/{personId}")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public Person updatePerson(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId, @RequestBody Person person){
log.info("Updating person for raid group {}", raidGroupId);
person.setPersonId(personId);
person.setRaidGroupId(raidGroupId);
person = personService.updatePerson(person);
return person;
}
@DeleteMapping("/{personId}")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public ObjectNode deletePerson(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("personId") UUID personId){
log.info("Deleting person for raid group {}", raidGroupId);
Person person = personService.getPerson(personId, raidGroupId);
ObjectNode returnNode = mapper.createObjectNode();
if(person == null){
ArrayNode errorsNode = mapper.createArrayNode();
errorsNode.add("Person not found");
returnNode.set("errors", errorsNode);
returnNode.put("status", "error");
}
else{
personService.deletePerson(personId);
returnNode.put("status", "success");
}
return returnNode;
}
}