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

fix(education): align integrated entitlement fixtures

Browse Source
This commit is contained in:
wangziqi
2026-07-31 13:32:59 +08:00
parent 83d5e9dfae
commit 3cfe205dfa
2 changed files with 18 additions and 6 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

@@ -75,17 +75,15 @@ public class PracticeSessionServiceImpl implements PracticeSessionService {
&& reqVO.getNodeId() != null && !reqVO.getNodeId().isBlank()) { && reqVO.getNodeId() != null && !reqVO.getNodeId().isBlank()) {
throw exception(INVALID_PRACTICE_CONFIG, "题集与目录节点不能同时指定"); throw exception(INVALID_PRACTICE_CONFIG, "题集与目录节点不能同时指定");
} }
if (reqVO.getCollectionId() != null && !reqVO.getCollectionId().isBlank()) { if (entitlementService != null && reqVO.getCollectionId() != null && !reqVO.getCollectionId().isBlank()) {
Long collectionId; Long collectionId;
try { try {
collectionId = Long.valueOf(reqVO.getCollectionId()); collectionId = Long.valueOf(reqVO.getCollectionId());
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
throw exception(INVALID_PRACTICE_CONFIG, "题集标识无效"); throw exception(INVALID_PRACTICE_CONFIG, "题集标识无效");
} }
if (entitlementService != null) { entitlementService.assertAccess(tenantId, userId, "QUESTION_COLLECTION", collectionId,
entitlementService.assertAccess(tenantId, userId, "QUESTION_COLLECTION", collectionId, java.time.LocalDateTime.now());
java.time.LocalDateTime.now());
}
} }
// 1. Idempotent check: same tenant + clientSessionId exists → verify ownership before returning // 1. Idempotent check: same tenant + clientSessionId exists → verify ownership before returning
PracticeSessionDO existing = sessionMapper.selectByTenantAndClientSessionId(tenantId, reqVO.getClientSessionId()); PracticeSessionDO existing = sessionMapper.selectByTenantAndClientSessionId(tenantId, reqVO.getClientSessionId());

16
yudao-module-education/src/test/java/cn/iocoder/yudao/module/education/service/commercialization/EducationEntitlementPostgreSqlIntegrationTest.java
View File

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.education.test.PostgreSqlDbIntegrationTest;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.jdbc.core.JdbcTemplate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.iocoder.yudao.module.education.enums.ErrorCodeConstants.ENTITLEMENT_IDEMPOTENCY_CONFLICT; import static cn.iocoder.yudao.module.education.enums.ErrorCodeConstants.ENTITLEMENT_IDEMPOTENCY_CONFLICT;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@@ -23,6 +24,7 @@ class EducationEntitlementPostgreSqlIntegrationTest extends PostgreSqlDbIntegrat
@Resource EducationEntitlementMapper entitlementMapper; @Resource EducationEntitlementMapper entitlementMapper;
@Resource EducationEntitlementEventMapper eventMapper; @Resource EducationEntitlementEventMapper eventMapper;
@Resource EducationResourceProductBindingMapper bindingMapper; @Resource EducationResourceProductBindingMapper bindingMapper;
@Resource JdbcTemplate jdbcTemplate;
@BeforeEach void setUp() { @BeforeEach void setUp() {
TenantContextHolder.setTenantId(10L); TenantContextHolder.setTenantId(10L);
@@ -30,7 +32,19 @@ class EducationEntitlementPostgreSqlIntegrationTest extends PostgreSqlDbIntegrat
entry.setEntryKey("paid"); entry.setName("Paid"); entry.setEntryType("question"); entryMapper.insert(entry); entry.setEntryKey("paid"); entry.setName("Paid"); entry.setEntryType("question"); entryMapper.insert(entry);
ContentNodeDO node = new ContentNodeDO(); node.setId(101L); node.setTenantId(10L); node.setScope("TENANT_OWNED"); ContentNodeDO node = new ContentNodeDO(); node.setId(101L); node.setTenantId(10L); node.setScope("TENANT_OWNED");
node.setEntryId(100L); node.setName("Paid node"); node.setNodeType("category"); node.setDepth(0); node.setIsLeaf(true); node.setEntryId(100L); node.setName("Paid node"); node.setNodeType("category"); node.setDepth(0); node.setIsLeaf(true);
node.setIsSelectable(true); node.setIsHidden(false); node.setIsActive(true); node.setPublicationStatus("ACTIVE"); node.setAuthoringVersion(0); nodeMapper.insert(node); node.setIsSelectable(true); node.setIsHidden(true); node.setIsActive(false); node.setPublicationStatus("DRAFT"); node.setAuthoringVersion(0); nodeMapper.insert(node);
jdbcTemplate.execute("""
DO $activate$
BEGIN
UPDATE education_content_node
SET publication_status='ACTIVE', is_active=true, is_hidden=false, authoring_version=1
WHERE id=101 AND tenant_id=10;
INSERT INTO education_content_node_lifecycle_audit
(tenant_id,node_id,authoring_version,actor_id,from_status,to_status)
VALUES (10,101,1,7,'DRAFT','ACTIVE');
END
$activate$;
""");
QuestionCollectionDO collection = new QuestionCollectionDO(); collection.setId(102L); collection.setTenantId(10L); collection.setScope("TENANT_OWNED"); QuestionCollectionDO collection = new QuestionCollectionDO(); collection.setId(102L); collection.setTenantId(10L); collection.setScope("TENANT_OWNED");
collection.setEntryId(100L); collection.setNodeId(101L); collection.setName("Paid collection"); collection.setCollectionType("MANUAL"); collection.setEntryId(100L); collection.setNodeId(101L); collection.setName("Paid collection"); collection.setCollectionType("MANUAL");
collection.setQuestionCount(0); collection.setAccessMode("PAID"); collection.setAccessRules("{\"label\":\"descriptive only\"}"); collection.setQuestionCount(0); collection.setAccessMode("PAID"); collection.setAccessRules("{\"label\":\"descriptive only\"}");