wangziqi/ruoyi-vue-pro
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(education): preserve manual collection order

Browse Source
This commit is contained in:
wangziqi
2026-07-31 10:27:49 +08:00
parent eae5a6bb3a
commit c3c244a6f5
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/practice/PracticeSessionServiceImpl.java
View File

@@ -465,7 +465,7 @@ public class PracticeSessionServiceImpl implements PracticeSessionService {
// ========== internal helpers ========== // ========== internal helpers ==========
/** /**
* 从 provider 获取题目列表，按 questionId 稳定排序，取前 count 条。 * 从 provider 获取题目列表。题集路由保留手工成员顺序；其他路由按 questionId 稳定排序。
* 所有筛选条件（含 nodeId）完整转发到 provider，不做客户端裁剪。 * 所有筛选条件（含 nodeId）完整转发到 provider，不做客户端裁剪。
*/ */
private List<CatalogQuestionDTO> fetchAndOrderQuestions(String collectionId, String nodeId, private List<CatalogQuestionDTO> fetchAndOrderQuestions(String collectionId, String nodeId,
@@ -501,8 +501,10 @@ public class PracticeSessionServiceImpl implements PracticeSessionService {
throw exception(INSUFFICIENT_ELIGIBLE_QUESTIONS, 0, count); throw exception(INSUFFICIENT_ELIGIBLE_QUESTIONS, 0, count);
} }
allQuestions.sort(Comparator.comparing(CatalogQuestionDTO::getId, Comparator.nullsLast(String::compareTo)) if (collectionId == null || collectionId.isBlank()) {
.thenComparing(CatalogQuestionDTO::getContentVersion, Comparator.nullsLast(String::compareTo))); allQuestions.sort(Comparator.comparing(CatalogQuestionDTO::getId, Comparator.nullsLast(String::compareTo))
.thenComparing(CatalogQuestionDTO::getContentVersion, Comparator.nullsLast(String::compareTo)));
}
if (allQuestions.size() > count) { if (allQuestions.size() > count) {
allQuestions = allQuestions.subList(0, count); allQuestions = allQuestions.subList(0, count);
} }

16
yudao-module-education/src/test/java/cn/iocoder/yudao/module/education/service/practice/PracticeSessionServiceImplTest.java
View File

@@ -67,6 +67,18 @@ public class PracticeSessionServiceImplTest extends PostgreSqlDbIntegrationTest
assertEquals(0L, sessionMapper.selectCount()); assertEquals(0L, sessionMapper.selectCount());
} }
@Test
void shouldPreserveCollectionMembershipOrder() {
when(provider.isEnabled()).thenReturn(true);
when(provider.listQuestions(eq("col-order"), isNull(), isNull(), isNull(), eq(1), eq(2)))
.thenReturn(pageResult(List.of(questionDTO("20", "v1", "Twenty"), questionDTO("10", "v1", "Ten"))));
when(provider.listQuestions(eq("col-order"), isNull(), isNull(), isNull(), eq(2), eq(2)))
.thenReturn(pageResult(List.of()));
PracticeSessionCreateReqVO req = createReq("uuid-order", "col-order", 2);
PracticeSessionRespVO resp = service.createPracticeSession(req, 100L, 1L);
assertEquals(List.of("20", "10"), resp.getQuestions().stream().map(q -> q.getQuestionId()).toList());
}
@Test @Test
void shouldCreateSessionAndReturnQuestions() { void shouldCreateSessionAndReturnQuestions() {
when(provider.isEnabled()).thenReturn(true); when(provider.isEnabled()).thenReturn(true);
@@ -82,8 +94,8 @@ public class PracticeSessionServiceImplTest extends PostgreSqlDbIntegrationTest
assertNotNull(resp.getSessionId()); assertNotNull(resp.getSessionId());
assertEquals("ACTIVE", resp.getStatus()); assertEquals("ACTIVE", resp.getStatus());
assertEquals(2, resp.getQuestions().size()); assertEquals(2, resp.getQuestions().size());
assertEquals("q-001", resp.getQuestions().get(0).getQuestionId()); assertEquals("q-002", resp.getQuestions().get(0).getQuestionId());
assertEquals("q-002", resp.getQuestions().get(1).getQuestionId()); assertEquals("q-001", resp.getQuestions().get(1).getQuestionId());
assertEquals(1, resp.getQuestions().get(0).getSequence()); assertEquals(1, resp.getQuestions().get(0).getSequence());
assertEquals(2, resp.getQuestions().get(1).getSequence()); assertEquals(2, resp.getQuestions().get(1).getSequence());
} }