scriptoriumadmin/skillhub
1
0
Fork 0
mirror of https://github.com/iflytek/skillhub.git synced 2026-08-27 11:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(compat): prioritize PUBLIC/GLOBAL skills in legacy slug lookup

Browse source 
When multiple skills share the same slug across namespaces,
findByLegacySlug now prefers PUBLIC visibility and GLOBAL
namespace over NAMESPACE_ONLY/PRIVATE ones, so plain slug
lookups resolve to the most accessible skill. Namespaces are
batch-fetched via findByIdIn to avoid N+1 database queries.

Signed-off-by: wurongjie <wurongjie@uniontech.com>
This commit is contained in:
wurongjie 2026-08-25 10:14:29 +08:00
parent 954dfce7a4
commit 32d5de7c44
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
server/skillhub-app/src/main/java/com/iflytek/skillhub/compat/CompatSkillLookupService.java
View file

@ -3,15 +3,21 @@ package com.iflytek.skillhub.compat;
import com.iflytek.skillhub.domain.namespace.Namespace;
import com.iflytek.skillhub.domain.namespace.NamespaceRole;
import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
import com.iflytek.skillhub.domain.namespace.NamespaceType;
import com.iflytek.skillhub.domain.shared.exception.DomainNotFoundException;
import com.iflytek.skillhub.domain.skill.Skill;
import com.iflytek.skillhub.domain.skill.SkillRepository;
import com.iflytek.skillhub.domain.skill.SkillVersion;
import com.iflytek.skillhub.domain.skill.SkillVersionRepository;
import com.iflytek.skillhub.domain.skill.SkillVisibility;
import com.iflytek.skillhub.domain.skill.VisibilityChecker;
import com.iflytek.skillhub.domain.skill.service.SkillSlugResolutionService;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
/**
@ -40,10 +46,33 @@ public class CompatSkillLookupService {
}
public CompatSkillContext findByLegacySlug(String slug) {
Skill skill = skillRepository.findBySlug(slug).stream().findFirst()
.orElseThrow(() -> new DomainNotFoundException("error.skill.notFound", slug));
Namespace namespace = namespaceRepository.findById(skill.getNamespaceId())
.orElseThrow(() -> new DomainNotFoundException("error.namespace.notFound", skill.getNamespaceId()));
List<Skill> skills = skillRepository.findBySlug(slug);
if (skills.isEmpty()) {
throw new DomainNotFoundException("error.skill.notFound", slug);
}
// Batch-fetch all candidate namespaces in a single query to avoid N+1 lookups.
List<Long> namespaceIds = skills.stream()
.map(Skill::getNamespaceId)
.distinct()
.toList();
Map<Long, Namespace> namespacesById = namespaceIds.isEmpty()
? Map.of()
: namespaceRepository.findByIdIn(namespaceIds).stream()
.collect(Collectors.toMap(Namespace::getId, Function.identity()));
Skill skill = skills.stream()
.min(Comparator.<Skill>comparingInt(s -> {
Namespace ns = namespacesById.get(s.getNamespaceId());
int score = 0;
if (s.getVisibility() == SkillVisibility.PUBLIC) score += 100;
if (ns != null && ns.getType() == NamespaceType.GLOBAL) score += 50;
if (s.getLatestVersionId() != null) score += 10;
return -score;
}).thenComparing(Skill::getId))
.orElse(skills.get(0));
Namespace namespace = namespacesById.get(skill.getNamespaceId());
if (namespace == null) {
throw new DomainNotFoundException("error.namespace.notFound", skill.getNamespaceId());
}
return new CompatSkillContext(namespace, skill, findLatestVersion(skill));
}