diff --git a/openspec/changes/add-suite-bundle-publishing/specs/suite-bundle-publishing/spec.md b/openspec/changes/add-suite-bundle-publishing/specs/suite-bundle-publishing/spec.md index 69b9d212b..5f28a1595 100644 --- a/openspec/changes/add-suite-bundle-publishing/specs/suite-bundle-publishing/spec.md +++ b/openspec/changes/add-suite-bundle-publishing/specs/suite-bundle-publishing/spec.md @@ -514,7 +514,8 @@ SHALL 支持上传一个 ZIP;浏览器支持安全目录选择时,也可以 必须逐成员明确确认。确认后,进度页 SHALL 展示每个成员的创建、扫描、审核、复用、引用、失败或 阻塞状态,并能通过操作 ID 在刷新或重新登录后恢复。“我的套件” SHALL 展示当前用户发起的非终态 Bundle 操作,使尚未生成 Suite 草稿的发布过程仍有稳定入口;公开套件专区 SHALL 继续只展示已发布 -Suite,不得把执行操作伪装成已经创建的 Suite。 +Suite,不得把执行操作伪装成已经创建的 Suite。非终态操作列表 SHALL 分页,并在数据库中聚合成员 +进度;只有仍可能自动变化的运行或等待状态才进行短间隔轮询。 #### Scenario: 用户确认混合计划 - **WHEN** 预览同时包含创建 Skill、创建版本、复用、引用和移除 @@ -530,6 +531,7 @@ Suite,不得把执行操作伪装成已经创建的 Suite。 - **WHEN** 当前用户发起的 Bundle 操作仍为 `RUNNING`、`WAITING_FOR_MEMBERS` 或 `BLOCKED_RETRYABLE` - **THEN** “我的套件”展示目标坐标、目标版本、整体状态和成员完成数量 - **AND** 用户可以回到该操作的进度页继续查看或处理 +- **AND** 操作数量超过单页容量时仍可通过分页访问 - **AND** 公开套件专区不展示该未完成操作 #### Scenario: 操作创建 Suite 草稿 diff --git a/openspec/changes/add-suite-bundle-publishing/tasks.md b/openspec/changes/add-suite-bundle-publishing/tasks.md index 21604f999..17d546404 100644 --- a/openspec/changes/add-suite-bundle-publishing/tasks.md +++ b/openspec/changes/add-suite-bundle-publishing/tasks.md @@ -21,7 +21,7 @@ - [x] 3.3 `[REQ-SBP-12, REQ-SBP-13]` 记录包和引用结果,并按规范状态矩阵通过领域事件与有界恢复任务完成协调;覆盖 PRIVATE `UPLOADED`、`SCANNING`、`SCAN_FAILED`、`PENDING_REVIEW`、`REJECTED`、外部撤回/删除/下架、`BLOCKED_RETRYABLE` 与 `REPREVIEW_REQUIRED`,验证占用随终态原子释放,重复、延迟、丢失和乱序时按原 ID 收敛或明确要求重新预览。 - [x] 3.4 `[REQ-SBP-12]` 仅在包发布成功、引用最终有效且最终权限/状态检查通过时,原子创建新 Suite 及首个 DRAFT,或为已有 Suite 创建一个 SuiteVersion DRAFT;验证权限撤销、Namespace 冻结、待审核、被拒绝、失败包和失效引用不会产生空 Suite 或部分草稿。 - [x] 3.5 `[REQ-SBP-13, REQ-SBP-15]` 实现带当前授权和响应脱敏的状态读取、原 ID 重试、非破坏性取消、终态占用释放、PreviewSession/暂存对象过期和限定范围补偿清理;验证等待审核的 ExecutionOperation 不随预览过期,已有 SkillVersion 和引用保持不变,清理失败仍有可操作记录。 -- [x] 3.6 `[REQ-SBP-17, REQ-SBP-18]` 在“创建 Suite”和“创建新版本”入口提供手工组合/本地导入选择,并实现准确列出副作用、最终可见性、发布路径和逐成员 warning 确认的确认页及可恢复进度页;展示包/引用状态、Skill 审核链接、阻塞原因、重试/取消和生成的 Suite 草稿;“我的套件”同时展示当前用户发起的非终态操作并提供继续查看入口。通过正常、等待、可重试阻塞、必须重预览、取消、权限变化、刷新、重新登录和离开导入页后恢复用例验证。 +- [x] 3.6 `[REQ-SBP-17, REQ-SBP-18]` 在“创建 Suite”和“创建新版本”入口提供手工组合/本地导入选择,并实现准确列出副作用、最终可见性、发布路径和逐成员 warning 确认的确认页及可恢复进度页;展示包/引用状态、Skill 审核链接、阻塞原因、重试/取消和生成的 Suite 草稿;“我的套件”通过分页和数据库聚合展示当前用户发起的非终态操作并提供继续查看入口,只对运行或等待状态短间隔轮询。通过正常、等待、可重试阻塞、必须重预览、取消、权限变化、刷新、重新登录、超过单页容量和离开导入页后恢复用例验证。 ## 4. 任意成员的所属 Suite diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleController.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleController.java index b0c7dc151..87d2293fd 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleController.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleController.java @@ -5,6 +5,7 @@ import com.iflytek.skillhub.controller.BaseApiController; import com.iflytek.skillhub.domain.namespace.NamespaceRole; import com.iflytek.skillhub.dto.ApiResponse; import com.iflytek.skillhub.dto.ApiResponseFactory; +import com.iflytek.skillhub.dto.PageResponse; import com.iflytek.skillhub.dto.SkillSuiteBundleConfirmRequest; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationResponse; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationDetailResponse; @@ -29,11 +30,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.List; import java.util.Map; import java.util.Set; @@ -112,10 +113,12 @@ public class SkillSuiteBundleController extends BaseApiController { @GetMapping("/operations/active") @Operation(operationId = "listActiveSkillSuiteBundleOperations", summary = "List active Bundle operations started by the current user") - public ApiResponse> listActiveOperations( - @RequestAttribute("userId") String userId + public ApiResponse> listActiveOperations( + @RequestAttribute("userId") String userId, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "12") int size ) { - return ok("response.success.read", operationQueryService.listActive(userId)); + return ok("response.success.read", operationQueryService.listActive(userId, page, size)); } @PostMapping("/operations/{operationId}/cancel") diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillSuiteBundleOperationSummaryResponse.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillSuiteBundleOperationSummaryResponse.java index 454099cc1..0001f4be7 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillSuiteBundleOperationSummaryResponse.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillSuiteBundleOperationSummaryResponse.java @@ -13,6 +13,7 @@ public record SkillSuiteBundleOperationSummaryResponse( String targetVersion, SkillSuiteBundleOperationStatus status, String failureCode, + String baseVersion, int totalMembers, int completedMembers, int waitingMembers, diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/repository/SkillSuiteBundleOperationQueryRepository.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/repository/SkillSuiteBundleOperationQueryRepository.java new file mode 100644 index 000000000..d5d59c6c2 --- /dev/null +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/repository/SkillSuiteBundleOperationQueryRepository.java @@ -0,0 +1,109 @@ +package com.iflytek.skillhub.repository; + +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMode; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleOperationStatus; +import com.iflytek.skillhub.dto.PageResponse; +import com.iflytek.skillhub.dto.SkillSuiteBundleOperationSummaryResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.sql.Timestamp; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.util.List; + +/** + * Dashboard read model for active Bundle operations owned by one actor. + * + *

The native query pages operations before joining member rows, then computes status counts in + * PostgreSQL. This keeps each poll bounded and avoids loading member errors and warnings.

+ */ +@Repository +public class SkillSuiteBundleOperationQueryRepository { + + private static final List ACTIVE_STATUSES = List.of( + SkillSuiteBundleOperationStatus.RUNNING.name(), + SkillSuiteBundleOperationStatus.WAITING_FOR_MEMBERS.name(), + SkillSuiteBundleOperationStatus.BLOCKED_RETRYABLE.name()); + + private final EntityManager entityManager; + + public SkillSuiteBundleOperationQueryRepository(EntityManager entityManager) { + this.entityManager = entityManager; + } + + @Transactional(readOnly = true) + public PageResponse findActive( + String actorId, + int page, + int size + ) { + Query select = entityManager.createNativeQuery(""" + WITH active_operation AS ( + SELECT operation.operation_id, operation.mode, + '@' || namespace.slug || '/' || operation.target_suite_slug AS target_coordinate, + operation.target_version, operation.status, operation.failure_code, + base_version.version AS base_version, operation.updated_at + FROM skill_suite_bundle_operation operation + JOIN namespace ON namespace.id = operation.namespace_id + LEFT JOIN skill_suite_version base_version + ON base_version.id = operation.base_suite_version_id + WHERE operation.actor_id = :actorId + AND operation.status IN (:statuses) + ORDER BY operation.updated_at DESC, operation.operation_id DESC + OFFSET :offset ROWS FETCH NEXT :size ROWS ONLY + ) + SELECT operation.operation_id, operation.mode, operation.target_coordinate, + operation.target_version, operation.status, operation.failure_code, + operation.base_version, operation.updated_at, + COUNT(member.id) AS total_members, + COUNT(member.id) FILTER (WHERE member.status = 'COMPLETED') AS completed_members, + COUNT(member.id) FILTER (WHERE member.status = 'WAITING_FOR_MEMBER') AS waiting_members + FROM active_operation operation + LEFT JOIN skill_suite_bundle_member_result member + ON member.operation_id = operation.operation_id + GROUP BY operation.operation_id, operation.mode, operation.target_coordinate, + operation.target_version, operation.status, operation.failure_code, + operation.base_version, operation.updated_at + ORDER BY operation.updated_at DESC, operation.operation_id DESC + """); + bind(select, actorId) + .setParameter("offset", (long) page * size) + .setParameter("size", size); + Query count = bind(entityManager.createNativeQuery(""" + SELECT COUNT(*) + FROM skill_suite_bundle_operation operation + WHERE operation.actor_id = :actorId + AND operation.status IN (:statuses) + """), actorId); + + @SuppressWarnings("unchecked") + List rows = select.getResultList(); + return new PageResponse<>( + rows.stream().map(this::map).toList(), + ((Number) count.getSingleResult()).longValue(), page, size); + } + + private Query bind(Query query, String actorId) { + return query.setParameter("actorId", actorId).setParameter("statuses", ACTIVE_STATUSES); + } + + private SkillSuiteBundleOperationSummaryResponse map(Object[] row) { + return new SkillSuiteBundleOperationSummaryResponse( + (String) row[0], SkillSuiteBundleMode.valueOf(String.valueOf(row[1])), + (String) row[2], (String) row[3], + SkillSuiteBundleOperationStatus.valueOf(String.valueOf(row[4])), + (String) row[5], (String) row[6], + ((Number) row[8]).intValue(), ((Number) row[9]).intValue(), + ((Number) row[10]).intValue(), instant(row[7])); + } + + private Instant instant(Object value) { + if (value instanceof Instant instant) return instant; + if (value instanceof OffsetDateTime offsetDateTime) return offsetDateTime.toInstant(); + if (value instanceof Timestamp timestamp) return timestamp.toInstant(); + throw new IllegalStateException("Expected Bundle operation update timestamp, got " + value); + } +} diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryService.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryService.java index 6a1e0fc51..fb3a0b57c 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryService.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryService.java @@ -11,17 +11,14 @@ import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleExecutionOperati import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleExecutionOperationRepository; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResult; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResultRepository; -import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResultStatus; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleOperationAuthorizationPolicy; -import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleOperationStatus; +import com.iflytek.skillhub.dto.PageResponse; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationDetailResponse; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationSummaryResponse; +import com.iflytek.skillhub.repository.SkillSuiteBundleOperationQueryRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -33,29 +30,27 @@ import java.util.stream.Collectors; @Service public class SkillSuiteBundleOperationQueryService { - private static final Set ACTIVE_STATUSES = EnumSet.of( - SkillSuiteBundleOperationStatus.RUNNING, - SkillSuiteBundleOperationStatus.WAITING_FOR_MEMBERS, - SkillSuiteBundleOperationStatus.BLOCKED_RETRYABLE); - private final SkillSuiteBundleExecutionOperationRepository operationRepository; private final SkillSuiteBundleMemberResultRepository memberRepository; private final NamespaceRepository namespaceRepository; private final SkillRepository skillRepository; private final VisibilityChecker visibilityChecker; + private final SkillSuiteBundleOperationQueryRepository operationQueryRepository; public SkillSuiteBundleOperationQueryService( SkillSuiteBundleExecutionOperationRepository operationRepository, SkillSuiteBundleMemberResultRepository memberRepository, NamespaceRepository namespaceRepository, SkillRepository skillRepository, - VisibilityChecker visibilityChecker + VisibilityChecker visibilityChecker, + SkillSuiteBundleOperationQueryRepository operationQueryRepository ) { this.operationRepository = operationRepository; this.memberRepository = memberRepository; this.namespaceRepository = namespaceRepository; this.skillRepository = skillRepository; this.visibilityChecker = visibilityChecker; + this.operationQueryRepository = operationQueryRepository; } @Transactional(readOnly = true) @@ -108,52 +103,15 @@ public class SkillSuiteBundleOperationQueryService { operation.getCreatedAt(), operation.getUpdatedAt(), operation.getCompletedAt(), members); } - /** Returns the caller's active operations in bounded batches without exposing member metadata. */ + /** Returns one bounded page of the caller's active operations without exposing member metadata. */ @Transactional(readOnly = true) - public List listActive(String actorId) { - var operations = operationRepository - .findTop50ByActorIdAndStatusInOrderByUpdatedAtDesc(actorId, ACTIVE_STATUSES); - if (operations.isEmpty()) { - return List.of(); - } - var namespaceIds = operations.stream() - .map(SkillSuiteBundleExecutionOperation::getNamespaceId) - .distinct() - .toList(); - Map namespaceSlugs = namespaceRepository.findByIdIn(namespaceIds).stream() - .collect(Collectors.toMap(namespace -> namespace.getId(), namespace -> namespace.getSlug())); - var operationIds = operations.stream() - .map(SkillSuiteBundleExecutionOperation::getOperationId) - .toList(); - Map> membersByOperation = new HashMap<>(); - memberRepository.findByOperationIdInOrderByOperationIdAscPositionAsc(operationIds) - .forEach(member -> membersByOperation - .computeIfAbsent(member.getOperationId(), ignored -> new ArrayList<>()) - .add(member)); - return operations.stream() - .filter(operation -> namespaceSlugs.containsKey(operation.getNamespaceId())) - .map(operation -> summary( - operation, namespaceSlugs.get(operation.getNamespaceId()), - membersByOperation.getOrDefault(operation.getOperationId(), List.of()))) - .toList(); - } - - private SkillSuiteBundleOperationSummaryResponse summary( - SkillSuiteBundleExecutionOperation operation, - String namespaceSlug, - List members + public PageResponse listActive( + String actorId, + int page, + int size ) { - int completed = (int) members.stream() - .filter(member -> member.getStatus() == SkillSuiteBundleMemberResultStatus.COMPLETED) - .count(); - int waiting = (int) members.stream() - .filter(member -> member.getStatus() == SkillSuiteBundleMemberResultStatus.WAITING_FOR_MEMBER) - .count(); - return new SkillSuiteBundleOperationSummaryResponse( - operation.getOperationId(), operation.getMode(), - "@" + namespaceSlug + "/" + operation.getTargetSuiteSlug(), - operation.getTargetVersion(), operation.getStatus(), operation.getFailureCode(), - members.size(), completed, waiting, operation.getUpdatedAt()); + return operationQueryRepository.findActive( + actorId, Math.max(0, page), Math.min(Math.max(1, size), 50)); } private boolean canReadMember( diff --git a/server/skillhub-app/src/main/resources/db/migration/V58__index_active_bundle_operations_by_actor.sql b/server/skillhub-app/src/main/resources/db/migration/V58__index_active_bundle_operations_by_actor.sql new file mode 100644 index 000000000..b81963468 --- /dev/null +++ b/server/skillhub-app/src/main/resources/db/migration/V58__index_active_bundle_operations_by_actor.sql @@ -0,0 +1,3 @@ +CREATE INDEX idx_suite_bundle_operation_actor_active_updated + ON skill_suite_bundle_operation(actor_id, updated_at DESC, operation_id DESC) + WHERE status IN ('RUNNING', 'WAITING_FOR_MEMBERS', 'BLOCKED_RETRYABLE'); diff --git a/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleControllerTest.java b/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleControllerTest.java index 13bf3f1a6..c21d04476 100644 --- a/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleControllerTest.java +++ b/server/skillhub-app/src/test/java/com/iflytek/skillhub/controller/portal/SkillSuiteBundleControllerTest.java @@ -7,6 +7,7 @@ import com.iflytek.skillhub.domain.namespace.NamespaceMemberRepository; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationResponse; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationDetailResponse; import com.iflytek.skillhub.dto.SkillSuiteBundleOperationSummaryResponse; +import com.iflytek.skillhub.dto.PageResponse; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMode; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleOperationStatus; import com.iflytek.skillhub.dto.SkillSuiteBundlePreviewResponse; @@ -165,18 +166,19 @@ class SkillSuiteBundleControllerTest { @Test void authenticatedCallerCanListTheirActiveOperations() throws Exception { - when(operationQueryService.listActive("actor")).thenReturn(List.of( + when(operationQueryService.listActive("actor", 0, 12)).thenReturn(new PageResponse<>(List.of( new SkillSuiteBundleOperationSummaryResponse( "operation-1", SkillSuiteBundleMode.CREATE, "@global/suite", "1.0.0", SkillSuiteBundleOperationStatus.WAITING_FOR_MEMBERS, null, - 2, 1, 1, Instant.parse("2026-09-11T08:00:00Z")))); + null, 2, 1, 1, Instant.parse("2026-09-11T08:00:00Z"))), 1, 0, 12)); mockMvc.perform(get("/api/v1/suite-bundles/operations/active") .with(authentication(authToken("actor")))) .andExpect(status().isOk()) - .andExpect(jsonPath("$.data[0].operationId").value("operation-1")) - .andExpect(jsonPath("$.data[0].targetCoordinate").value("@global/suite")) - .andExpect(jsonPath("$.data[0].completedMembers").value(1)); + .andExpect(jsonPath("$.data.items[0].operationId").value("operation-1")) + .andExpect(jsonPath("$.data.items[0].targetCoordinate").value("@global/suite")) + .andExpect(jsonPath("$.data.items[0].completedMembers").value(1)) + .andExpect(jsonPath("$.data.total").value(1)); } @Test diff --git a/server/skillhub-app/src/test/java/com/iflytek/skillhub/integration/SkillSuiteBundleOperationQueryRepositoryTest.java b/server/skillhub-app/src/test/java/com/iflytek/skillhub/integration/SkillSuiteBundleOperationQueryRepositoryTest.java new file mode 100644 index 000000000..c52c79df8 --- /dev/null +++ b/server/skillhub-app/src/test/java/com/iflytek/skillhub/integration/SkillSuiteBundleOperationQueryRepositoryTest.java @@ -0,0 +1,120 @@ +package com.iflytek.skillhub.integration; + +import com.iflytek.skillhub.domain.namespace.Namespace; +import com.iflytek.skillhub.domain.skill.SkillVisibility; +import com.iflytek.skillhub.domain.suite.SkillSuite; +import com.iflytek.skillhub.domain.suite.SkillSuiteVersion; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleCoordinate; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleExecutionOperation; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResult; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberSourceType; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMode; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundlePreviewSession; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundlePublishAction; +import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleRelationshipChange; +import com.iflytek.skillhub.domain.user.UserAccount; +import com.iflytek.skillhub.repository.SkillSuiteBundleOperationQueryRepository; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import org.springframework.test.context.TestPropertySource; +import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +import java.time.Instant; +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +@DataJpaTest +@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) +@ActiveProfiles("test") +@Import(SkillSuiteBundleOperationQueryRepository.class) +@Testcontainers +@TestPropertySource(properties = { + "spring.flyway.enabled=true", + "spring.jpa.hibernate.ddl-auto=validate", + "spring.jpa.show-sql=false", + "logging.level.org.hibernate.SQL=OFF" +}) +class SkillSuiteBundleOperationQueryRepositoryTest { + + private static final Instant NOW = Instant.parse("2026-09-14T08:00:00Z"); + + @Container + private static final PostgreSQLContainer POSTGRES = + new PostgreSQLContainer<>("postgres:16-alpine"); + + @DynamicPropertySource + static void configurePostgres(DynamicPropertyRegistry registry) { + registry.add("spring.datasource.url", POSTGRES::getJdbcUrl); + registry.add("spring.datasource.username", POSTGRES::getUsername); + registry.add("spring.datasource.password", POSTGRES::getPassword); + registry.add("spring.datasource.driver-class-name", () -> "org.postgresql.Driver"); + registry.add("spring.jpa.database-platform", () -> "org.hibernate.dialect.PostgreSQLDialect"); + } + + @Autowired + private TestEntityManager entityManager; + + @Autowired + private SkillSuiteBundleOperationQueryRepository repository; + + @Test + void pagesOnlyTheActorsActiveOperationsAndAggregatesMemberStatusesInPostgres() { + entityManager.persist(new UserAccount("actor", "Actor", null, null)); + Namespace namespace = entityManager.persistFlushFind( + new Namespace("team-ai", "AI Team", "actor")); + SkillSuite suite = entityManager.persistFlushFind( + new SkillSuite(namespace.getId(), "care-suite", "Care Suite", "actor")); + SkillSuiteVersion baseVersion = entityManager.persistFlushFind( + new SkillSuiteVersion(suite.getId(), "1.0.0", SkillVisibility.PUBLIC, "actor")); + SkillSuiteBundlePreviewSession preview = entityManager.persistFlushFind( + new SkillSuiteBundlePreviewSession( + "preview-1", "actor", SkillSuiteBundleMode.UPDATE, namespace.getId(), + suite.getSlug(), suite.getId(), baseVersion.getId(), "1.1.0", + "staging/archive.zip", "a".repeat(64), Map.of(), Map.of(), + "warning-digest", NOW.plusSeconds(600), NOW)); + SkillSuiteBundleExecutionOperation operation = new SkillSuiteBundleExecutionOperation( + "operation-1", preview.getToken(), "request-1", "actor", SkillSuiteBundleMode.UPDATE, + namespace.getId(), suite.getSlug(), suite.getId(), baseVersion.getId(), "1.1.0", + "staging/archive.zip", "a".repeat(64), Map.of(), "warning-digest", NOW); + operation.markWaitingForMembers(NOW.plusSeconds(1)); + entityManager.persist(operation); + entityManager.persist(member(0, "first", false)); + entityManager.persist(member(1, "second", true)); + entityManager.flush(); + + var page = repository.findActive("actor", 0, 1); + + assertThat(page.total()).isEqualTo(1); + assertThat(page.items()).singleElement().satisfies(summary -> { + assertThat(summary.operationId()).isEqualTo("operation-1"); + assertThat(summary.targetCoordinate()).isEqualTo("@team-ai/care-suite"); + assertThat(summary.baseVersion()).isEqualTo("1.0.0"); + assertThat(summary.totalMembers()).isEqualTo(2); + assertThat(summary.completedMembers()).isZero(); + assertThat(summary.waitingMembers()).isEqualTo(1); + }); + assertThat(repository.findActive("another-actor", 0, 1).items()).isEmpty(); + } + + private SkillSuiteBundleMemberResult member(int position, String slug, boolean waiting) { + SkillSuiteBundleMemberResult member = new SkillSuiteBundleMemberResult( + "operation-1", position, new SkillSuiteBundleCoordinate("team-ai", slug), + SkillSuiteBundleMemberSourceType.PACKAGE, "members/" + slug, + SkillVisibility.PUBLIC, "1.0.0", SkillSuiteBundleRelationshipChange.ADDED, + SkillSuiteBundlePublishAction.CREATE_VERSION, "fingerprint-" + slug, + null, null, List.of(), List.of(), NOW); + if (waiting) member.markWaiting(NOW.plusSeconds(1)); + return member; + } +} diff --git a/server/skillhub-app/src/test/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryServiceTest.java b/server/skillhub-app/src/test/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryServiceTest.java index 82cd0e161..510b4eae8 100644 --- a/server/skillhub-app/src/test/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryServiceTest.java +++ b/server/skillhub-app/src/test/java/com/iflytek/skillhub/service/bundle/SkillSuiteBundleOperationQueryServiceTest.java @@ -15,10 +15,11 @@ import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResult; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResultRepository; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberSourceType; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMode; -import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleMemberResultStatus; -import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleOperationStatus; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundlePublishAction; import com.iflytek.skillhub.domain.suite.bundle.SkillSuiteBundleRelationshipChange; +import com.iflytek.skillhub.dto.PageResponse; +import com.iflytek.skillhub.dto.SkillSuiteBundleOperationSummaryResponse; +import com.iflytek.skillhub.repository.SkillSuiteBundleOperationQueryRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -31,7 +32,6 @@ import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -44,6 +44,7 @@ class SkillSuiteBundleOperationQueryServiceTest { private SkillSuiteBundleMemberResultRepository memberRepository; private NamespaceRepository namespaceRepository; private SkillRepository skillRepository; + private SkillSuiteBundleOperationQueryRepository operationQueryRepository; private SkillSuiteBundleOperationQueryService service; @BeforeEach @@ -52,9 +53,10 @@ class SkillSuiteBundleOperationQueryServiceTest { memberRepository = mock(SkillSuiteBundleMemberResultRepository.class); namespaceRepository = mock(NamespaceRepository.class); skillRepository = mock(SkillRepository.class); + operationQueryRepository = mock(SkillSuiteBundleOperationQueryRepository.class); service = new SkillSuiteBundleOperationQueryService( operationRepository, memberRepository, namespaceRepository, - skillRepository, new VisibilityChecker()); + skillRepository, new VisibilityChecker(), operationQueryRepository); } @Test @@ -137,39 +139,13 @@ class SkillSuiteBundleOperationQueryServiceTest { } @Test - void listsOnlyTheActorsActiveOperationsWithBatchedMemberCounts() { - SkillSuiteBundleExecutionOperation operation = operation(); - operation.markWaitingForMembers(NOW.plusSeconds(1)); - Namespace namespace = mock(Namespace.class); - when(namespace.getId()).thenReturn(1L); - when(namespace.getSlug()).thenReturn("global"); - SkillSuiteBundleMemberResult completed = mock(SkillSuiteBundleMemberResult.class); - when(completed.getOperationId()).thenReturn("operation-1"); - when(completed.getStatus()).thenReturn(SkillSuiteBundleMemberResultStatus.COMPLETED); - SkillSuiteBundleMemberResult waiting = mock(SkillSuiteBundleMemberResult.class); - when(waiting.getOperationId()).thenReturn("operation-1"); - when(waiting.getStatus()).thenReturn(SkillSuiteBundleMemberResultStatus.WAITING_FOR_MEMBER); - when(operationRepository.findTop50ByActorIdAndStatusInOrderByUpdatedAtDesc( - eq("actor"), eq(Set.of( - SkillSuiteBundleOperationStatus.RUNNING, - SkillSuiteBundleOperationStatus.WAITING_FOR_MEMBERS, - SkillSuiteBundleOperationStatus.BLOCKED_RETRYABLE)))) - .thenReturn(List.of(operation)); - when(namespaceRepository.findByIdIn(List.of(1L))).thenReturn(List.of(namespace)); - when(memberRepository.findByOperationIdInOrderByOperationIdAscPositionAsc(List.of("operation-1"))) - .thenReturn(List.of(completed, waiting)); + void delegatesActiveOperationPagingToTheReadModel() { + PageResponse expected = + new PageResponse<>(List.of(), 0, 2, 50); + when(operationQueryRepository.findActive("actor", 2, 50)).thenReturn(expected); - var result = service.listActive("actor"); - - assertThat(result).singleElement().satisfies(summary -> { - assertThat(summary.operationId()).isEqualTo("operation-1"); - assertThat(summary.targetCoordinate()).isEqualTo("@global/suite"); - assertThat(summary.status()).isEqualTo(SkillSuiteBundleOperationStatus.WAITING_FOR_MEMBERS); - assertThat(summary.totalMembers()).isEqualTo(2); - assertThat(summary.completedMembers()).isEqualTo(1); - assertThat(summary.waitingMembers()).isEqualTo(1); - }); - verify(memberRepository).findByOperationIdInOrderByOperationIdAscPositionAsc(List.of("operation-1")); + assertThat(service.listActive("actor", 2, 100)).isSameAs(expected); + verify(operationQueryRepository).findActive("actor", 2, 50); } private SkillSuiteBundleExecutionOperation operation() { diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleExecutionOperationRepository.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleExecutionOperationRepository.java index b66bd5689..51be229d7 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleExecutionOperationRepository.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleExecutionOperationRepository.java @@ -12,8 +12,6 @@ public interface SkillSuiteBundleExecutionOperationRepository { Optional findByActorIdAndClientRequestId( String actorId, String clientRequestId); Optional findByPreviewToken(String previewToken); - List findTop50ByActorIdAndStatusInOrderByUpdatedAtDesc( - String actorId, Collection statuses); List findTop100ByStatusInOrderByUpdatedAtAsc( Collection statuses); List diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleMemberResultRepository.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleMemberResultRepository.java index 9a8860204..d0d756832 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleMemberResultRepository.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/suite/bundle/SkillSuiteBundleMemberResultRepository.java @@ -1,14 +1,11 @@ package com.iflytek.skillhub.domain.suite.bundle; -import java.util.Collection; import java.util.List; public interface SkillSuiteBundleMemberResultRepository { List saveAll(List members); void flush(); List findByOperationIdOrderByPosition(String operationId); - List findByOperationIdInOrderByOperationIdAscPositionAsc( - Collection operationIds); List findByOperationIdOrderByPositionForUpdate(String operationId); List findBySkillVersionId(Long skillVersionId); } diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSuiteBundleMemberResultJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSuiteBundleMemberResultJpaRepository.java index 33ee1b888..39e00c0fd 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSuiteBundleMemberResultJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSuiteBundleMemberResultJpaRepository.java @@ -9,7 +9,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import java.util.Collection; import java.util.List; @Repository @@ -31,12 +30,4 @@ public interface SkillSuiteBundleMemberResultJpaRepository List findByOperationIdOrderByPositionForUpdate( @Param("operationId") String operationId); - @Override - @Query(""" - SELECT member FROM SkillSuiteBundleMemberResult member - WHERE member.operationId IN :operationIds - ORDER BY member.operationId, member.position - """) - List findByOperationIdInOrderByOperationIdAscPositionAsc( - @Param("operationIds") Collection operationIds); } diff --git a/web/src/api/generated/schema.d.ts b/web/src/api/generated/schema.d.ts index 56ac3b7da..5649c6d1d 100644 --- a/web/src/api/generated/schema.d.ts +++ b/web/src/api/generated/schema.d.ts @@ -5860,15 +5860,24 @@ export interface components { completedAt?: string; members?: components["schemas"]["OperationMember"][]; }; - ApiResponseListSkillSuiteBundleOperationSummaryResponse: { + ApiResponsePageResponseSkillSuiteBundleOperationSummaryResponse: { /** Format: int32 */ code?: number; msg?: string; - data?: components["schemas"]["SkillSuiteBundleOperationSummaryResponse"][]; + data?: components["schemas"]["PageResponseSkillSuiteBundleOperationSummaryResponse"]; /** Format: date-time */ timestamp?: string; requestId?: string; }; + PageResponseSkillSuiteBundleOperationSummaryResponse: { + items?: components["schemas"]["SkillSuiteBundleOperationSummaryResponse"][]; + /** Format: int64 */ + total?: number; + /** Format: int32 */ + page?: number; + /** Format: int32 */ + size?: number; + }; SkillSuiteBundleOperationSummaryResponse: { operationId?: string; /** @enum {string} */ @@ -5878,6 +5887,7 @@ export interface components { /** @enum {string} */ status?: "RUNNING" | "WAITING_FOR_MEMBERS" | "BLOCKED_RETRYABLE" | "REPREVIEW_REQUIRED" | "SUITE_DRAFT_CREATED" | "CANCELLED"; failureCode?: string; + baseVersion?: string; /** Format: int32 */ totalMembers?: number; /** Format: int32 */ @@ -12289,7 +12299,10 @@ export interface operations { }; listActiveSkillSuiteBundleOperations: { parameters: { - query?: never; + query?: { + page?: number; + size?: number; + }; header?: never; path?: never; cookie?: never; @@ -12302,14 +12315,17 @@ export interface operations { [name: string]: unknown; }; content: { - "*/*": components["schemas"]["ApiResponseListSkillSuiteBundleOperationSummaryResponse"]; + "*/*": components["schemas"]["ApiResponsePageResponseSkillSuiteBundleOperationSummaryResponse"]; }; }; }; }; listActiveSkillSuiteBundleOperations_1: { parameters: { - query?: never; + query?: { + page?: number; + size?: number; + }; header?: never; path?: never; cookie?: never; @@ -12322,7 +12338,7 @@ export interface operations { [name: string]: unknown; }; content: { - "*/*": components["schemas"]["ApiResponseListSkillSuiteBundleOperationSummaryResponse"]; + "*/*": components["schemas"]["ApiResponsePageResponseSkillSuiteBundleOperationSummaryResponse"]; }; }; }; diff --git a/web/src/api/types.ts b/web/src/api/types.ts index 13e685f6d..860535f9e 100644 --- a/web/src/api/types.ts +++ b/web/src/api/types.ts @@ -475,7 +475,7 @@ export type SkillSuiteBundleOperation = components['schemas']['SkillSuiteBundleO export type SkillSuiteBundleOperationResult = components['schemas']['SkillSuiteBundleOperationResponse'] export type SkillSuiteBundleOperationSummary = RequiredGenerated< components['schemas']['SkillSuiteBundleOperationSummaryResponse'], - 'failureCode' + 'failureCode' | 'baseVersion' > // Publish diff --git a/web/src/pages/dashboard/my-suites.test.tsx b/web/src/pages/dashboard/my-suites.test.tsx index aaab42f8b..23959b975 100644 --- a/web/src/pages/dashboard/my-suites.test.tsx +++ b/web/src/pages/dashboard/my-suites.test.tsx @@ -2,13 +2,13 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { SkillSuiteBundleOperationSummary } from '@/api/types' +import type { PagedResponse, SkillSuiteBundleOperationSummary } from '@/api/types' import { MySuitesPage } from './my-suites' const mocks = vi.hoisted(() => ({ navigate: vi.fn(), remember: vi.fn(), - active: [] as SkillSuiteBundleOperationSummary[], + active: { items: [], total: 0, page: 0, size: 12 } as PagedResponse, })) vi.mock('@tanstack/react-router', () => ({ useNavigate: () => mocks.navigate })) @@ -25,22 +25,28 @@ describe('MySuitesPage', () => { afterEach(() => { cleanup() vi.clearAllMocks() - mocks.active = [] + mocks.active = { items: [], total: 0, page: 0, size: 12 } }) it('shows an active Bundle before its Suite draft exists and restores its progress', () => { - mocks.active = [{ - operationId: 'operation-1', - mode: 'CREATE', - targetCoordinate: '@global/waiting-suite', - targetVersion: '1.0.0', - status: 'WAITING_FOR_MEMBERS', - failureCode: undefined, - totalMembers: 2, - completedMembers: 1, - waitingMembers: 1, - updatedAt: '2026-09-14T04:00:00Z', - }] + mocks.active = { + items: [{ + operationId: 'operation-1', + mode: 'CREATE', + targetCoordinate: '@global/waiting-suite', + targetVersion: '1.0.0', + status: 'WAITING_FOR_MEMBERS', + failureCode: undefined, + baseVersion: undefined, + totalMembers: 2, + completedMembers: 1, + waitingMembers: 1, + updatedAt: '2026-09-14T04:00:00Z', + }], + total: 1, + page: 0, + size: 12, + } render() @@ -50,4 +56,34 @@ describe('MySuitesPage', () => { expect(mocks.remember).toHaveBeenCalledWith('CREATE', '@global/waiting-suite', 'operation-1') expect(mocks.navigate).toHaveBeenCalledWith({ to: '/dashboard/suites/new' }) }) + + it('restores an UPDATE operation against its frozen base version', () => { + mocks.active = { + items: [{ + operationId: 'operation-2', + mode: 'UPDATE', + targetCoordinate: '@team-ai/care-suite', + targetVersion: '1.1.0', + status: 'BLOCKED_RETRYABLE', + failureCode: 'TEMPORARY_STORAGE_FAILURE', + baseVersion: '1.0.0', + totalMembers: 3, + completedMembers: 2, + waitingMembers: 0, + updatedAt: '2026-09-14T05:00:00Z', + }], + total: 1, + page: 0, + size: 12, + } + + render() + fireEvent.click(screen.getByRole('button', { name: 'suite.bundle.continueOperation' })) + + expect(mocks.remember).toHaveBeenCalledWith('UPDATE', '@team-ai/care-suite', 'operation-2') + expect(mocks.navigate).toHaveBeenCalledWith({ + to: '/dashboard/suites/team-ai/care-suite/new-version', + search: { sourceVersion: '1.0.0' }, + }) + }) }) diff --git a/web/src/pages/dashboard/my-suites.tsx b/web/src/pages/dashboard/my-suites.tsx index 355993561..96560e237 100644 --- a/web/src/pages/dashboard/my-suites.tsx +++ b/web/src/pages/dashboard/my-suites.tsx @@ -19,16 +19,18 @@ export function MySuitesPage() { const navigate = useNavigate() const [query, setQuery] = useState('') const [page, setPage] = useState(0) + const [activePage, setActivePage] = useState(0) const { data, isLoading } = useMySuites(query.trim(), page, PAGE_SIZE) - const { data: activeOperations, isLoading: isLoadingOperations } = useActiveSuiteBundleOperations() + const { data: activeOperations, isLoading: isLoadingOperations } = + useActiveSuiteBundleOperations(activePage, PAGE_SIZE) - const continueOperation = (operation: NonNullable[number]) => { + const continueOperation = (operation: NonNullable['items'][number]) => { rememberSuiteBundleOperation(operation.mode, operation.targetCoordinate, operation.operationId) const coordinate = operation.targetCoordinate.match(/^@([^/]+)\/(.+)$/) if (operation.mode === 'UPDATE' && coordinate) { navigate({ to: `/dashboard/suites/${coordinate[1]}/${encodeURIComponent(coordinate[2])}/new-version`, - search: { sourceVersion: undefined }, + search: { sourceVersion: operation.baseVersion }, }) return } @@ -53,7 +55,7 @@ export function MySuitesPage() { /> {isLoadingOperations ? (
- ) : activeOperations?.length ? ( + ) : activeOperations?.items.length ? (

@@ -62,7 +64,7 @@ export function MySuitesPage() {

{t('suite.bundle.activeDescription')}

- {activeOperations.map(operation => ( + {activeOperations.items.map(operation => (
@@ -94,6 +96,11 @@ export function MySuitesPage() { ))}
+
) : null} {isLoading ? ( diff --git a/web/src/shared/hooks/use-suite-queries.ts b/web/src/shared/hooks/use-suite-queries.ts index f1afb4f97..bf074af76 100644 --- a/web/src/shared/hooks/use-suite-queries.ts +++ b/web/src/shared/hooks/use-suite-queries.ts @@ -167,13 +167,14 @@ export function useSuiteBundleOperation(operationId?: string) { }) } -export function useActiveSuiteBundleOperations() { +export function useActiveSuiteBundleOperations(page = 0, size = 12) { return useQuery({ - queryKey: ['suite-bundles', 'operations', 'active'], - queryFn: () => fetchJson( - `${WEB_API_PREFIX}/suite-bundles/operations/active`, + queryKey: ['suite-bundles', 'operations', 'active', page, size], + queryFn: () => fetchJson>( + `${WEB_API_PREFIX}/suite-bundles/operations/active?page=${page}&size=${size}`, ), - refetchInterval: (query) => query.state.data?.length ? 2_000 : false, + refetchInterval: (query) => query.state.data?.items.some(operation => + operation.status === 'RUNNING' || operation.status === 'WAITING_FOR_MEMBERS') ? 2_000 : false, }) }