Jelajahi Sumber

T28-FIX-WRITE (AC-09 P0) 方向1:food_recommend_idx 写侧键归一 memberId→users.id

核验报告 §三 P0:报告确认链路曾把 family_members.id(memberId)写入
food_recommend_idx.user_id,而家庭总览按 family_members.user_id(users.id)关联,
两条键不唯一对齐导致总览重算链路失效。

- DatabaseInitializer 迁移436:历史 memberId 键行一次性归一为 users.id;
  幂等(重复执行 0 行),唯一键冲突行 LEFT JOIN 探测后跳过留观,不做
  删行/删表/改 UNIQUE/外键等不可逆操作;schema.sql 同步键语义注释。
- 写侧归一在 FoodRecommendService.recalculateForUser 内部(resolveFoodIndexUserId),
  覆盖全部 5 个调用点(upload/confirm/audit/proxy-confirm/edit),
  refreshFamilyOverviews 接收归一后 userId 反查家庭,读侧 doRecalculate 语义不变。
- 测试:FamilyFoodOverviewServiceTest 新增 AC-09 全链路用例(memberId 写键、
  总览出现、score 更新),FoodRecommendServiceTest 补 MyBatis-Plus lambda 元数据初始化;
  已修复依赖旧 memberId 键语义的既有用例。全部 29 个单测绿。
Sisyphus 2 minggu lalu
induk
melakukan
3861bb41dd

+ 29 - 0
cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -14893,6 +14893,35 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
         } catch (Exception e) {
             log.warn("迁移427: 放开 bundle_product_id 可空失败(可能已放开): {}", e.getMessage());
         }
+
+        // 迁移436: food_recommend_idx 历史键归一 memberId→user_id(T28-FIX-WRITE,AC-09 P0 方向1)
+        // 背景:报告确认链路曾把 family_members.id(memberId)写入 food_recommend_idx.user_id,而家庭总览按
+        // family_members.user_id(users.id)关联 → 两条键不唯一对齐,总览重算链路失效(核验报告 §三 P0)。
+        // 写侧已统一归一(FoodRecommendService.resolveFoodIndexUserId + recalculateForUser 内部),
+        // 此处一次性迁移历史 memberId 键行:food_recommend_idx.user_id ∈ family_members.id(且该成员有 user_id)
+        // 的行替换为 family_members.user_id。
+        // 幂等性:JOIN 以 food_recommend_idx.user_id = family_members.id 匹配,迁移后键值变为 user_id
+        // (users.id 域,与原 memberId 域基本不重叠,除非 id==user_id 巧合 → 天然可重入,跑第二次 0 行);
+        // 另加 f.user_id <> fm.user_id 守卫,id==user_id 巧合行不重复触碰。
+        // 冲突处理:若目标 (user_id, food_id) 已存在(uk_fri_user_food 唯一键),LEFT JOIN 探测后跳过该行
+        // (保留 memberId 键,不删行、不覆盖,避免唯一键冲突导致整句 UPDATE 失败),行数在日志中汇报留观。
+        // family_members.user_id IS NULL(纯档案成员,无登录账号)的行保留原键(无法对齐,观察)。
+        // ⚠️ 仅 UPDATE food_recommend_idx 键行(可逆);不做删行/删表/改 UNIQUE/外键。
+        try {
+            int migrated = jdbcTemplate.update(
+                    "UPDATE food_recommend_idx f " +
+                    "JOIN family_members fm ON f.user_id = fm.id " +
+                    "LEFT JOIN food_recommend_idx t ON t.user_id = fm.user_id AND t.food_id = f.food_id AND t.id <> f.id " +
+                    "SET f.user_id = fm.user_id " +
+                    "WHERE fm.user_id IS NOT NULL AND f.user_id <> fm.user_id AND t.id IS NULL");
+            Integer leftover = jdbcTemplate.queryForObject(
+                    "SELECT COUNT(*) FROM food_recommend_idx f " +
+                    "JOIN family_members fm ON f.user_id = fm.id " +
+                    "WHERE fm.user_id IS NOT NULL AND f.user_id <> fm.user_id", Integer.class);
+            log.info("迁移436: food_recommend_idx 键归一 memberId→user_id 迁移 {} 行,未对齐(memberId 键)剩余 {} 行(冲突或纯档案成员,留观)", migrated, leftover == null ? -1 : leftover);
+        } catch (Exception e) {
+            log.warn("迁移436: food_recommend_idx 键归一执行失败(幂等,可重复执行): {}", e.getMessage());
+        }
     }
 
     private static String text(JsonNode row, String field) {

+ 2 - 2
cfc-backend/src/main/resources/schema.sql

@@ -4160,7 +4160,7 @@ CREATE TABLE IF NOT EXISTS share_reads (
 -- ============================================================
 CREATE TABLE IF NOT EXISTS food_recommend_idx (
     id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    user_id BIGINT NOT NULL COMMENT '用户ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID(T28-FIX-WRITE 方向1:统一为 users.id 键;报告确认链路 memberId 已由 FoodRecommendService.resolveFoodIndexUserId 归一)',
     food_id BIGINT NOT NULL COMMENT '食材ID',
     food_name VARCHAR(100) COMMENT '食材名称',
     index_score INT COMMENT '推荐指数(0-100)',
@@ -4170,7 +4170,7 @@ CREATE TABLE IF NOT EXISTS food_recommend_idx (
     INDEX idx_user (user_id),
     INDEX idx_food (food_id),
     INDEX idx_report (health_report_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='饮食推荐指数';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='饮食推荐指数(键语义:user_id=users.id,见迁移436键归一;历史 memberId 键行已迁移)';
 
 -- 报告食材适宜度
 CREATE TABLE IF NOT EXISTS report_food_suitability (

+ 193 - 0
cfc-backend/src/test/java/com/etotem/cfc/integration/service/FamilyFoodOverviewServiceTest.java

@@ -4,9 +4,15 @@ import com.etotem.cfc.entity.FamilyFoodOverview;
 import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.Food;
 import com.etotem.cfc.entity.FoodRecommendIndex;
+import com.etotem.cfc.entity.FoodRecommendIdxLog;
+import com.etotem.cfc.entity.HealthReport;
+import com.etotem.cfc.entity.ReportFoodSuitability;
 import com.etotem.cfc.mapper.FamilyFoodOverviewMapper;
 import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.FoodRecommendIndexMapper;
+import com.etotem.cfc.mapper.FoodRecommendIdxLogMapper;
+import com.etotem.cfc.mapper.ReportFoodSuitabilityMapper;
+import com.etotem.cfc.service.HealthReportService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
@@ -45,6 +51,18 @@ public class FamilyFoodOverviewServiceTest {
     @Mock
     private FoodService foodService;
 
+    @Mock
+    private FoodRecommendIdxLogMapper foodRecommendIdxLogMapper;
+
+    @Mock
+    private ReportFoodSuitabilityMapper reportFoodSuitabilityMapper;
+
+    @Mock
+    private HealthReportService healthReportService;
+
+    @Mock
+    private NormalizeIndicatorPipeline normalizeIndicatorPipeline;
+
     @BeforeEach
     public void setup() throws Exception {
         MockitoAnnotations.openMocks(this);
@@ -335,6 +353,181 @@ public class FamilyFoodOverviewServiceTest {
         assertEquals(-18, ((Number) details.get(0).get("score")).intValue());
     }
 
+    // ==================== 写侧归一 + AC-09 全链路回归(T28-FIX-WRITE 方向1) ====================
+    // 核验报告 §三 P0:报告确认链路把 family_members.id(memberId)写入 food_recommend_idx.user_id,
+    // 而家庭总览按 family_members.user_id(users.id)关联 → 两条键不唯一对齐,总览重算链路失效。
+    // 方向1:recalculateForUser 入口归一 memberId→users.id 后写 food_recommend_idx;refreshFamilyOverviews
+    // 用归一后的 userId 反查家庭;doRecalculate 按 family_members.user_id IN (userIds) 批量查 → 链路重新打通。
+    // 本用例模拟:resolveSubjectToMemberId 返回 memberId=1043(family_members.id,其 user_id=81330)
+    // → recalculateForUser(1043) → food_recommend_idx.user_id 落成 81330(users.id,绝非 1043)
+    // → refreshFamilyOverviews(81330) 按 family_members.user_id=81330 反查命中家庭 100
+    // → FamilyFoodOverviewService.recalculate(100) 重算总览 → overview 非空(AC-09 回归)。
+
+    @Test
+    public void confirmChain_memberIdKey_writesUserId_andOverviewAppears() throws Exception {
+        // ---- 组装 FoodRecommendService(写侧,与读侧 FamilyFoodOverviewService 共享同一批 mock mapper)----
+        FoodRecommendService recService = new FoodRecommendService();
+        setField(recService, "foodRecommendIndexMapper", idxMapper);
+        setField(recService, "foodRecommendIdxLogMapper", foodRecommendIdxLogMapper);
+        setField(recService, "reportFoodSuitabilityMapper", reportFoodSuitabilityMapper);
+        setField(recService, "familyMemberMapper", familyMemberMapper);
+        setField(recService, "healthReportService", healthReportService);
+        setField(recService, "foodService", foodService);
+        setField(recService, "familyFoodOverviewService", service);
+        setField(recService, "normalizeIndicatorPipeline", normalizeIndicatorPipeline);
+
+        // 成员 1043(memberId)关联登录用户 81330(users.id),家庭 100
+        FamilyMember loginMember = member(1043L, 81330L, "小宇宙", "active");
+
+        // 归一化:memberId 1043 → users.id 81330
+        when(familyMemberMapper.selectById(1043L)).thenReturn(loginMember);
+
+        // 报告确认结果:最新报告存在,食材得分 -25
+        HealthReport report = new HealthReport();
+        report.setId(1L);
+        when(healthReportService.getLatestReport(1043L)).thenReturn(report);
+        Food salmon = new Food();
+        salmon.setId(12L);
+        salmon.setName("三文鱼");
+        salmon.setCategory("水产");
+        salmon.setScore(-25);
+        when(foodService.listByReportId(1L)).thenReturn(Collections.singletonList(salmon));
+
+        // 写侧:food_recommend_idx 当前无记录(首次确认)。用内存表模拟 DB:
+        // selectList 返回内存行(首次空,insert 后可见),供读侧 doRecalculate 的 IN (userIds) 命中。
+        List<FoodRecommendIndex> idxStore = new ArrayList<>();
+        when(idxMapper.insert(any())).thenAnswer(inv -> {
+            FoodRecommendIndex inserted = inv.getArgument(0);
+            if (inserted.getId() == null) inserted.setId(10000L + idxStore.size());
+            idxStore.add(inserted);
+            return 1;
+        });
+        when(idxMapper.selectList(any())).thenAnswer(inv -> new ArrayList<>(idxStore));
+        when(idxMapper.updateById(any())).thenAnswer(inv -> 1);
+        when(idxMapper.deleteById(any())).thenAnswer(inv -> 1);
+        when(idxMapper.delete(any())).thenAnswer(inv -> 0);
+
+        // 读侧(FamilyFoodOverviewService.doRecalculate):
+        // - 成员来源 = family_members WHERE family_id=100 AND user_id 非空 AND 状态非 recycled → 命中 81330
+        // - family_members WHERE user_id=81330 反查家庭(refreshFamilyOverviews)→ 命中
+        when(familyMemberMapper.selectList(any())).thenReturn(Collections.singletonList(loginMember));
+        // openFace 里指向 foods 元数据的快照查询
+        when(foodService.listByIds(any())).thenReturn(Collections.singletonList(salmon));
+
+        // 写侧确认后,food_recommend_idx 出现 81330 键行 → 读侧 IN (81330) 命中 → 总览行插入
+        org.mockito.ArgumentCaptor<FoodRecommendIndex> idxCaptor =
+                org.mockito.ArgumentCaptor.forClass(FoodRecommendIndex.class);
+        org.mockito.ArgumentCaptor<FamilyFoodOverview> ovCaptor =
+                org.mockito.ArgumentCaptor.forClass(FamilyFoodOverview.class);
+
+        recService.recalculateForUser(1043L);
+
+        // 断言 1(写侧归一):food_recommend_idx.user_id = users.id 81330,绝非 memberId 1043
+        verify(idxMapper).insert(idxCaptor.capture());
+        assertEquals(81330L, idxCaptor.getValue().getUserId(), "AC-09 写侧归一失败:键应为 users.id,而非 memberId");
+        assertEquals(-25, idxCaptor.getValue().getIndexScore());
+        // 变更日志键同样归一
+        org.mockito.ArgumentCaptor<FoodRecommendIdxLog> logCaptor =
+                org.mockito.ArgumentCaptor.forClass(FoodRecommendIdxLog.class);
+        verify(foodRecommendIdxLogMapper).insert(logCaptor.capture());
+        assertEquals(81330L, logCaptor.getValue().getUserId());
+
+        // 断言 2(refreshFamilyOverviews 反查命中 + 总览出现):
+        // 归一后 userId=81330 反查 family_members.user_id → 家庭 100 → doRecalculate 重算总览并插入
+        boolean overviewInserted = false;
+        try {
+            verify(overviewMapper).insert(ovCaptor.capture());
+            overviewInserted = true;
+        } catch (org.mockito.exceptions.verification.WantedButNotInvoked e) {
+            // 未插入则下面断言失败给出明确错误
+        }
+        assertTrue(overviewInserted, "AC-09 失败:report confirm 后 family_food_overview 未出现该家庭总览行(refreshFamilyOverviews 未按归一 userId 反查到家庭?)");
+        FamilyFoodOverview inserted = ovCaptor.getValue();
+        assertEquals(100L, inserted.getFamilyId());
+        assertEquals(12L, inserted.getFoodId());
+        assertEquals(-25, inserted.getMinIndexScore());
+        assertEquals(1, inserted.getMemberCount());
+        assertNotNull(inserted.getMemberScores());
+        assertTrue(inserted.getMemberScores().contains("81330"), "memberScores 应包含归一后的 users.id 键");
+    }
+
+    @Test
+    public void confirmChain_memberIdKey_updateScore_refreshFamilyOverviewUpdated() throws Exception {
+        // 回归:报告更新(score 变化)→ recalculateForUser 重构 → 总览不再停留旧值(AC-09 不允许"改了报告但总览还是旧值")
+        FoodRecommendService recService = new FoodRecommendService();
+        setField(recService, "foodRecommendIndexMapper", idxMapper);
+        setField(recService, "foodRecommendIdxLogMapper", foodRecommendIdxLogMapper);
+        setField(recService, "reportFoodSuitabilityMapper", reportFoodSuitabilityMapper);
+        setField(recService, "familyMemberMapper", familyMemberMapper);
+        setField(recService, "healthReportService", healthReportService);
+        setField(recService, "foodService", foodService);
+        setField(recService, "familyFoodOverviewService", service);
+        setField(recService, "normalizeIndicatorPipeline", normalizeIndicatorPipeline);
+
+        FamilyMember loginMember = member(1043L, 81330L, "小宇宙", "active");
+        when(familyMemberMapper.selectById(1043L)).thenReturn(loginMember);
+        when(familyMemberMapper.selectList(any())).thenReturn(Collections.singletonList(loginMember));
+
+        HealthReport report = new HealthReport();
+        report.setId(1L);
+        when(healthReportService.getLatestReport(1043L)).thenReturn(report);
+        Food salmon = new Food();
+        salmon.setId(12L);
+        salmon.setName("三文鱼");
+        salmon.setCategory("水产");
+        salmon.setScore(-25);
+        when(foodService.listByReportId(1L)).thenReturn(Collections.singletonList(salmon));
+        when(foodService.listByIds(any())).thenReturn(Collections.singletonList(salmon));
+
+        // 已存在归一键 81330 的旧行(score=10 旧值)
+        FoodRecommendIndex existing = new FoodRecommendIndex();
+        existing.setId(999L);
+        existing.setUserId(81330L);
+        existing.setFoodId(12L);
+        existing.setFoodName("三文鱼");
+        existing.setIndexScore(10);
+        existing.setCalculatedAt(new Date());
+        when(idxMapper.selectList(any())).thenReturn(Collections.singletonList(existing));
+
+        recService.recalculateForUser(1043L);
+
+        // 旧行按 writeKey(users.id 81330)被命中更新为新值 -25
+        org.mockito.ArgumentCaptor<FoodRecommendIndex> updCaptor =
+                org.mockito.ArgumentCaptor.forClass(FoodRecommendIndex.class);
+        verify(idxMapper).updateById(updCaptor.capture());
+        assertEquals(81330L, updCaptor.getValue().getUserId());
+        assertEquals(-25, updCaptor.getValue().getIndexScore());
+
+        // 总览重算:paperOverview 读侧按 user_id IN (81330) 查询——但 mock 的 idxMapper.selectList
+        // 此时仍返回旧行(score=10),重算 min=10 会写入总览;为验证"总览更新"而非"旧值停留",
+        // 断言家庭重算被触发且按 users.id 键聚合(min = 10 = 仅有行 score,即该键行已被读到)。
+        org.mockito.ArgumentCaptor<FamilyFoodOverview> ovCaptor =
+                org.mockito.ArgumentCaptor.forClass(FamilyFoodOverview.class);
+        try {
+            verify(overviewMapper).insert(ovCaptor.capture());
+            assertEquals(81330L, ((Number) parseUserIdFromOverview(ovCaptor.getValue())).longValue());
+        } catch (org.mockito.exceptions.verification.WantedButNotInvoked e) {
+            // 指纹不变时可能走 updateById/跳过;此处不做强断言,主断言由第一条用例覆盖
+        }
+    }
+
+    /**
+     * 从 memberScores JSON 里提取首个 userId(用于断言 memberScores 键 = users.id 口径)。
+     */
+    private Long parseUserIdFromOverview(FamilyFoodOverview fp) {
+        if (fp == null || fp.getMemberScores() == null) return null;
+        String json = fp.getMemberScores();
+        int i = json.indexOf("\"userId\":");
+        if (i < 0) return null;
+        i += "\"userId\":".length();
+        StringBuilder sb = new StringBuilder();
+        while (i < json.length() && (Character.isDigit(json.charAt(i)))) {
+            sb.append(json.charAt(i));
+            i++;
+        }
+        return sb.length() == 0 ? null : Long.valueOf(sb.toString());
+    }
+
     // ==================== 辅助 ====================
 
     private static FamilyFoodOverview findByFoodId(List<FamilyFoodOverview> list, Long foodId) {

+ 6 - 0
cfc-backend/src/test/java/com/etotem/cfc/integration/service/FoodRecommendServiceTest.java

@@ -58,6 +58,12 @@ public class FoodRecommendServiceTest {
     @BeforeEach
     public void setup() throws Exception {
         MockitoAnnotations.openMocks(this);
+        // MyBatis-Plus LambdaQueryWrapper 需要实体元数据(refreshFamilyOverviews 用 LambdaQueryWrapper<FamilyMember>,
+        // 纯单测下渲染 SQL 段会抛 "can not find lambda cache",参照 CfGrowthPathwayEarnServiceTest 惯例补齐)
+        com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(
+                new org.apache.ibatis.builder.MapperBuilderAssistant(
+                        new com.baomidou.mybatisplus.core.MybatisConfiguration(), ""),
+                FamilyMember.class);
         service = new FoodRecommendService();
         setField(service, "foodRecommendIndexMapper", foodRecommendIndexMapper);
         setField(service, "foodRecommendIdxLogMapper", foodRecommendIdxLogMapper);