|
|
@@ -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) {
|