Skip to content

fix: make mock request record lookup deterministic(#6521) #7666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juicewcode wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make mock request record lookup deterministic(#6521) #7666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions shenyu-admin/src/main/resources/mappers/mock-request-record-sqlmap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
and `header` = #{header, jdbcType=VARCHAR}
</if>
</where>
ORDER BY date_updated DESC, id DESC
</select>

<select id="queryAll" resultMap="MockRequestRecordMap">
Expand Down
63 changes: 63 additions & 0 deletions shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/MockRequestRecordMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,6 +45,9 @@ public class MockRequestRecordMapperTest extends AbstractSpringIntegrationTest {
@Resource
private MockRequestRecordMapper mockRequestRecordMapper;

@Resource
private MockRequestRecordService mockRequestRecordService;

@Test
@Transactional
public void insert() {
Expand Down Expand Up @@ -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();
Expand Down
Loading