make AstSortOrder implement AstNode

Author: NathanQingyangXu

src/integrationTest/java/com/mongodb/hibernate/query/select/Book.java

@@ -27,12 +27,13 @@ class Book {
     @Id
     int id;
 
-    String title;
-    Boolean outOfStock;
-    Integer publishYear;
-    Long isbn13;
-    Double discount;
-    BigDecimal price;
+    // dummy values are set for currently null value is not supported
+    String title = "";
+    Boolean outOfStock = false;
+    Integer publishYear = 0;
+    Long isbn13 = 0L;
+    Double discount = 0.0;
+    BigDecimal price = new BigDecimal("0.0");
 
     Book() {}
 
@@ -41,16 +42,5 @@ class Book {
         this.title = title;
         this.publishYear = publishYear;
         this.outOfStock = outOfStock;
-
-        // the following fields are set dummy values
-        // for currently null value is not supported
-        this.isbn13 = 0L;
-        this.discount = 0.0;
-        this.price = BigDecimal.valueOf(0);
-    }
-
-    @Override
-    public String toString() {
-        return "Book{" + "id=" + id + '}';
     }
 }

src/integrationTest/java/com/mongodb/hibernate/query/select/SortingIntegrationTests.java

@@ -62,7 +62,7 @@ void testOrderBySingleFieldWithoutTies(AstSortOrder sortOrder) {
                 "from Book as b ORDER BY b.publishYear " + sortOrder,
                 Book.class,
                 null,
-                "{ 'aggregate': 'books', 'pipeline': [ { '$sort': { 'publishYear': " + sortOrder.getRenderedValue()
+                "{ 'aggregate': 'books', 'pipeline': [ { '$sort': { 'publishYear': " + (sortOrder == ASC ? "1" : "-1")
                         + " } }, {'$project': {'_id': true, 'discount': true, 'isbn13': true, 'outOfStock': true, 'price': true, 'publishYear': true, 'title': true} } ] }",
                 sortOrder == ASC ? getBooksByIds(2, 1, 3, 4, 5) : getBooksByIds(5, 4, 3, 1, 2));
     }
@@ -74,7 +74,7 @@ void testOrderBySingleFieldWithTies(AstSortOrder sortOrder) {
                 "from Book as b ORDER BY b.title " + sortOrder,
                 Book.class,
                 null,
-                "{ 'aggregate': 'books', 'pipeline': [ { '$sort': { 'title': " + sortOrder.getRenderedValue()
+                "{ 'aggregate': 'books', 'pipeline': [ { '$sort': { 'title': " + (sortOrder == ASC ? "1" : "-1")
                         + " } }, {'$project': {'_id': true, 'discount': true, 'isbn13': true, 'outOfStock': true, 'price': true, 'publishYear': true, 'title': true} } ] }",
                 sortOrder == ASC
                         ? resultList -> assertThat(resultList)
@@ -128,16 +128,16 @@ void testSortFieldByAlias() {
     @Test
     void testSortFieldByOrdinalReference() {
         assertSelectionQuery(
-                "select b.title as title, b.publishYear as year from Book as b ORDER BY 2 DESC, 1 ASC",
+                "select b.title as title, b.publishYear as year from Book as b ORDER BY 1 ASC, 2 DESC",
                 Object[].class,
                 null,
                 "{'aggregate': 'books', 'pipeline': [{'$sort': {'publishYear': -1, 'title': 1}}, {'$project': {'title': true, 'publishYear': true}}]}",
                 List.of(
-                        new Object[] {"War and Peace", 2025},
-                        new Object[] {"The Brothers Karamazov", 1880},
                         new Object[] {"Anna Karenina", 1877},
-                        new Object[] {"War and Peace", 1869},
-                        new Object[] {"Crime and Punishment", 1866}));
+                        new Object[] {"Crime and Punishment", 1866},
+                        new Object[] {"The Brothers Karamazov", 1880},
+                        new Object[] {"War and Peace", 2025},
+                        new Object[] {"War and Peace", 1869}));
     }
 
     @Test

src/main/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstSortField.java

@@ -23,6 +23,6 @@ public record AstSortField(String path, AstSortOrder order) implements AstNode {
     @Override
     public void render(BsonWriter writer) {
         writer.writeName(path);
-        writer.writeInt32(order.getRenderedValue());
+        order.render(writer);
     }
 }

src/main/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstSortOrder.java

@@ -16,7 +16,10 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-public enum AstSortOrder {
+import com.mongodb.hibernate.internal.translate.mongoast.AstNode;
+import org.bson.BsonWriter;
+
+public enum AstSortOrder implements AstNode {
     ASC(1),
     DESC(-1);
 
@@ -26,7 +29,8 @@ public enum AstSortOrder {
         this.renderedValue = renderedValue;
     }
 
-    public int getRenderedValue() {
-        return renderedValue;
+    @Override
+    public void render(BsonWriter writer) {
+        writer.writeInt32(renderedValue);
     }
 }

src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstSortFieldTests.java

@@ -17,6 +17,7 @@
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
 import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertElementRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.command.aggregate.AstSortOrder.ASC;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -26,11 +27,11 @@ class AstSortFieldTests {
     @ParameterizedTest
     @EnumSource(AstSortOrder.class)
     void testRendering(AstSortOrder sortOrder) {
-        var sortField = new AstSortField("path", sortOrder);
-        var expectedJson =
-                """
-                {"path": %d}\
-                """.formatted(sortOrder.getRenderedValue());
+        var sortField = new AstSortField("field", sortOrder);
+        var expectedJson = """
+                           {"field": %d}\
+                           """
+                .formatted(sortOrder == ASC ? 1 : -1);
         assertElementRender(expectedJson, sortField);
     }
 }