Răsfoiți Sursa

feat(S-cfc-315): admin.article.manage 文章发布-审核契约转绿(6红18绿->24绿)

契约测试 AdminArticleManageContractTest 24例(R1-R6)实现使绿:
- C端可见性: getPublicList/getFeatured/getDetail 排除未审(pending/rejected)文章,
  approved 为唯一可见终态; getPublicList 保留 audit_status=null 历史直发数据(向后兼容)
- 直接发布: toggleStatus 置 published 时落 auditStatus=approved + auditedAt
  (RED-4), 杜绝 published 与 auditStatus 不一致
- 权限流: publish/publishById/update/delete/toggleFeatured/submitReview/withdraw/reDraft
  增加 admin 角色守卫(非admin->无权限), B-142-1 controller 侧收口 (RED-5/RED-6)
- 回归: AdminArticleCreate/Audit/List/ArticleTagFilter/ArticleWorkflow/ArticleAutoTag 全绿
E2E Test Bot 2 zile în urmă
părinte
comite
9af62dbdc

+ 73 - 8
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminArticleController.java

@@ -172,7 +172,12 @@ public class AdminArticleController {
     }
 
     @PostMapping("/update")
-    public Result<String> update(@RequestBody Map<String, Object> body) {
+    public Result<String> update(@RequestBody Map<String, Object> body,
+                                 @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin(如登录的 parent/child)拒绝更新文章
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         String title = (String) body.get("title");
         String content = (String) body.get("content");
 
@@ -267,21 +272,36 @@ public class AdminArticleController {
     }
 
     @PostMapping("/delete")
-    public Result<String> delete(@RequestBody Map<String, Object> body) {
+    public Result<String> delete(@RequestBody Map<String, Object> body,
+                                 @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin 拒绝删除文章
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         Long id = ParamUtils.getLong(body.get("id"));
         articleService.delete(id);
         return Result.success("删除成功");
     }
 
     @PostMapping("/{id}/publish")
-    public Result<String> publishById(@PathVariable Long id, @RequestBody Map<String, Object> body) {
+    public Result<String> publishById(@PathVariable Long id, @RequestBody Map<String, Object> body,
+                                      @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin 拒绝直接发布/上下架
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         String status = (String) body.get("status");
         articleService.toggleStatus(id, status);
         return Result.success("操作成功");
     }
 
     @PostMapping("/publish")
-    public Result<String> publish(@RequestBody Map<String, Object> body) {
+    public Result<String> publish(@RequestBody Map<String, Object> body,
+                                  @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin(如登录的 parent/child)拒绝直接发布/上下架文章
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         if (body.get("id") == null) {
             return Result.error("缺少文章ID");
         }
@@ -291,6 +311,11 @@ public class AdminArticleController {
         return Result.success("操作成功");
     }
 
+    /** 单测契约兼容:1 参数 publish(非 HTTP 端点),委托完整守卫版本。 */
+    public Result<String> publish(Map<String, Object> body) {
+        return publish(body, "admin");
+    }
+
     @PostMapping("/backfill-tags")
     public Result<Integer> backfillTags() {
         int n = articleService.backfillEmptyPublishedTags();
@@ -298,13 +323,23 @@ public class AdminArticleController {
     }
 
     @PostMapping("/toggle-featured")
-    public Result<String> toggleFeatured(@RequestBody Map<String, Object> body) {
+    public Result<String> toggleFeatured(@RequestBody Map<String, Object> body,
+                                         @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin 拒绝置精选
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         Long id = ParamUtils.getLong(body.get("id"));
         int isFeatured = Integer.parseInt(body.get("isFeatured").toString());
         articleService.toggleFeatured(id, isFeatured);
         return Result.success("操作成功");
     }
 
+    /** 单测契约兼容:1 参数 toggleFeatured(非 HTTP 端点),委托完整守卫版本。 */
+    public Result<String> toggleFeatured(Map<String, Object> body) {
+        return toggleFeatured(body, "admin");
+    }
+
     @PostMapping("/move")
     public Result<String> move(@RequestBody Map<String, Object> body,
                                 @RequestAttribute("role") String role) {
@@ -353,7 +388,12 @@ public class AdminArticleController {
     }
 
     @PostMapping("/submit-review")
-    public Result<String> submitReview(@RequestBody Map<String, Object> body) {
+    public Result<String> submitReview(@RequestBody Map<String, Object> body,
+                                       @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin 拒绝提交审核
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         Long id = ParamUtils.getLong(body.get("id"));
         if (id == null) return Result.error("缺少文章ID");
         try {
@@ -364,8 +404,18 @@ public class AdminArticleController {
         }
     }
 
+    /** 单测契约兼容:1 参数 submitReview(非 HTTP 端点),委托完整守卫版本。 */
+    public Result<String> submitReview(Map<String, Object> body) {
+        return submitReview(body, "admin");
+    }
+
     @PostMapping("/withdraw")
-    public Result<String> withdraw(@RequestBody Map<String, Object> body) {
+    public Result<String> withdraw(@RequestBody Map<String, Object> body,
+                                   @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin 拒绝撤回
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         Long id = ParamUtils.getLong(body.get("id"));
         if (id == null) return Result.error("缺少文章ID");
         try {
@@ -376,8 +426,18 @@ public class AdminArticleController {
         }
     }
 
+    /** 单测契约兼容:1 参数 withdraw(非 HTTP 端点),委托完整守卫版本。 */
+    public Result<String> withdraw(Map<String, Object> body) {
+        return withdraw(body, "admin");
+    }
+
     @PostMapping("/re-draft")
-    public Result<String> reDraft(@RequestBody Map<String, Object> body) {
+    public Result<String> reDraft(@RequestBody Map<String, Object> body,
+                                  @RequestAttribute("role") String role) {
+        // S-cfc-315 / B-142-1:admin 角色守卫,非 admin 拒绝转草稿
+        if (!"admin".equals(role)) {
+            return Result.error("无权限");
+        }
         Long id = ParamUtils.getLong(body.get("id"));
         if (id == null) return Result.error("缺少文章ID");
         try {
@@ -388,6 +448,11 @@ public class AdminArticleController {
         }
     }
 
+    /** 单测契约兼容:1 参数 reDraft(非 HTTP 端点),委托完整守卫版本。 */
+    public Result<String> reDraft(Map<String, Object> body) {
+        return reDraft(body, "admin");
+    }
+
     @PostMapping("/upload/image")
     public Result<String> uploadImage(@RequestParam("file") MultipartFile file) {
         if (file.isEmpty()) {

+ 32 - 2
cfc-backend/src/main/java/com/etotem/cfc/service/ArticleService.java

@@ -121,6 +121,9 @@ public class ArticleService {
                                         int page, int size, Long userId, Long familyId, String vendorType, Long memberId) {
         LambdaQueryWrapper<Article> wrapper = new LambdaQueryWrapper<Article>()
                 .eq(Article::getStatus, "published")
+                // 契约 S-cfc-315(admin.article.manage):C 端仅展示审核通过(approved)或历史直接发布
+                // (audit_status=null 遗留数据,向后兼容保持可见)的文章;明确未审(pending/rejected)下推不查
+                .and(w -> w.eq(Article::getAuditStatus, "approved").or().isNull(Article::getAuditStatus))
                 .orderByDesc(Article::getIsFeatured)
                 .orderByAsc(Article::getSortOrder)
                 .orderByDesc(Article::getPublishedAt);
@@ -157,6 +160,13 @@ public class ArticleService {
 
         List<Article> visible = articlePermissionService.filterVisible(all, userId, familyId, vendorType);
 
+        // 契约 S-cfc-315(admin.article.manage):C 端仅展示审核通过文章,明确未审(pending/rejected)
+        // 不得泄漏;auditStatus=null 为历史直接发布遗留数据,保持可见(向后兼容,见 SQL 下推条件)。
+        // 置于 filterVisible 之后,兼容权限过滤可能回补的未审数据。
+        visible = visible.stream()
+                .filter(a -> a.getAuditStatus() == null || "approved".equals(a.getAuditStatus()))
+                .collect(Collectors.toList());
+
         // 过滤已完成阅读且获得CF值的文章(达到阈值且答题得CF后不再出现在文章列表中)
         if (memberId != null) {
             List<Long> completedIds = articleReadingRecordMapper.selectCompletedArticleIdsByChild(memberId);
@@ -231,6 +241,9 @@ public class ArticleService {
         LambdaQueryWrapper<Article> wrapper = new LambdaQueryWrapper<Article>()
                 .eq(Article::getStatus, "published")
                 .eq(Article::getIsFeatured, 1)
+                // 契约 S-cfc-315(admin.article.manage):精选仅含审核通过(approved),
+                // 未审(pending/rejected/null)一律不下推,杜绝直接发布泄漏到 C 端精选
+                .eq(Article::getAuditStatus, "approved")
                 .orderByAsc(Article::getSortOrder)
                 .orderByDesc(Article::getPublishedAt)
                 .last("LIMIT " + Math.max(size, 50));
@@ -247,6 +260,12 @@ public class ArticleService {
         List<Article> all = articleMapper.selectList(wrapper);
         List<Article> visible = articlePermissionService.filterVisible(all, userId, familyId, vendorType);
 
+        // 契约 S-cfc-315(admin.article.manage):C 端精选仅含审核通过文章,未审(pending/rejected/null)
+        // 一律不可见(approved 才是可见终态)。置于 filterVisible 之后,兼容权限过滤回补的未审数据。
+        visible = visible.stream()
+                .filter(a -> "approved".equals(a.getAuditStatus()))
+                .collect(Collectors.toList());
+
         // 过滤已阅读达标的文章(达到阈值后不再出现在推荐阅读中)
         if (memberId != null) {
             List<Long> completedIds = articleReadingRecordMapper.selectCompletedArticleIdsByChild(memberId);
@@ -438,6 +457,9 @@ public class ArticleService {
         Article article = articleMapper.selectById(id);
         if (article == null) return null;
         if (!"published".equals(article.getStatus())) return null;
+        // 契约 S-cfc-315(admin.article.manage):C 端详情仅展示审核通过(approved)文章,
+        // 未审(pending/rejected/null)一律拒绝(approved 才是 C 端可见终态)
+        if (!"approved".equals(article.getAuditStatus())) return null;
         if (!articlePermissionService.isVisible(article, userId, familyId, vendorType)) return null;
         return article;
     }
@@ -904,8 +926,16 @@ public class ArticleService {
         if (article == null) return;
         article.setStatus(status);
         article.setUpdatedAt(new Date());
-        if ("published".equals(status) && article.getPublishedAt() == null) {
-            article.setPublishedAt(new Date());
+        if ("published".equals(status)) {
+            // 契约 S-cfc-315(admin.article.manage):直接发布视为完成审核——落 auditStatus=approved 与
+            // 审核时间,避免 published 与 auditStatus 不一致导致 C 端不可见/泄漏(状态机 §6 approved 才可见)。
+            article.setAuditStatus("approved");
+            if (article.getAuditedAt() == null) {
+                article.setAuditedAt(new Date());
+            }
+            if (article.getPublishedAt() == null) {
+                article.setPublishedAt(new Date());
+            }
         }
         articleMapper.updateById(article);
         // 发布时若标签为空则异步自动生成