From ac3c38990f428db5a8d7636afb39e707144ab827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Wed, 6 Dec 2023 13:30:57 +0100 Subject: [PATCH] fix: Always include default cat combo for data set metadata [DHIS2-16129] (#15847) --- .../DefaultDataSetMetadataExportService.java | 8 ++-- .../commons/collection/ListUtilsTest.java | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/collection/ListUtilsTest.java diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultDataSetMetadataExportService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultDataSetMetadataExportService.java index 779e5014cf7d..b2fea561409a 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultDataSetMetadataExportService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultDataSetMetadataExportService.java @@ -31,7 +31,7 @@ import static org.hisp.dhis.commons.collection.CollectionUtils.addIfNotNull; import static org.hisp.dhis.commons.collection.CollectionUtils.flatMapToSet; import static org.hisp.dhis.commons.collection.CollectionUtils.mapToSet; -import static org.hisp.dhis.commons.collection.ListUtils.union; +import static org.hisp.dhis.commons.collection.ListUtils.distinctUnion; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -138,7 +138,6 @@ public class DefaultDataSetMetadataExportService implements DataSetMetadataExpor @Override public ObjectNode getDataSetMetadata() { User user = currentUserService.getCurrentUser(); - CategoryCombo defaultCategoryCombo = categoryService.getDefaultCategoryCombo(); SetValuedMap dataSetOrgUnits = dataSetService.getDataSetOrganisationUnitsAssociations(); @@ -153,12 +152,13 @@ public ObjectNode getDataSetMetadata() { sortById(flatMapToSet(dataElementCategoryCombos, CategoryCombo::getCategories)); List dataSetCategories = sortById(flatMapToSet(dataSetCategoryCombos, CategoryCombo::getCategories)); - List categories = union(dataElementCategories, dataSetCategories); + List categories = distinctUnion(dataElementCategories, dataSetCategories); List categoryOptions = sortById(getCategoryOptions(dataElementCategories, dataSetCategories, user)); List optionSets = sortById(getOptionSets(dataElements)); - dataSetCategoryCombos.remove(defaultCategoryCombo); + dataSetCategoryCombos.removeAll(dataElementCategoryCombos); + expressionService.substituteIndicatorExpressions(indicators); ObjectNode rootNode = fieldFilterService.createObjectNode(); diff --git a/dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/collection/ListUtilsTest.java b/dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/collection/ListUtilsTest.java new file mode 100644 index 000000000000..f6564c0d5d8b --- /dev/null +++ b/dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/collection/ListUtilsTest.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2004-2023, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.hisp.dhis.commons.collection; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; +import org.junit.jupiter.api.Test; + +class ListUtilsTest { + @Test + void testDistinctUnion() { + List listA = List.of("One", "Two", "Three"); + List listB = List.of("One", "Three", "Four"); + List listC = List.of("Three", "Five"); + + List union = List.of("One", "Two", "Three", "Four", "Five"); + + assertEquals(union, ListUtils.distinctUnion(listA, listB, listC)); + } +}