From 4f5bcdcc6336f8688199a7af16d4d7feeeb9130c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Ka=C5=88ka?= Date: Fri, 28 Aug 2026 09:00:09 +0200 Subject: [PATCH 1/2] [Enhancement kbss-cvut/termit-ui#791] Consolidate term parents before exporting them into excel to include external parents in the export --- .../cvut/kbss/termit/service/export/ExcelVocabularyExporter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporter.java b/src/main/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporter.java index 1158ae4dd..17525ca78 100644 --- a/src/main/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporter.java +++ b/src/main/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporter.java @@ -185,6 +185,7 @@ private void generateTermRows(List terms, XSSFSheet sheet, String langCode final Row row = sheet.createRow(i + 1); row.setRowStyle(style); final Term t = terms.get(i); + t.consolidateParents(); // includes external parents in normal parents set resolvePrefixes(t, prefixes); termExporter.export(t, row); for (short j = 0; j < row.getLastCellNum(); j++) { From 26c170a302f63a2cc14cda4bd10bbd96f02236e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Ka=C5=88ka?= Date: Fri, 28 Aug 2026 09:09:09 +0200 Subject: [PATCH 2/2] [Test] Verify that ExcelVocabularyExporter consolidates term parents to include external parents --- .../export/ExcelVocabularyExporterTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/test/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporterTest.java b/src/test/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporterTest.java index 938b01091..2402e22f8 100644 --- a/src/test/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporterTest.java +++ b/src/test/java/cz/cvut/kbss/termit/service/export/ExcelVocabularyExporterTest.java @@ -35,6 +35,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.io.Resource; import org.springframework.http.MediaType; @@ -42,8 +43,10 @@ import java.net.URI; import java.util.Collections; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; +import java.util.stream.Stream; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.oneOf; @@ -54,6 +57,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -203,4 +208,26 @@ void exportVocabularyHandlesTermsWithoutDescriptionAndDefinition() { when(termService.findAllFull(vocabulary)).thenReturn(terms); assertDoesNotThrow(() -> sut.exportVocabulary(vocabulary, exportConfig())); } + + @Test + void exportVocabularyConsolidatesTermsParentsToIncludeExternalParents() { + when(vocabularyService.resolvePrefix(any())).thenReturn(PrefixDeclaration.EMPTY_PREFIX); + final String[] languages = {"en", "cs"}; + final TermInfo externalParent = Generator.generateTermInfoWithId(); + final List terms = Stream.of(Generator.generateMultiLingualTerm(languages), + Generator.generateMultiLingualTerm(languages)).map(Mockito::spy).toList(); + terms.forEach(t -> t.setParentTerms(Set.of(externalParent))); + + when(termService.findAllFull(vocabulary)).thenReturn(terms); + sut.exportVocabulary(vocabulary, exportConfig()); + + verify(terms.get(0), atLeastOnce()).consolidateParents(); + verify(terms.get(1), atLeastOnce()).consolidateParents(); + + verify(terms.get(0), never()).splitExternalAndInternalParents(); + verify(terms.get(1), never()).splitExternalAndInternalParents(); + + assertTrue(terms.get(0).getParentTerms().contains(externalParent)); + assertTrue(terms.get(1).getParentTerms().contains(externalParent)); + } }