Skip to content

chore: change custom domain query to singular #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: change custom domain query to singular #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5285acb
chore: change custom domain query to singular
qstearns Oct 15, 2025
618c69f
docs(changeset):
qstearns Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/deep-tigers-think.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion server/internal/customdomains/impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *Service) GetDomain(ctx context.Context, payload *gen.GetDomainPayload)
return nil, oops.C(oops.CodeUnauthorized)
}

domain, err := s.repo.GetCustomDomainsByOrganization(ctx, authCtx.ActiveOrganizationID)
domain, err := s.repo.GetCustomDomainByOrganization(ctx, authCtx.ActiveOrganizationID)
if err != nil {
return nil, oops.E(oops.CodeNotFound, err, "no custom domain found for organization").Log(ctx, s.logger)
}
Expand Down
2 changes: 1 addition & 1 deletion server/internal/customdomains/queries.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ INSERT INTO custom_domains (
)
RETURNING *;

-- name: GetCustomDomainsByOrganization :one
-- name: GetCustomDomainByOrganization :one
SELECT *
FROM custom_domains
WHERE organization_id = @organization_id
Expand Down
6 changes: 3 additions & 3 deletions server/internal/customdomains/repo/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/internal/mcpmetadata/impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ func (s *Service) resolveDomainIDFromContext(ctx context.Context) *uuid.UUID {
return nil
}

domainRecord, err := s.domainsRepo.GetCustomDomainsByOrganization(ctx, authCtx.ActiveOrganizationID)
domainRecord, err := s.domainsRepo.GetCustomDomainByOrganization(ctx, authCtx.ActiveOrganizationID)
if err != nil {
s.logger.ErrorContext(ctx, "failed to get custom domains by organization ID", attr.SlogError(err))
return nil
Expand Down
2 changes: 1 addition & 1 deletion server/internal/toolsets/impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func (s *Service) UpdateToolset(ctx context.Context, payload *gen.UpdateToolsetP

var activeCustomDomainID *uuid.UUID
toolsetDomainID := conv.FromNullableUUID(existingToolset.CustomDomainID)
if domain, err := s.domainsRepo.GetCustomDomainsByOrganization(ctx, authCtx.ActiveOrganizationID); err == nil && domain.Activated && domain.Verified {
if domain, err := s.domainsRepo.GetCustomDomainByOrganization(ctx, authCtx.ActiveOrganizationID); err == nil && domain.Activated && domain.Verified {
activeCustomDomainID = &domain.ID
}

Expand Down
Loading