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

Fix adhoc Raid Instance saving

Browse Source
This commit is contained in:
Mattrixwv
2025-03-16 15:07:05 -04:00
parent 6c0ffccd60
commit b6fb636ddd
5 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstanceController.java
View File

@@ -46,10 +46,10 @@ public class RaidInstanceController{
List<RaidInstance> raidInstances;
if(searchTerm == null || searchTerm.isEmpty()){
raidInstances = raidInstanceService.findAllByRaidGroupIdAndEndDate(raidGroupId, ZonedDateTime.now(), page, pageSize);
raidInstances = raidInstanceService.findAllByRaidGroupIdAndEndDate(raidGroupId, ZonedDateTime.now().minusYears(1), page, pageSize);
}
else{
raidInstances = raidInstanceService.findAllByRaidGroupIdAndEndDate(raidGroupId, ZonedDateTime.now(), page, pageSize, searchTerm);
raidInstances = raidInstanceService.findAllByRaidGroupIdAndEndDate(raidGroupId, ZonedDateTime.now().minusYears(1), page, pageSize, searchTerm);
}
log.debug("Found {} raid instances", raidInstances.size());

5
src/main/java/com/mattrixwv/raidbuilder/repository/raid_instance/RaidInstanceCustomRepository.java
View File

@@ -1,5 +1,10 @@
package com.mattrixwv.raidbuilder.repository.raid_instance;
import java.util.UUID;
public interface RaidInstanceCustomRepository{
public void clearRaidLayoutId(UUID raidLayoutId);
public void clearRaidLayoutIdIn(Iterable<UUID> raidLayoutIds);
}

1
src/main/java/com/mattrixwv/raidbuilder/repository/raid_instance/RaidInstanceRepository.java
View File

@@ -19,6 +19,7 @@ public interface RaidInstanceRepository extends RaidInstanceCustomRepository, Jp
public List<RaidInstance> findAllByRaidGroupId(UUID raidGroupId);
public List<RaidInstance> findAllByRaidGroupIdIn(Iterable<UUID> raidGroupIds);
public List<RaidInstance> findAllByRaidGroupId(UUID raidGroupId, PageRequest pageRequest);
public List<RaidInstance> findAllByRaidGroupIdAndRaidInstanceNameContainingIgnoreCase(UUID raidGroupId, String searchTerm, PageRequest pageRequest);
public List<RaidInstance> findAllByRaidGroupIdAndRaidEndDateAfter(UUID raidGroupId, ZonedDateTime raidEndDate, PageRequest pageRequest);

30
src/main/java/com/mattrixwv/raidbuilder/repository/raid_instance/RaidInstanceRepositoryImpl.java
View File

@@ -1,9 +1,39 @@
package com.mattrixwv.raidbuilder.repository.raid_instance;
import java.util.UUID;
import org.springframework.stereotype.Repository;
import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
@Repository
@RequiredArgsConstructor
public class RaidInstanceRepositoryImpl implements RaidInstanceCustomRepository{
private final EntityManager entityManager;
@Override
public void clearRaidLayoutId(UUID raidLayoutId){
entityManager.createQuery("""
UPDATE RaidInstance r
SET r.raidLayoutId = NULL
WHERE r.raidLayoutId = :raidLayoutId
""")
.setParameter("raidLayoutId", raidLayoutId)
.executeUpdate();
}
@Override
public void clearRaidLayoutIdIn(Iterable<UUID> raidLayoutIds){
entityManager.createQuery("""
UPDATE RaidInstance r
SET r.raidLayoutId = NULL
WHERE r.raidLayoutId IN :raidLayoutIds
""")
.setParameter("raidLayoutIds", raidLayoutIds)
.executeUpdate();
}
}

18
src/main/java/com/mattrixwv/raidbuilder/service/RaidInstanceService.java
View File

@@ -14,13 +14,16 @@ import com.mattrixwv.raidbuilder.entity.RaidInstance;
import com.mattrixwv.raidbuilder.repository.raid_instance.RaidInstanceRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class RaidInstanceService{
private final RaidInstanceRepository raidInstanceRepository;
private final RaidInstancePersonCharacterXrefService ripcXrefService;
//Write
@@ -33,23 +36,30 @@ public class RaidInstanceService{
}
public void deleteById(UUID raidInstanceId){
ripcXrefService.deleteByRaidInstanceId(raidInstanceId);
raidInstanceRepository.deleteById(raidInstanceId);
}
public void deleteByRaidGroupId(UUID raidGroupId){
List<RaidInstance> raidInstances = raidInstanceRepository.findAllByRaidGroupId(raidGroupId);
ripcXrefService.deleteByRaidInstanceIds(raidInstances.stream().map(RaidInstance::getRaidInstanceId).toList());
raidInstanceRepository.deleteAllByRaidGroupId(raidGroupId);
}
public void deleteByRaidGroupIds(Iterable<UUID> raidGroupIds){
List<RaidInstance> raidInstances = raidInstanceRepository.findAllByRaidGroupIdIn(raidGroupIds);
ripcXrefService.deleteByRaidInstanceIds(raidInstances.stream().map(RaidInstance::getRaidInstanceId).toList());
raidInstanceRepository.deleteAllByRaidGroupIdIn(raidGroupIds);
}
public void deleteByRaidLayoutId(UUID raidLayoutId){
raidInstanceRepository.deleteAllByRaidLayoutId(raidLayoutId);
raidInstanceRepository.clearRaidLayoutId(raidLayoutId);
}
public void deleteByRaidLayoutIds(Iterable<UUID> raidLayoutIds){
raidInstanceRepository.deleteAllByRaidLayoutIdIn(raidLayoutIds);
raidInstanceRepository.clearRaidLayoutIdIn(raidLayoutIds);
}
@@ -71,11 +81,11 @@ public class RaidInstanceService{
}
public List<RaidInstance> findAllByRaidGroupIdAndEndDate(UUID raidGroupId, ZonedDateTime endDate, int page, int pageSize){
return raidInstanceRepository.findAllByRaidGroupIdAndRaidEndDateAfter(raidGroupId, endDate, PageRequest.of(page, pageSize, Sort.by("raidInstanceName").ascending()));
return raidInstanceRepository.findAllByRaidGroupIdAndRaidEndDateAfter(raidGroupId, endDate, PageRequest.of(page, pageSize, Sort.by("raidEndDate").descending()));
}
public List<RaidInstance> findAllByRaidGroupIdAndEndDate(UUID raidGroupId, ZonedDateTime endDate, int page, int pageSize, String searchTerm){
return raidInstanceRepository.findAllByRaidGroupIdAndRaidEndDateAfterAndRaidInstanceNameContainingIgnoreCase(raidGroupId, endDate, searchTerm, PageRequest.of(page, pageSize, Sort.by("raidInstanceName").ascending()));
return raidInstanceRepository.findAllByRaidGroupIdAndRaidEndDateAfterAndRaidInstanceNameContainingIgnoreCase(raidGroupId, endDate, searchTerm, PageRequest.of(page, pageSize, Sort.by("raidEndDate").descending()));
}
public long countByRaidGroupId(UUID raidGroupId){