From df07a5d15f11d7b911a4c5e96ae43d0212f9a1d8 Mon Sep 17 00:00:00 2001 From: Mattrixwv Date: Sun, 6 Apr 2025 22:25:40 -0400 Subject: [PATCH] Update service functions maintain create auditing fields --- .../com/mattrixwv/raidbuilder/entity/AuditableEntity.java | 6 ------ .../mattrixwv/raidbuilder/service/ClassGroupService.java | 4 ++++ .../raidbuilder/service/GameCalendarEventService.java | 4 ++++ .../mattrixwv/raidbuilder/service/GameClassService.java | 4 +++- .../raidbuilder/service/GamePermissionService.java | 4 ++++ .../com/mattrixwv/raidbuilder/service/GameService.java | 4 +++- .../raidbuilder/service/PersonCharacterService.java | 4 ++++ .../com/mattrixwv/raidbuilder/service/PersonService.java | 4 ++++ .../service/RaidGroupCalendarEventService.java | 4 ++++ .../raidbuilder/service/RaidGroupPermissionService.java | 8 ++++---- .../raidbuilder/service/RaidGroupRequestService.java | 3 +++ .../mattrixwv/raidbuilder/service/RaidGroupService.java | 4 +++- .../raidbuilder/service/RaidInstanceService.java | 4 ++++ .../mattrixwv/raidbuilder/service/RaidLayoutService.java | 3 +++ 14 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/mattrixwv/raidbuilder/entity/AuditableEntity.java b/src/main/java/com/mattrixwv/raidbuilder/entity/AuditableEntity.java index 284be60..36b9bbb 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/entity/AuditableEntity.java +++ b/src/main/java/com/mattrixwv/raidbuilder/entity/AuditableEntity.java @@ -15,10 +15,8 @@ import jakarta.persistence.MappedSuperclass; import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; import lombok.Data; -import lombok.extern.slf4j.Slf4j; -@Slf4j @Data @MappedSuperclass public abstract class AuditableEntity{ @@ -50,9 +48,6 @@ public abstract class AuditableEntity{ private UUID getCurrentUserId(){ - log.debug("Getting current auditor"); - - UUID returnUUID; try{ @@ -61,7 +56,6 @@ public abstract class AuditableEntity{ } catch(Exception e){ returnUUID = new UUID(0, 0); - log.debug("No user logged in: {}", returnUUID); } return returnUUID; diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/ClassGroupService.java b/src/main/java/com/mattrixwv/raidbuilder/service/ClassGroupService.java index 6e60038..7ee233b 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/ClassGroupService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/ClassGroupService.java @@ -37,6 +37,10 @@ public class ClassGroupService{ } public ClassGroup updateClassGroup(ClassGroup classGroup, Iterable xrefs){ + ClassGroup existingClassGroup = classGroupRepository.findById(classGroup.getClassGroupId()).orElseThrow(); + classGroup.setCreatedBy(existingClassGroup.getCreatedBy()); + classGroup.setCreatedDate(existingClassGroup.getCreatedDate()); + classGroupRepository.save(classGroup); final UUID classGroupId = classGroup.getClassGroupId(); diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/GameCalendarEventService.java b/src/main/java/com/mattrixwv/raidbuilder/service/GameCalendarEventService.java index cd426cf..623a394 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/GameCalendarEventService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/GameCalendarEventService.java @@ -26,6 +26,10 @@ public class GameCalendarEventService{ } public GameCalendarEvent updateGameCalendarEvent(GameCalendarEvent gce){ + GameCalendarEvent existingGce = gceRepository.findById(gce.getCalendarEventId()).orElseThrow(); + gce.setCreatedBy(existingGce.getCreatedBy()); + gce.setCreatedDate(existingGce.getCreatedDate()); + return gceRepository.save(gce); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/GameClassService.java b/src/main/java/com/mattrixwv/raidbuilder/service/GameClassService.java index a2129a8..edce81d 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/GameClassService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/GameClassService.java @@ -57,7 +57,9 @@ public class GameClassService{ } public GameClass updateGameClass(GameClass gameClass, MultipartFile file){ - GameClass existingGameClass = gameClassRepository.findById(gameClass.getGameClassId()).orElse(null); + GameClass existingGameClass = gameClassRepository.findById(gameClass.getGameClassId()).orElseThrow(); + gameClass.setCreatedBy(existingGameClass.getCreatedBy()); + gameClass.setCreatedDate(existingGameClass.getCreatedDate()); //Delete the old file if one exists if((existingGameClass != null) && (existingGameClass.getGameClassIcon() != null) && (gameClass.getGameClassIcon() == null)){ diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/GamePermissionService.java b/src/main/java/com/mattrixwv/raidbuilder/service/GamePermissionService.java index 6b6a352..ea3ecb4 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/GamePermissionService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/GamePermissionService.java @@ -26,6 +26,10 @@ public class GamePermissionService{ } public GamePermission updateGamePermission(GamePermission gamePermission){ + GamePermission existingGamePermission = gamePermissionRepository.findById(gamePermission.getGamePermissionId()).orElseThrow(); + gamePermission.setCreatedBy(existingGamePermission.getCreatedBy()); + gamePermission.setCreatedDate(existingGamePermission.getCreatedDate()); + return gamePermissionRepository.save(gamePermission); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/GameService.java b/src/main/java/com/mattrixwv/raidbuilder/service/GameService.java index 2af66ee..ebbb587 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/GameService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/GameService.java @@ -58,7 +58,9 @@ public class GameService{ } public Game updateGame(Game game, MultipartFile file){ - Game existingGame = gameRepository.findById(game.getGameId()).orElse(null); + Game existingGame = gameRepository.findById(game.getGameId()).orElseThrow(); + game.setCreatedBy(existingGame.getCreatedBy()); + game.setCreatedDate(existingGame.getCreatedDate()); //Delete the old file if one exists if((existingGame != null) && (existingGame.getGameIcon() != null) && (game.getGameIcon() == null)){ diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/PersonCharacterService.java b/src/main/java/com/mattrixwv/raidbuilder/service/PersonCharacterService.java index 0af962e..2d10c95 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/PersonCharacterService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/PersonCharacterService.java @@ -28,6 +28,10 @@ public class PersonCharacterService{ } public PersonCharacter updatePersonCharacter(PersonCharacter personCharacter){ + PersonCharacter existingPersonCharacter = personCharacterRepository.findById(personCharacter.getPersonCharacterId()).orElseThrow(); + personCharacter.setCreatedBy(existingPersonCharacter.getCreatedBy()); + personCharacter.setCreatedDate(existingPersonCharacter.getCreatedDate()); + return personCharacterRepository.save(personCharacter); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/PersonService.java b/src/main/java/com/mattrixwv/raidbuilder/service/PersonService.java index df1684a..a16eedd 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/PersonService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/PersonService.java @@ -30,6 +30,10 @@ public class PersonService{ } public Person updatePerson(Person person){ + Person existingPerson = personRepository.findById(person.getPersonId()).orElseThrow(); + person.setCreatedBy(existingPerson.getCreatedBy()); + person.setCreatedDate(existingPerson.getCreatedDate()); + return personRepository.save(person); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupCalendarEventService.java b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupCalendarEventService.java index 197c1ef..2a20d34 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupCalendarEventService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupCalendarEventService.java @@ -28,6 +28,10 @@ public class RaidGroupCalendarEventService{ } public RaidGroupCalendarEvent updateRaidGroupCalendarEvent(RaidGroupCalendarEvent rgce){ + RaidGroupCalendarEvent existingRaidGroupCalendarEvent = rgceRepository.findById(rgce.getRaidGroupCalendarEventId()).orElseThrow(); + rgce.setCreatedBy(existingRaidGroupCalendarEvent.getCreatedBy()); + rgce.setCreatedDate(existingRaidGroupCalendarEvent.getCreatedDate()); + return rgceRepository.save(rgce); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupPermissionService.java b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupPermissionService.java index fdf223a..ac447de 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupPermissionService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupPermissionService.java @@ -21,6 +21,10 @@ public class RaidGroupPermissionService{ //Write + public RaidGroupPermission createRaidGroupPermission(RaidGroupPermission raidGroupPermission){ + return raidGroupPermissionRepository.save(raidGroupPermission); + } + public void deleteByAccountId(UUID accountId){ raidGroupPermissionRepository.deleteAllByAccountId(accountId); } @@ -39,10 +43,6 @@ public class RaidGroupPermissionService{ //Read - public RaidGroupPermission createRaidGroupPermission(RaidGroupPermission raidGroupPermission){ - return raidGroupPermissionRepository.save(raidGroupPermission); - } - public List getByAccountId(UUID accountId){ return raidGroupPermissionRepository.findAllByAccountId(accountId); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupRequestService.java b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupRequestService.java index 490bc50..a8c582f 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupRequestService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupRequestService.java @@ -32,6 +32,9 @@ public class RaidGroupRequestService{ } public RaidGroupRequest updateRaidGroupRequest(RaidGroupRequest raidGroupRequest){ + RaidGroupRequest existingRaidGroupRequest = rgrRepository.findById(raidGroupRequest.getRaidGroupRequestId()).orElseThrow(); + raidGroupRequest.setCreatedBy(existingRaidGroupRequest.getCreatedBy()); + raidGroupRequest.setCreatedDate(existingRaidGroupRequest.getCreatedDate()); return rgrRepository.save(raidGroupRequest); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupService.java b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupService.java index 2a72b2e..92cb3b4 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/RaidGroupService.java @@ -77,7 +77,9 @@ public class RaidGroupService{ } public RaidGroup updateRaidGroup(RaidGroup raidGroup, MultipartFile file){ - RaidGroup existingRaidGroup = raidGroupRepository.findById(raidGroup.getRaidGroupId()).orElse(null); + RaidGroup existingRaidGroup = raidGroupRepository.findById(raidGroup.getRaidGroupId()).orElseThrow(); + raidGroup.setCreatedBy(existingRaidGroup.getCreatedBy()); + raidGroup.setCreatedDate(existingRaidGroup.getCreatedDate()); //Delete the old file if one exists if((existingRaidGroup != null) && (existingRaidGroup.getRaidGroupIcon() != null) && (raidGroup.getRaidGroupIcon() == null)){ diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/RaidInstanceService.java b/src/main/java/com/mattrixwv/raidbuilder/service/RaidInstanceService.java index 4525fa5..5ca7ffb 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/RaidInstanceService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/RaidInstanceService.java @@ -32,6 +32,10 @@ public class RaidInstanceService{ } public RaidInstance updateRaidInstance(RaidInstance raidInstance){ + RaidInstance existingRaidInstance = raidInstanceRepository.findById(raidInstance.getRaidInstanceId()).orElseThrow(); + raidInstance.setCreatedBy(existingRaidInstance.getCreatedBy()); + raidInstance.setCreatedDate(existingRaidInstance.getCreatedDate()); + return raidInstanceRepository.save(raidInstance); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/service/RaidLayoutService.java b/src/main/java/com/mattrixwv/raidbuilder/service/RaidLayoutService.java index cafba22..e2778f5 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/service/RaidLayoutService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/service/RaidLayoutService.java @@ -37,6 +37,9 @@ public class RaidLayoutService{ } public RaidLayout updateRaidLayout(RaidLayout raidLayout, Iterable xrefs){ + RaidLayout existingRaidLayout = raidLayoutRepository.findById(raidLayout.getRaidLayoutId()).orElseThrow(); + raidLayout.setCreatedBy(existingRaidLayout.getCreatedBy()); + raidLayout.setCreatedDate(existingRaidLayout.getCreatedDate()); raidLayout = raidLayoutRepository.save(raidLayout); final UUID raidLayoutId = raidLayout.getRaidLayoutId();