完善域名服务器多对多关联

新增服务器反向读取托管域名接口,补充多对多关联回归测试与管理页面展示,并更新整改进度清单。
This commit is contained in:
xuans committed 2026-09-29 19:53:02 +08:00
1 parent cf2df5ee66
commit 35c9d7760c
13 files changed
+175 -2

No files matched your search

@@ -18,6 +18,7 @@ type ProjectResourceReader interface {
ListVisibleServers(context.Context, string) ([]deployment.Server, error)
GetVisibleServer(context.Context, string, string) (deployment.Server, error)
ListVisibleDomainServers(context.Context, string, string) ([]deployment.Server, error)
ListVisibleServerDomains(context.Context, string, string) ([]domain.Domain, error)
}
var _ ProjectResourceReader = (*SQLProjectMemberRepository)(nil)
@@ -142,6 +143,36 @@ func (r *SQLProjectMemberRepository) ListVisibleDomainServers(ctx context.Contex
WHERE `+domainPredicate+` AND `+serverPredicate+` AND domains.id = ? ORDER BY servers.name, servers.id`, args)
}
func (r *SQLProjectMemberRepository) ListVisibleServerDomains(ctx context.Context, actorID, serverID string) ([]domain.Domain, error) {
if _, err := r.GetVisibleServer(ctx, actorID, serverID); err != nil {
return nil, err
}
domainPredicate, args := resourceReadPredicate("domains.project_id", actorID, domain.PermissionCertificateRead)
serverPredicate, serverArgs := resourceReadPredicate("servers.project_id", actorID, domain.PermissionServerRead)
args = append(args, serverArgs...)
args = append(args, serverID)
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, visibleDomainSelect+`
JOIN domain_servers visible_binding ON visible_binding.domain_id = domains.id
JOIN servers ON servers.id = visible_binding.server_id AND servers.project_id = domains.project_id
WHERE `+domainPredicate+` AND `+serverPredicate+` AND servers.id = ? ORDER BY domains.name, domains.id`), args...)
if err != nil {
return nil, fmt.Errorf("failed to query visible server domains: %w", err)
}
defer rows.Close()
items := make([]domain.Domain, 0)
for rows.Next() {
item, err := scanDomain(rows)
if err != nil {
return nil, err
}
items = append(items, item)
}
if err := rows.Err(); err != nil {
return nil, fmt.Errorf("failed to read visible server domains: %w", err)
}
return items, nil
}
func (r *SQLProjectMemberRepository) readVisibleServers(ctx context.Context, query string, args []any) ([]deployment.Server, error) {
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, query), args...)
if err != nil {