marcel/familienarchiv
1
0
Fork 0
Code Issues 109 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: break Spring Framework 7 circular bean dependency cycles #426

Merged
marcel merged 6 commits from fix/spring7-circular-dependency-cycles into main 2026-05-05 16:39:38 +02:00
Conversation 8 Commits 6 Files Changed 8 +21 -5
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 548df84219 - Show all commits

26
backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationServiceTest.java
View File

@@ -8,7 +8,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditKind;
import org.raddatz.familienarchiv.audit.AuditService; import org.raddatz.familienarchiv.audit.AuditService;
import org.raddatz.familienarchiv.document.transcription.TranscriptionService; import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository;
import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO;
import org.raddatz.familienarchiv.document.annotation.UpdateAnnotationDTO; import org.raddatz.familienarchiv.document.annotation.UpdateAnnotationDTO;
import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.DomainException;
@@ -36,7 +36,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
class AnnotationServiceTest { class AnnotationServiceTest {
@Mock AnnotationRepository annotationRepository; @Mock AnnotationRepository annotationRepository;
@Mock TranscriptionService transcriptionService; @Mock TranscriptionBlockRepository transcriptionBlockRepository;
@Mock AuditService auditService; @Mock AuditService auditService;
@InjectMocks AnnotationService annotationService; @InjectMocks AnnotationService annotationService;
@@ -208,7 +208,7 @@ class AnnotationServiceTest {
annotationService.deleteAnnotation(docId, annotId, ownerId); annotationService.deleteAnnotation(docId, annotId, ownerId);
verify(transcriptionService).deleteByAnnotationId(annotId); verify(transcriptionBlockRepository).deleteByAnnotationId(annotId);
verify(annotationRepository).delete(annotation); verify(annotationRepository).delete(annotation);
} }
@@ -225,11 +225,27 @@ class AnnotationServiceTest {
annotationService.deleteAnnotation(docId, annotId, ownerId); annotationService.deleteAnnotation(docId, annotId, ownerId);
var inOrder = org.mockito.Mockito.inOrder(transcriptionService, annotationRepository); var inOrder = org.mockito.Mockito.inOrder(transcriptionBlockRepository, annotationRepository);
inOrder.verify(transcriptionService).deleteByAnnotationId(annotId); inOrder.verify(transcriptionBlockRepository).deleteByAnnotationId(annotId);
inOrder.verify(annotationRepository).delete(annotation); inOrder.verify(annotationRepository).delete(annotation);
} }
@Test
void deleteAnnotation_cascadesToTranscriptionBlocks() {
UUID docId = UUID.randomUUID();
UUID annotId = UUID.randomUUID();
UUID ownerId = UUID.randomUUID();
DocumentAnnotation annotation = DocumentAnnotation.builder()
.id(annotId).documentId(docId).createdBy(ownerId).build();
when(annotationRepository.findByIdAndDocumentId(annotId, docId))
.thenReturn(Optional.of(annotation));
annotationService.deleteAnnotation(docId, annotId, ownerId);
verify(transcriptionBlockRepository).deleteByAnnotationId(annotId);
}
@Test @Test
void deleteAnnotation_throwsForbidden_whenUserIdIsNull() { void deleteAnnotation_throwsForbidden_whenUserIdIsNull() {
UUID docId = UUID.randomUUID(); UUID docId = UUID.randomUUID();