test-ISelectAbility-测试排序执行情况

ximatai · Sep 2, 2024 · 5b0ad3e · 5b0ad3e
1 parent 4273ad4
commit 5b0ad3e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/my-boot/src/main/resources/application.properties b/my-boot/src/main/resources/application.properties
@@ -14,3 +14,7 @@ quarkus.datasource.jdbc=true
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.log.sql=true
+
+quarkus.log.category."org.jdbi".level=DEBUG
+quarkus.log.category."org.jdbi".min-level=DEBUG
+quarkus.datasource.jdbc.enable-trace=true
diff --git a/my-boot/src/test/java/net/ximatai/muyun/platform/TestControllerTest.java b/my-boot/src/test/java/net/ximatai/muyun/platform/TestControllerTest.java
@@ -4,7 +4,6 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import jakarta.transaction.Transactional;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.exception.MyDatabaseException;
 import net.ximatai.muyun.domain.PageResult;
@@ -36,7 +35,6 @@ class TestControllerTest {
     List<String> ids;
 
     @BeforeEach
-    @Transactional
     void setUp() {
         tableName = testController.getMainTable();
         databaseAccess.execute("TRUNCATE TABLE %s".formatted(tableName));
@@ -70,6 +68,32 @@ void testPageView() {
         assertEquals(response.getLimit(), 2);
     }
 
+    @Test
+    void testPageViewSort() {
+        PageResult<HashMap> response = given()
+            .get("/test/view?page=1&limit=2&orderField=t_create")
+            .then()
+            .statusCode(200)
+            .extract()
+            .as(new TypeRef<>() {
+            });
+
+        assertEquals(response.getList().getFirst().get("id"), "1");
+    }
+
+    @Test
+    void testPageViewSortDesc() {
+        PageResult<HashMap> response = given()
+            .get("/test/view?page=1&limit=2&orderField=t_create&orderType=desc")
+            .then()
+            .statusCode(200)
+            .extract()
+            .as(new TypeRef<>() {
+            });
+
+        assertEquals("3", response.getList().getFirst().get("id"));
+    }
+
     @Test
     void testCreate() {
         String id = "666";

diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java
@@ -50,8 +50,9 @@ default PageResult view(
         if (!orderColumns.isEmpty()) {
             querySql.append(" order by ");
             querySql.append(orderColumns.stream()
-                .map(oc -> oc.getColumnName() + " " + (oc.getType().isASC() ? "asc" : "desc"))
-                .collect(Collectors.joining(", ")));
+                .map(oc -> "? " + (oc.getType().isASC() ? " asc" : " desc"))
+                .collect(Collectors.joining(",")));
+            orderColumns.forEach(oc -> params.add(oc.getColumnName()));
         }
 
         // 添加分页参数