@@ -77,7 +77,8 @@ public class TranscriptionBlockController {
|
||||
public List<TranscriptionBlock> reorderBlocks(
|
||||
@PathVariable UUID documentId,
|
||||
@RequestBody ReorderTranscriptionBlocksDTO dto) {
|
||||
return transcriptionService.reorderBlocks(documentId, dto);
|
||||
transcriptionService.reorderBlocks(documentId, dto);
|
||||
return transcriptionService.listBlocks(documentId);
|
||||
}
|
||||
|
||||
@GetMapping("/{blockId}/history")
|
||||
|
||||
@@ -107,14 +107,13 @@ public class TranscriptionService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public List<TranscriptionBlock> reorderBlocks(UUID documentId, ReorderTranscriptionBlocksDTO dto) {
|
||||
public void reorderBlocks(UUID documentId, ReorderTranscriptionBlocksDTO dto) {
|
||||
List<UUID> blockIds = dto.getBlockIds();
|
||||
for (int i = 0; i < blockIds.size(); i++) {
|
||||
TranscriptionBlock block = getBlock(documentId, blockIds.get(i));
|
||||
block.setSortOrder(i);
|
||||
blockRepository.save(block);
|
||||
}
|
||||
return blockRepository.findByDocumentIdOrderBySortOrderAsc(documentId);
|
||||
}
|
||||
|
||||
public List<TranscriptionBlockVersion> getBlockHistory(UUID documentId, UUID blockId) {
|
||||
|
||||
@@ -184,7 +184,6 @@ class TranscriptionServiceTest {
|
||||
when(blockRepository.findByIdAndDocumentId(id2, docId)).thenReturn(Optional.of(block2));
|
||||
when(blockRepository.findByIdAndDocumentId(id1, docId)).thenReturn(Optional.of(block1));
|
||||
when(blockRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
|
||||
when(blockRepository.findByDocumentIdOrderBySortOrderAsc(docId)).thenReturn(List.of(block2, block1));
|
||||
|
||||
ReorderTranscriptionBlocksDTO dto = new ReorderTranscriptionBlocksDTO(List.of(id2, id1));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user