From 72b696ccb26f29986fb7599136b771b239311909 Mon Sep 17 00:00:00 2001 From: Silvan Date: Tue, 14 Jun 2022 15:45:19 +0200 Subject: [PATCH] fix(system): search for existing domain globally (#3822) --- internal/api/grpc/system/instance.go | 2 +- internal/query/instance_domain.go | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/internal/api/grpc/system/instance.go b/internal/api/grpc/system/instance.go index b324e683fb..135d41c6c0 100644 --- a/internal/api/grpc/system/instance.go +++ b/internal/api/grpc/system/instance.go @@ -67,7 +67,7 @@ func (s *Server) ExistsDomain(ctx context.Context, req *system_pb.ExistsDomainRe domainQuery, }, } - domains, err := s.query.SearchInstanceDomains(ctx, query) + domains, err := s.query.SearchInstanceDomainsGlobal(ctx, query) if err != nil { return nil, err } diff --git a/internal/query/instance_domain.go b/internal/query/instance_domain.go index fcb4c94283..dfb7a582b1 100644 --- a/internal/query/instance_domain.go +++ b/internal/query/instance_domain.go @@ -66,9 +66,23 @@ func (q *Queries) SearchInstanceDomains(ctx context.Context, queries *InstanceDo return nil, errors.ThrowInvalidArgument(err, "QUERY-inlsF", "Errors.Query.SQLStatement") } + return q.queryInstanceDomains(ctx, stmt, scan, args...) +} + +func (q *Queries) SearchInstanceDomainsGlobal(ctx context.Context, queries *InstanceDomainSearchQueries) (domains *InstanceDomains, err error) { + query, scan := prepareInstanceDomainsQuery() + stmt, args, err := queries.toQuery(query).ToSql() + if err != nil { + return nil, errors.ThrowInvalidArgument(err, "QUERY-IHhLR", "Errors.Query.SQLStatement") + } + + return q.queryInstanceDomains(ctx, stmt, scan, args...) +} + +func (q *Queries) queryInstanceDomains(ctx context.Context, stmt string, scan func(*sql.Rows) (*InstanceDomains, error), args ...interface{}) (domains *InstanceDomains, err error) { rows, err := q.client.QueryContext(ctx, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-38Fni", "Errors.Internal") + return nil, errors.ThrowInternal(err, "QUERY-Dh9Ap", "Errors.Internal") } domains, err = scan(rows) if err != nil {