fix: 标签移除后再打同名标签不再撞唯一键
This commit is contained in:
@@ -7,6 +7,7 @@ import com.guo.learningprogresstracker.entity.MarkerEntity;
|
|||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.apache.ibatis.annotations.Select;
|
import org.apache.ibatis.annotations.Select;
|
||||||
|
import org.apache.ibatis.annotations.Update;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -31,6 +32,34 @@ public interface MarkerMapper extends BaseMapper<MarkerEntity> {
|
|||||||
""")
|
""")
|
||||||
List<MarkerUsage> selectUserTagUsage(@Param("createdBy") String createdBy);
|
List<MarkerUsage> selectUserTagUsage(@Param("createdBy") String createdBy);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按对象 + 标签名取用户标签,<b>含已逻辑删除的行</b>。
|
||||||
|
*
|
||||||
|
* <p>唯一键 {@code uk_markers_object_marker} 不含 {@code deleted},被逻辑删除的行仍然占着这个键,
|
||||||
|
* 所以「移除某标签后再给同一对象打同名标签」不能直接 insert,必须复用(复活)旧行。
|
||||||
|
* 自定义 SQL 不会被 {@code @TableLogic} 追加 {@code deleted = 0};
|
||||||
|
* 租户条件 {@code created_by} 仍由 {@code TenantLineInnerInterceptor} 自动追加。</p>
|
||||||
|
*/
|
||||||
|
@Select("""
|
||||||
|
SELECT * FROM markers
|
||||||
|
WHERE object_type = #{objectType}
|
||||||
|
AND object_num = #{objectNum}
|
||||||
|
AND kind = #{kind}
|
||||||
|
AND marker_name = #{markerName}
|
||||||
|
LIMIT 1
|
||||||
|
""")
|
||||||
|
MarkerEntity selectAnyByObjectAndName(@Param("objectType") String objectType,
|
||||||
|
@Param("objectNum") String objectNum,
|
||||||
|
@Param("kind") String kind,
|
||||||
|
@Param("markerName") String markerName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 复用(复活)一条已逻辑删除的标记:把 {@code deleted} 归零。
|
||||||
|
* <p>避免重新插入时与被逻辑删除的同名行撞唯一键。租户条件由拦截器自动追加。</p>
|
||||||
|
*/
|
||||||
|
@Update("UPDATE markers SET deleted = 0, last_modified_time = now() WHERE id = #{id}")
|
||||||
|
int revive(@Param("id") Integer id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 按标签集合统计每个碎片命中的标签数(闭环-04 标签导图取材)。
|
* 按标签集合统计每个碎片命中的标签数(闭环-04 标签导图取材)。
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import java.util.LinkedHashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -83,17 +83,21 @@ public class MarkerServiceImpl implements MarkerService {
|
|||||||
String name = normalizeTagName(markerName);
|
String name = normalizeTagName(markerName);
|
||||||
String num = normalizeObjectNum(objectNum, objectType);
|
String num = normalizeObjectNum(objectNum, objectType);
|
||||||
|
|
||||||
// 幂等:同一对象上同名同类同值的标记只保留一条
|
// 幂等:同一对象上同名同类同值的标记只保留一条。
|
||||||
Optional<MarkerEntity> existing = markerMapper.selectList(Wrappers.<MarkerEntity>lambdaQuery()
|
// 查的时候要带上已逻辑删除的行:唯一键不含 deleted,被删掉的行仍占着这个键,
|
||||||
.eq(MarkerEntity::getObjectType, objectType.name())
|
// 直接 insert 会撞唯一键(移除标签后再打同名标签、或删掉自动任务名标签后重新归类都会走到)。
|
||||||
.eq(MarkerEntity::getObjectNum, num)
|
MarkerEntity existing = markerMapper.selectAnyByObjectAndName(
|
||||||
.eq(MarkerEntity::getKind, MarkerKindEnum.USER.name())
|
objectType.name(), num, MarkerKindEnum.USER.name(), name);
|
||||||
.eq(MarkerEntity::getMarkerName, name)
|
if (existing != null) {
|
||||||
.last("LIMIT 1"))
|
if (existing.getDeleted() == null || existing.getDeleted() == 0) {
|
||||||
.stream().findFirst();
|
ensureDictionaryEntry(name);
|
||||||
if (existing.isPresent()) {
|
return existing;
|
||||||
|
}
|
||||||
|
markerMapper.revive(existing.getId());
|
||||||
ensureDictionaryEntry(name);
|
ensureDictionaryEntry(name);
|
||||||
return existing.get();
|
// 碎片多了一个标签 → 相关标签导图置「待更新」(闭环-04,不自动重建)
|
||||||
|
markTagMindMapsStale(objectType, List.of(name));
|
||||||
|
return markerMapper.selectById(existing.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
MarkerEntity marker = new MarkerEntity();
|
MarkerEntity marker = new MarkerEntity();
|
||||||
|
|||||||
+45
@@ -177,6 +177,51 @@ class MarkerServiceIntegrationTest {
|
|||||||
assertTrue(markerService.listByObject(MarkerObjectTypeEnum.TASK, taskNum).isEmpty());
|
assertTrue(markerService.listByObject(MarkerObjectTypeEnum.TASK, taskNum).isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据-05:唯一键不含 deleted,被逻辑删除的行仍占着这个键。
|
||||||
|
* 移除标签后再给同一对象打同名标签必须复用旧行,不能直接 insert。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void reAddingSameTagAfterRemoval_revivesInsteadOfDuplicating() throws Exception {
|
||||||
|
String taskNum = saveTask();
|
||||||
|
String id = String.valueOf(saveFragment(taskNum).getId());
|
||||||
|
String tagName = tag("反复");
|
||||||
|
|
||||||
|
MarkerEntity created = markerService.addUserTag(MarkerObjectTypeEnum.FRAGMENT, id, tagName);
|
||||||
|
markerService.deleteMarker(created.getId());
|
||||||
|
assertTrue(markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, id).isEmpty());
|
||||||
|
|
||||||
|
MarkerEntity revived = markerService.addUserTag(MarkerObjectTypeEnum.FRAGMENT, id, tagName);
|
||||||
|
|
||||||
|
assertEquals(created.getId(), revived.getId(), "应复用被逻辑删除的同一行");
|
||||||
|
List<MarkerEntity> markers = markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, id);
|
||||||
|
assertEquals(1, markers.size());
|
||||||
|
assertEquals(tagName, markers.get(0).getMarkerName());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 闭环-02 的自动任务名标签走同一条路径:用户删掉自动标签后重新归类,不能因为
|
||||||
|
* 被删的那一行还占着唯一键而让归类失败。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void ownerTaskNameTag_canBeReAddedAfterRemoval() throws Exception {
|
||||||
|
String taskNum = saveTask();
|
||||||
|
String id = String.valueOf(saveFragment(taskNum).getId());
|
||||||
|
|
||||||
|
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT, id, taskNum);
|
||||||
|
List<MarkerEntity> afterFirst = markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, id);
|
||||||
|
assertEquals(1, afterFirst.size());
|
||||||
|
|
||||||
|
markerService.deleteMarker(afterFirst.get(0).getId());
|
||||||
|
assertTrue(markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, id).isEmpty());
|
||||||
|
|
||||||
|
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT, id, taskNum);
|
||||||
|
|
||||||
|
List<MarkerEntity> afterSecond = markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, id);
|
||||||
|
assertEquals(1, afterSecond.size());
|
||||||
|
assertEquals(afterFirst.get(0).getMarkerName(), afterSecond.get(0).getMarkerName());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void systemMarker_isVisibleButNotEditable() throws Exception {
|
void systemMarker_isVisibleButNotEditable() throws Exception {
|
||||||
String taskNum = saveTask();
|
String taskNum = saveTask();
|
||||||
|
|||||||
Reference in New Issue
Block a user