feat: 残片归属时自动打任务名标签
This commit is contained in:
@@ -72,6 +72,15 @@ public interface MarkerService {
|
||||
*/
|
||||
void addSystemMarker(MarkerObjectTypeEnum objectType, String objectNum, SystemMarkerEnum marker);
|
||||
|
||||
/**
|
||||
* 残片获得内容归属时自动打「任务名标签」(闭环-02)。
|
||||
*
|
||||
* <p>标签名取任务当时的名字,走用户标签;幂等,任务编号为空或任务不存在时不打标。
|
||||
* 任务改名不追溯、删任务时标签保留——因为标签只是带任务名字符串的普通用户标签,
|
||||
* 系统不会主动改写或级联删除它。</p>
|
||||
*/
|
||||
void addOwnerTaskNameTag(MarkerObjectTypeEnum objectType, String objectNum, String taskNum);
|
||||
|
||||
/**
|
||||
* 对象被删除时清理其标记(例如碎片被删除)。
|
||||
*/
|
||||
|
||||
@@ -149,6 +149,10 @@ public class GuidanceServiceImpl implements GuidanceService {
|
||||
markerService.addSystemMarker(MarkerObjectTypeEnum.FRAGMENT,
|
||||
String.valueOf(fragment.getId()), SystemMarkerEnum.FROM_GUIDANCE);
|
||||
|
||||
// 引导产出的碎片默认也有内容归属 → 一并自动打任务名标签(闭环-02)
|
||||
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT,
|
||||
String.valueOf(fragment.getId()), fragment.getOwnerTaskNum());
|
||||
|
||||
finishConversation(conversation, timing);
|
||||
log.info("学习引导[{}]产出碎片[{}],默认归属任务[{}]",
|
||||
guidanceNum, fragment.getId(), conversation.getTaskNum());
|
||||
|
||||
@@ -199,6 +199,27 @@ public class MarkerServiceImpl implements MarkerService {
|
||||
markerMapper.insert(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addOwnerTaskNameTag(MarkerObjectTypeEnum objectType, String objectNum, String taskNum) {
|
||||
if (objectType == null || !StringUtils.hasText(objectNum) || !StringUtils.hasText(taskNum)) {
|
||||
return;
|
||||
}
|
||||
TaskEntity task = tasksMapper.selectOne(Wrappers.<TaskEntity>lambdaQuery()
|
||||
.eq(TaskEntity::getTaskNum, taskNum.trim())
|
||||
.last("LIMIT 1"));
|
||||
if (task == null || !StringUtils.hasText(task.getTaskName())) {
|
||||
// 任务已被删除或没有名字时不打标;归属本身不受影响
|
||||
return;
|
||||
}
|
||||
try {
|
||||
// 走用户标签:可改名、可删除,任务之后改名也不回溯改写这条历史标签
|
||||
addUserTag(objectType, objectNum, task.getTaskName());
|
||||
} catch (ErrorParameterException | NotFindEntitiesException e) {
|
||||
// 任务名超过标签长度上限等情况下只跳过打标,不让归属操作失败
|
||||
log.warn("对象[{}/{}]自动打任务名标签失败:{}", objectType, objectNum, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeAllMarkers(MarkerObjectTypeEnum objectType, String objectNum) {
|
||||
if (objectType == null || !StringUtils.hasText(objectNum)) {
|
||||
|
||||
+19
-4
@@ -9,11 +9,13 @@ import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
|
||||
import com.guo.learningprogresstracker.entity.TaskEntity;
|
||||
import com.guo.learningprogresstracker.enums.FragmentContextTypeEnum;
|
||||
import com.guo.learningprogresstracker.enums.MarkerObjectTypeEnum;
|
||||
import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
|
||||
import com.guo.learningprogresstracker.mapStruct.FragmentsConvert;
|
||||
import com.guo.learningprogresstracker.mapper.ReviewStandardMindMapMapper;
|
||||
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.TasksMapper;
|
||||
import com.guo.learningprogresstracker.service.MarkerService;
|
||||
import com.guo.learningprogresstracker.service.StudyReportFragmentsService;
|
||||
import com.guo.learningprogresstracker.mapper.StudyReportFragmentsMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -42,7 +44,7 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
private final StudySessionsMapper studySessionsMapper;
|
||||
private final TasksMapper tasksMapper;
|
||||
private final ReviewStandardMindMapMapper reviewStandardMindMapMapper;
|
||||
private final com.guo.learningprogresstracker.service.MarkerService markerService;
|
||||
private final MarkerService markerService;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
@@ -63,6 +65,10 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
entity.setOwnerTaskNum(session.getTaskNum());
|
||||
|
||||
this.save(entity);
|
||||
|
||||
// 碎片一诞生就有内容归属 → 自动打任务名标签(闭环-02)
|
||||
markerService.addOwnerTaskNameTag(
|
||||
MarkerObjectTypeEnum.FRAGMENT, String.valueOf(entity.getId()), entity.getOwnerTaskNum());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -76,10 +82,16 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
StudyReportFragmentsEntity patch = new StudyReportFragmentsEntity();
|
||||
patch.setId(id);
|
||||
patch.setContent(request.getContent());
|
||||
String resolvedOwner = null;
|
||||
if (request.getOwnerTaskNum() != null) {
|
||||
patch.setOwnerTaskNum(resolveOwnerTaskNum(request.getOwnerTaskNum()));
|
||||
resolvedOwner = resolveOwnerTaskNum(request.getOwnerTaskNum());
|
||||
patch.setOwnerTaskNum(resolvedOwner);
|
||||
}
|
||||
this.updateById(patch);
|
||||
// 本次把碎片归入某个任务(含「升格为新任务」的归类)→ 补打任务名标签(闭环-02)
|
||||
if (resolvedOwner != null) {
|
||||
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id), resolvedOwner);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -103,6 +115,10 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
// 归属改变后,原任务与新任务的导图都需要重建(由用户手动触发)
|
||||
markMindMapStale(previous);
|
||||
markMindMapStale(resolved);
|
||||
// 碎片获得内容归属 → 补打任务名标签(闭环-02);原标签保留不追溯
|
||||
if (resolved != null) {
|
||||
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id), resolved);
|
||||
}
|
||||
log.info("碎片[{}]内容归属由[{}]变更为[{}]", id, previous, resolved);
|
||||
}
|
||||
|
||||
@@ -116,8 +132,7 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
// 软删除;所属任务的导图需要重建
|
||||
this.removeById(id);
|
||||
// 对象没了,它身上的标记也不再有意义(标记-01)
|
||||
markerService.removeAllMarkers(
|
||||
com.guo.learningprogresstracker.enums.MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id));
|
||||
markerService.removeAllMarkers(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id));
|
||||
markMindMapStale(existing.getOwnerTaskNum());
|
||||
log.info("碎片[{}]已删除", id);
|
||||
}
|
||||
|
||||
+197
@@ -0,0 +1,197 @@
|
||||
package com.guo.learningprogresstracker.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.guo.learningprogresstracker.dto.request.CreateFragmentsRequest;
|
||||
import com.guo.learningprogresstracker.dto.request.UpdateFragmentsRequest;
|
||||
import com.guo.learningprogresstracker.entity.MarkerEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
|
||||
import com.guo.learningprogresstracker.entity.TaskEntity;
|
||||
import com.guo.learningprogresstracker.enums.MarkerKindEnum;
|
||||
import com.guo.learningprogresstracker.enums.MarkerObjectTypeEnum;
|
||||
import com.guo.learningprogresstracker.mapper.StudyReportFragmentsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.TasksMapper;
|
||||
import com.guo.learningprogresstracker.service.MarkerService;
|
||||
import com.guo.learningprogresstracker.service.StudyReportFragmentsService;
|
||||
import com.guo.learningprogresstracker.service.TasksService;
|
||||
import com.guo.learningprogresstracker.utils.GenerateNumTool;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
* 残片获得内容归属时自动打「任务名标签」的落库集成测试(闭环-02)。
|
||||
*
|
||||
* <p>覆盖口径:创建即有归属、归类(含「升格为新任务」的 PUT 路径)时补打、同名不重复、
|
||||
* 任务改名不追溯、删任务时标签保留。</p>
|
||||
*/
|
||||
@SpringBootTest
|
||||
class FragmentOwnerTaskTagIntegrationTest {
|
||||
|
||||
private static final String USER = "任务名标签集成测试用户";
|
||||
|
||||
private static final AtomicInteger SEQ = new AtomicInteger();
|
||||
|
||||
@Autowired
|
||||
private MarkerService markerService;
|
||||
|
||||
@Autowired
|
||||
private StudyReportFragmentsService fragmentsService;
|
||||
|
||||
@Autowired
|
||||
private StudyReportFragmentsMapper fragmentsMapper;
|
||||
|
||||
@Autowired
|
||||
private StudySessionsMapper studySessionsMapper;
|
||||
|
||||
@Autowired
|
||||
private TasksMapper tasksMapper;
|
||||
|
||||
@Autowired
|
||||
private TasksService tasksService;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
StpUtil.login(USER, "test_device");
|
||||
}
|
||||
|
||||
private String saveTask(String taskName) {
|
||||
String taskNum = "TASKAT-IT-" + System.nanoTime() + "-" + SEQ.incrementAndGet();
|
||||
TaskEntity task = new TaskEntity();
|
||||
task.setTaskNum(taskNum);
|
||||
task.setTaskName(taskName);
|
||||
tasksMapper.insert(task);
|
||||
return taskNum;
|
||||
}
|
||||
|
||||
/** study_sessions.task_num 非空,所以会话必须挂一个任务;碎片归属仍可另设 */
|
||||
private String saveSession(String taskNum) {
|
||||
StudySessionsEntity session = new StudySessionsEntity();
|
||||
session.setSessionNum(GenerateNumTool.generateNum("SESSAT"));
|
||||
session.setTaskNum(taskNum);
|
||||
session.setStartTime(LocalDateTime.now());
|
||||
session.setLastStartTime(LocalDateTime.now());
|
||||
session.setSessionState("ENDED");
|
||||
studySessionsMapper.insert(session);
|
||||
return session.getSessionNum();
|
||||
}
|
||||
|
||||
private StudyReportFragmentsEntity createFragment(String sessionNum, String content) throws Exception {
|
||||
CreateFragmentsRequest request = new CreateFragmentsRequest();
|
||||
request.setContextNum(sessionNum);
|
||||
request.setContent(content);
|
||||
fragmentsService.createFragments(request);
|
||||
return fragmentsMapper.selectOne(Wrappers.<StudyReportFragmentsEntity>lambdaQuery()
|
||||
.eq(StudyReportFragmentsEntity::getContextNum, sessionNum)
|
||||
.orderByDesc(StudyReportFragmentsEntity::getId)
|
||||
.last("LIMIT 1"));
|
||||
}
|
||||
|
||||
/** 直接落一条待归类碎片,绕开创建路径的默认归属 */
|
||||
private StudyReportFragmentsEntity insertPendingFragment(String sessionNum) {
|
||||
StudyReportFragmentsEntity fragment = new StudyReportFragmentsEntity();
|
||||
fragment.setContextType("SESSION");
|
||||
fragment.setContextNum(sessionNum);
|
||||
fragment.setOwnerTaskNum(null);
|
||||
fragment.setContent("待归类碎片");
|
||||
fragmentsMapper.insert(fragment);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
private List<String> userTagNames(Integer fragmentId) {
|
||||
return markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(fragmentId)).stream()
|
||||
.filter(m -> MarkerKindEnum.USER.name().equals(m.getKind()))
|
||||
.map(MarkerEntity::getMarkerName)
|
||||
.sorted()
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Test
|
||||
void createWithOwnership_addsTaskNameTag() throws Exception {
|
||||
String taskNum = saveTask("自动打标-创建");
|
||||
String sessionNum = saveSession(taskNum);
|
||||
|
||||
StudyReportFragmentsEntity fragment = createFragment(sessionNum, "创建即有归属");
|
||||
|
||||
assertEquals(taskNum, fragment.getOwnerTaskNum());
|
||||
assertEquals(List.of("自动打标-创建"), userTagNames(fragment.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assignOwnership_addsTagAndDoesNotDuplicate() throws Exception {
|
||||
String taskA = saveTask("自动打标-任务A");
|
||||
String taskB = saveTask("自动打标-任务B");
|
||||
String sessionNum = saveSession(taskA);
|
||||
StudyReportFragmentsEntity fragment = createFragment(sessionNum, "归类");
|
||||
|
||||
fragmentsService.assignOwnership(fragment.getId(), taskB);
|
||||
|
||||
List<String> tags = userTagNames(fragment.getId());
|
||||
assertTrue(tags.contains("自动打标-任务A"), "原任务标签保留、不追溯改写");
|
||||
assertTrue(tags.contains("自动打标-任务B"), "新归属补打任务名标签");
|
||||
|
||||
// 再次归到同一任务:幂等,同名标签不重复
|
||||
fragmentsService.assignOwnership(fragment.getId(), taskB);
|
||||
List<String> again = userTagNames(fragment.getId());
|
||||
assertEquals(2, again.size(), "同名用户标签不重复插入");
|
||||
assertEquals(tags, again);
|
||||
}
|
||||
|
||||
@Test
|
||||
void updateFragmentsSettingOwnership_addsTag() throws Exception {
|
||||
// 「升格为新任务」的归类走 PUT /report-fragments/{id}
|
||||
String anchorTask = saveTask("自动打标-锚点任务");
|
||||
String sessionNum = saveSession(anchorTask);
|
||||
StudyReportFragmentsEntity fragment = insertPendingFragment(sessionNum);
|
||||
assertTrue(userTagNames(fragment.getId()).isEmpty(), "碎片无归属时不打标");
|
||||
|
||||
String newTask = saveTask("自动打标-升格任务");
|
||||
UpdateFragmentsRequest request = new UpdateFragmentsRequest();
|
||||
request.setOwnerTaskNum(newTask);
|
||||
fragmentsService.updateFragments(fragment.getId(), request);
|
||||
|
||||
assertEquals(List.of("自动打标-升格任务"), userTagNames(fragment.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void taskRename_doesNotChangeHistoricalTag() throws Exception {
|
||||
String taskNum = saveTask("自动打标-改名前");
|
||||
String sessionNum = saveSession(taskNum);
|
||||
StudyReportFragmentsEntity fragment = createFragment(sessionNum, "改名测试");
|
||||
assertEquals(List.of("自动打标-改名前"), userTagNames(fragment.getId()));
|
||||
|
||||
TaskEntity task = tasksMapper.selectOne(
|
||||
Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getTaskNum, taskNum));
|
||||
task.setTaskName("自动打标-改名后");
|
||||
tasksMapper.updateById(task);
|
||||
|
||||
assertEquals(List.of("自动打标-改名前"), userTagNames(fragment.getId()),
|
||||
"任务改名不回溯改写历史碎片上的标签");
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteTask_keepsTaskNameTag() throws Exception {
|
||||
String taskNum = saveTask("自动打标-将被删除");
|
||||
String sessionNum = saveSession(taskNum);
|
||||
StudyReportFragmentsEntity fragment = createFragment(sessionNum, "删任务后保留标签");
|
||||
assertEquals(List.of("自动打标-将被删除"), userTagNames(fragment.getId()));
|
||||
|
||||
TaskEntity task = tasksMapper.selectOne(
|
||||
Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getTaskNum, taskNum));
|
||||
tasksService.deleteTask(String.valueOf(task.getId()));
|
||||
|
||||
StudyReportFragmentsEntity after = fragmentsMapper.selectById(fragment.getId());
|
||||
assertNull(after.getOwnerTaskNum(), "碎片进入待归类");
|
||||
assertEquals(List.of("自动打标-将被删除"), userTagNames(fragment.getId()),
|
||||
"删任务不级联删除标签");
|
||||
}
|
||||
}
|
||||
+8
-2
@@ -112,11 +112,17 @@ class GuidanceIntegrationTest {
|
||||
// 带「来自学习引导」系统标记,且对用户可见、不可删
|
||||
var markers = markerService.listByObject(
|
||||
MarkerObjectTypeEnum.FRAGMENT, String.valueOf(fragment.getId()));
|
||||
assertEquals(1, markers.size());
|
||||
MarkerEntity marker = markers.get(0);
|
||||
MarkerEntity marker = markers.stream()
|
||||
.filter(MarkerEntity::isSystemMarker)
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new AssertionError("应有「来自学习引导」系统标记"));
|
||||
assertEquals(MarkerKindEnum.SYSTEM.name(), marker.getKind());
|
||||
assertEquals("来源", marker.getMarkerName());
|
||||
assertEquals("学习引导", marker.getMarkerValue());
|
||||
// 闭环-02:默认内容归属同时带来一条任务名用户标签
|
||||
assertTrue(markers.stream().anyMatch(m -> MarkerKindEnum.USER.name().equals(m.getKind())
|
||||
&& "学习引导测试任务".equals(m.getMarkerName())),
|
||||
"引导产出的碎片也应自动带任务名标签");
|
||||
|
||||
// 会话被标记为结束
|
||||
assertTrue(Boolean.TRUE.equals(
|
||||
|
||||
+4
@@ -7,6 +7,7 @@ import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
|
||||
import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
|
||||
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
|
||||
import com.guo.learningprogresstracker.service.MarkerService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
@@ -35,6 +36,9 @@ class StudyReportFragmentsServiceImplTest {
|
||||
@Mock
|
||||
private StudySessionsMapper studySessionsMapper;
|
||||
|
||||
@Mock
|
||||
private MarkerService markerService;
|
||||
|
||||
private CreateFragmentsRequest createRequest(String sessionNum, String content) {
|
||||
CreateFragmentsRequest request = new CreateFragmentsRequest();
|
||||
request.setContextNum(sessionNum);
|
||||
|
||||
Reference in New Issue
Block a user