From fbc7e9a142c61c2c1ecb764e3cecaf1ce3e21b75 Mon Sep 17 00:00:00 2001
From: juicew <491852417@qq.com>
Date: Thu, 15 Oct 2026 23:10:26 +0800
Subject: [PATCH] fix: make mock request record lookup deterministic

  Order mock request records by date_updated DESC and id DESC so queryByApiId consistently returns the most recently
  updated record, using the primary key as a stable tie breaker.

  Add H2 integration coverage for duplicate api_id values, timestamp ordering, ID tie breaking, and the service-level
  queryByApiId selection.
---
 .../mappers/mock-request-record-sqlmap.xml    |  1 +
 .../mapper/MockRequestRecordMapperTest.java   | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/shenyu-admin/src/main/resources/mappers/mock-request-record-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/mock-request-record-sqlmap.xml
index 85883814a19e..3ab689ba9bb3 100644
--- a/shenyu-admin/src/main/resources/mappers/mock-request-record-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/mock-request-record-sqlmap.xml
@@ -64,6 +64,7 @@
               and  `header` = #{header, jdbcType=VARCHAR}
             </if>
         </where>
+        ORDER BY date_updated DESC, id DESC
     </select>
 
     <select id="queryAll" resultMap="MockRequestRecordMap">
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MockRequestRecordMapperTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MockRequestRecordMapperTest.java
index af6480141357..79f5e140eeb6 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MockRequestRecordMapperTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MockRequestRecordMapperTest.java
@@ -22,6 +22,8 @@
 import org.apache.shenyu.admin.AbstractSpringIntegrationTest;
 import org.apache.shenyu.admin.model.entity.MockRequestRecordDO;
 import org.apache.shenyu.admin.model.query.MockRequestRecordQuery;
+import org.apache.shenyu.admin.model.vo.MockRequestRecordVO;
+import org.apache.shenyu.admin.service.MockRequestRecordService;
 import org.apache.shenyu.common.utils.UUIDUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +45,9 @@ public class MockRequestRecordMapperTest extends AbstractSpringIntegrationTest {
     @Resource
     private MockRequestRecordMapper mockRequestRecordMapper;
 
+    @Resource
+    private MockRequestRecordService mockRequestRecordService;
+
     @Test
     @Transactional
     public void insert() {
@@ -177,6 +182,64 @@ public void testSelectByQuery() {
         assertEquals(mockRequestRecordDOS.size(), 1);
     }
 
+    @Test
+    @Transactional
+    public void testSelectByQueryOrdersByDateUpdatedAndId() {
+        Timestamp older = Timestamp.valueOf("2024-01-01 00:00:00");
+        Timestamp newer = Timestamp.valueOf("2024-01-02 00:00:00");
+        MockRequestRecordDO olderRecord = MockRequestRecordDO.builder()
+                .id("mock-order-older")
+                .apiId("mock-order-api")
+                .host("127.0.0.1")
+                .port(8080)
+                .url("http://localhost/older")
+                .pathVariable("")
+                .query("")
+                .header("")
+                .dateCreated(older)
+                .dateUpdated(older)
+                .build();
+        MockRequestRecordDO newerRecord = MockRequestRecordDO.builder()
+                .id("mock-order-z")
+                .apiId("mock-order-api")
+                .host("127.0.0.1")
+                .port(8080)
+                .url("http://localhost/newer")
+                .pathVariable("")
+                .query("")
+                .header("")
+                .dateCreated(newer)
+                .dateUpdated(newer)
+                .build();
+        MockRequestRecordDO sameTimeRecord = MockRequestRecordDO.builder()
+                .id("mock-order-y")
+                .apiId("mock-order-api")
+                .host("127.0.0.1")
+                .port(8080)
+                .url("http://localhost/same-time")
+                .pathVariable("")
+                .query("")
+                .header("")
+                .dateCreated(newer)
+                .dateUpdated(newer)
+                .build();
+        mockRequestRecordMapper.insert(olderRecord);
+        mockRequestRecordMapper.insert(newerRecord);
+        mockRequestRecordMapper.insert(sameTimeRecord);
+
+        MockRequestRecordQuery query = new MockRequestRecordQuery();
+        query.setApiId("mock-order-api");
+        List<MockRequestRecordDO> records = mockRequestRecordMapper.selectByQuery(query);
+
+        assertEquals(3, records.size());
+        assertEquals("mock-order-z", records.get(0).getId());
+        assertEquals("mock-order-y", records.get(1).getId());
+        assertEquals("mock-order-older", records.get(2).getId());
+
+        MockRequestRecordVO selectedRecord = mockRequestRecordService.queryByApiId("mock-order-api");
+        assertEquals("mock-order-z", selectedRecord.getId());
+    }
+
     @Test
     public void testBatchDelete() {
         MockRequestRecordDO mockRequestRecordDO = buildMockRequestRecordDO();