feat(#549): accompanying prices in GQL

FgForrest · May 31, 2024 · 1a6070c · 1a6070c
1 parent 7781489
commit 1a6070c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/...ternalApi/graphql/api/catalog/dataApi/resolver/constraint/EntityFetchRequireResolver.java b/...ternalApi/graphql/api/catalog/dataApi/resolver/constraint/EntityFetchRequireResolver.java
@@ -62,7 +62,6 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static io.evitadb.api.query.QueryConstraints.*;
 import static io.evitadb.externalApi.api.ExternalApiNamingConventions.PROPERTY_NAME_NAMING_CONVENTION;
@@ -348,7 +347,7 @@ private String[] resolveAccompanyingPriceLists(@Nonnull SelectionSetAggregator s
 			.stream()
 			.flatMap(f -> SelectionSetAggregator.getImmediateFields(PriceForSaleDescriptor.ACCOMPANYING_PRICE.name(), f.getSelectionSet())
 				.stream()
-				.flatMap(apf -> Stream.of((String[]) apf.getArguments().get(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name()))))
+				.flatMap(apf -> ((List<String>) apf.getArguments().get(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name())).stream()))
 			.toArray(String[]::new);
 	}
 

diff --git a/...phql/api/catalog/dataApi/resolver/dataFetcher/entity/AbstractPriceForSaleDataFetcher.java b/...phql/api/catalog/dataApi/resolver/dataFetcher/entity/AbstractPriceForSaleDataFetcher.java
@@ -39,6 +39,7 @@
 import javax.annotation.Nullable;
 import java.time.OffsetDateTime;
 import java.util.Currency;
+import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -99,8 +100,10 @@ protected abstract P computePrices(@Nonnull EntityDecorator entity,
 	@Nonnull
 	protected String[] resolveDesiredPricesLists(@Nonnull DataFetchingEnvironment environment,
 	                                             @Nonnull EntityQueryContext context) {
-		return Optional.ofNullable((String) environment.getArgument(PriceForSaleFieldHeaderDescriptor.PRICE_LIST.name()))
-			.map(priceList -> new String[]{priceList})
+		return Optional.ofNullable((List<String>) environment.getArgument(PriceForSaleFieldHeaderDescriptor.PRICE_LISTS.name()))
+			.map(it -> it.toArray(String[]::new))
+			.or(() -> Optional.ofNullable((String) environment.getArgument(PriceForSaleFieldHeaderDescriptor.PRICE_LIST.name()))
+				.map(priceList -> new String[]{ priceList }))
 			.or(() -> Optional.ofNullable(context.getDesiredPriceInPriceLists()))
 			.orElseThrow(() -> new GraphQLInvalidArgumentException("Missing price list argument. You can use `" + PriceForSaleFieldHeaderDescriptor.PRICE_LIST.name() + "` or `" + PriceForSaleFieldHeaderDescriptor.PRICE_LISTS.name() + "` parameter for specifying custom price list."));
 	}
@@ -133,7 +136,8 @@ protected AccompanyingPrice[] resolveDesiredAccompanyingPrices(@Nonnull DataFetc
 			.filter(f -> f.getArguments().size() == 1 && f.getArguments().containsKey(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name()))
 			.map(f -> new AccompanyingPrice(
 				f.getAlias() != null ? f.getAlias() : f.getName(),
-				(String[]) f.getArguments().get(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name())
+				((List<String>) f.getArguments().get(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name()))
+					.toArray(String[]::new)
 			))
 			.toArray(AccompanyingPrice[]::new);
 	}

diff --git a/...graphql/api/catalog/dataApi/resolver/dataFetcher/entity/AccompanyingPriceDataFetcher.java b/...graphql/api/catalog/dataApi/resolver/dataFetcher/entity/AccompanyingPriceDataFetcher.java
@@ -40,6 +40,7 @@
 import javax.annotation.Nullable;
 import java.time.OffsetDateTime;
 import java.util.Currency;
+import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -109,7 +110,8 @@ private Optional<PriceContract> getPrefetchedPrice(@Nonnull PrefetchedPriceForSa
 
 	@Nonnull
 	private String[] resolveDesiredPriceListsForCustomPrice(@Nonnull DataFetchingEnvironment environment) {
-		return Optional.ofNullable((String[]) environment.getArgument(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name()))
+		return Optional.ofNullable((List<String>) environment.getArgument(AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name()))
+			.map(it -> it.toArray(String[]::new))
 			.orElseThrow(() -> new GraphQLInvalidArgumentException("Missing price list argument. You can use `" + AccompanyingPriceFieldHeaderDescriptor.PRICE_LISTS.name() + "` parameter for specifying custom price list."));
 	}