Merge branch 'main' into search-builder

commercetools · Jan 9, 2024 · aa016cd · aa016cd
2 parents 520ddfd + 5762012
commit aa016cd
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 3 deletions.
diff --git a/api-java-mixin.raml b/api-java-mixin.raml
@@ -458,6 +458,8 @@ types:
     (java-extends): 'com.commercetools.api.models.CustomizableDraft<TransactionDraft>'
   Attribute:
     (java-query-implements): 'AttributeQueryBuilderMixin'
+  FieldContainer:
+    (java-query-implements): 'FieldContainerQueryBuilderMixin'
   Product:
     (java-extends): 'ProductMixin, com.commercetools.api.models.DomainResource<Product>, com.commercetools.api.models.Referencable<Product>, com.commercetools.api.models.ResourceIdentifiable<Product>, com.commercetools.api.models.WithKey'
     (java-mixin): |

diff --git a/...-generated/com/commercetools/api/predicates/query/type/FieldContainerQueryBuilderDsl.java b/...-generated/com/commercetools/api/predicates/query/type/FieldContainerQueryBuilderDsl.java
@@ -3,7 +3,7 @@
 
 import com.commercetools.api.predicates.query.*;
 
-public class FieldContainerQueryBuilderDsl {
+public class FieldContainerQueryBuilderDsl implements FieldContainerQueryBuilderMixin {
     public FieldContainerQueryBuilderDsl() {
     }
 

diff --git a/...ain/java/com/commercetools/api/predicates/query/type/FieldContainerQueryBuilderMixin.java b/...ain/java/com/commercetools/api/predicates/query/type/FieldContainerQueryBuilderMixin.java
@@ -0,0 +1,9 @@
+
+package com.commercetools.api.predicates.query.type;
+
+public interface FieldContainerQueryBuilderMixin {
+
+    default FieldContainerValueQueryBuilderDsl field(final String fieldName) {
+        return new FieldContainerValueQueryBuilderDsl(fieldName);
+    }
+}
diff --git a/.../java/com/commercetools/api/predicates/query/type/FieldContainerValueQueryBuilderDsl.java b/.../java/com/commercetools/api/predicates/query/type/FieldContainerValueQueryBuilderDsl.java
@@ -0,0 +1,68 @@
+
+package com.commercetools.api.predicates.query.type;
+
+import java.util.function.Function;
+
+import com.commercetools.api.predicates.query.*;
+import com.commercetools.api.predicates.query.common.MoneyQueryBuilderDsl;
+import com.commercetools.api.predicates.query.common.ReferenceQueryBuilderDsl;
+
+public class FieldContainerValueQueryBuilderDsl {
+
+    private final String fieldName;
+
+    public FieldContainerValueQueryBuilderDsl(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public CombinationQueryPredicate<FieldContainerQueryBuilderDsl> plainEnum(
+            Function<CustomFieldEnumValueQueryBuilderDsl, CombinationQueryPredicate<CustomFieldEnumValueQueryBuilderDsl>> fn) {
+        return new CombinationQueryPredicate<>(ContainerQueryPredicate.of()
+                .parent(new ConstantQueryPredicate(fieldName))
+                .inner(fn.apply(CustomFieldEnumValueQueryBuilderDsl.of())),
+            FieldContainerQueryBuilderDsl::of);
+    }
+
+    public CombinationQueryPredicate<FieldContainerQueryBuilderDsl> localizedEnum(
+            Function<CustomFieldLocalizedEnumValueQueryBuilderDsl, CombinationQueryPredicate<CustomFieldLocalizedEnumValueQueryBuilderDsl>> fn) {
+        return new CombinationQueryPredicate<>(
+            ContainerQueryPredicate.of()
+                    .parent(new ConstantQueryPredicate(fieldName))
+                    .inner(fn.apply(CustomFieldLocalizedEnumValueQueryBuilderDsl.of())),
+            FieldContainerQueryBuilderDsl::of);
+    }
+
+    public CombinationQueryPredicate<FieldContainerQueryBuilderDsl> money(
+            Function<MoneyQueryBuilderDsl, CombinationQueryPredicate<MoneyQueryBuilderDsl>> fn) {
+        return new CombinationQueryPredicate<>(ContainerQueryPredicate.of()
+                .parent(new ConstantQueryPredicate(fieldName))
+                .inner(fn.apply(MoneyQueryBuilderDsl.of())),
+            FieldContainerQueryBuilderDsl::of);
+    }
+
+    public CombinationQueryPredicate<FieldContainerQueryBuilderDsl> reference(
+            Function<ReferenceQueryBuilderDsl, CombinationQueryPredicate<ReferenceQueryBuilderDsl>> fn) {
+        return new CombinationQueryPredicate<>(ContainerQueryPredicate.of()
+                .parent(new ConstantQueryPredicate(fieldName))
+                .inner(fn.apply(ReferenceQueryBuilderDsl.of())),
+            FieldContainerQueryBuilderDsl::of);
+    }
+
+    public LongComparisonPredicateBuilder<FieldContainerQueryBuilderDsl> longNumber() {
+        return new LongComparisonPredicateBuilder<>(
+            BinaryQueryPredicate.of().left(new ConstantQueryPredicate(fieldName)),
+            p -> new CombinationQueryPredicate<>(p, FieldContainerQueryBuilderDsl::of));
+    }
+
+    public DoubleComparisonPredicateBuilder<FieldContainerQueryBuilderDsl> doubleNumber() {
+        return new DoubleComparisonPredicateBuilder<>(
+            BinaryQueryPredicate.of().left(new ConstantQueryPredicate(fieldName)),
+            p -> new CombinationQueryPredicate<>(p, FieldContainerQueryBuilderDsl::of));
+    }
+
+    public StringComparisonPredicateBuilder<FieldContainerQueryBuilderDsl> string() {
+        return new StringComparisonPredicateBuilder<>(
+            BinaryQueryPredicate.of().left(new ConstantQueryPredicate(fieldName)),
+            p -> new CombinationQueryPredicate<>(p, FieldContainerQueryBuilderDsl::of));
+    }
+}
diff --git a/...cetools-sdk-java-api/src/test/java/com/commercetools/api/predicates/query/QueryTests.java b/...cetools-sdk-java-api/src/test/java/com/commercetools/api/predicates/query/QueryTests.java
@@ -14,6 +14,7 @@
 import com.commercetools.api.predicates.query.channel.ChannelQueryBuilderDsl;
 import com.commercetools.api.predicates.query.customer.CustomerQueryBuilderDsl;
 import com.commercetools.api.predicates.query.message.MessageQueryBuilderDsl;
+import com.commercetools.api.predicates.query.order.OrderQueryBuilderDsl;
 import com.commercetools.api.predicates.query.product.ProductProjectionQueryBuilderDsl;
 import com.commercetools.api.predicates.query.product.ProductQueryBuilderDsl;
 import com.commercetools.api.predicates.query.state.StateQueryBuilderDsl;
@@ -248,7 +249,29 @@ public static Object[][] predicates() {
                         "resourceTypeIds contains any :foo", },
                 new Object[] { TypeQueryBuilderDsl.of().resourceTypeIds().containsAllVar("foo"),
                         "resourceTypeIds contains all :foo", },
-
-        };
+                new Object[] {
+                        OrderQueryBuilderDsl.of()
+                                .custom(c -> c.fields(f -> f.field("foo").plainEnum(e -> e.key().is("bar")))),
+                        "custom(fields(foo(key = \"bar\")))", },
+                new Object[] {
+                        OrderQueryBuilderDsl.of()
+                                .custom(c -> c.fields(f -> f.field("foo")
+                                        .localizedEnum(e -> e.label(l -> l.with(Locale.ENGLISH).is("bar"))))),
+                        "custom(fields(foo(label(en = \"bar\"))))", },
+                new Object[] {
+                        OrderQueryBuilderDsl.of()
+                                .custom(c -> c.fields(f -> f.field("foo").money(e -> e.currencyCode().is("EUR")))),
+                        "custom(fields(foo(currencyCode = \"EUR\")))", },
+                new Object[] {
+                        OrderQueryBuilderDsl.of()
+                                .custom(c -> c.fields(f -> f.field("foo").reference(e -> e.typeId().is("customer")))),
+                        "custom(fields(foo(typeId = \"customer\")))", },
+                new Object[] { OrderQueryBuilderDsl.of().custom(c -> c.fields(f -> f.field("foo").string().is("bar"))),
+                        "custom(fields(foo = \"bar\"))", },
+                new Object[] { OrderQueryBuilderDsl.of().custom(c -> c.fields(f -> f.field("foo").longNumber().is(3L))),
+                        "custom(fields(foo = 3))", },
+                new Object[] {
+                        OrderQueryBuilderDsl.of().custom(c -> c.fields(f -> f.field("foo").doubleNumber().is(3.1))),
+                        "custom(fields(foo = 3.1))", }, };
     }
 }