rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generalize alias data layer to ResourceAlias

Browse Source 
The trust_center_aliases table only allowed aliasing trust center
resources. Rename it to resource_aliases and scope uniqueness by
tenant rather than organization so any resource can carry an alias.
Replace the TrustCenterAlias coredata type with a ResourceAlias type
that loads and upserts aliases by resource ID.

Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
Bryan Frimin
2026-06-22 10:58:30 +02:00
parent 92b1264603
commit 2b8f0618de
3 changed files with 71 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/coredata/migrations/20260622T074517Z.sql Normal file
View File

@@ -0,0 +1,18 @@
-- Copyright (c) 2025-2026 Probo Inc <hello@probo.com>.
--
-- Permission to use, copy, modify, and/or distribute this software for any
-- purpose with or without fee is hereby granted, provided that the above
-- copyright notice and this permission notice appear in all copies.
--
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-- PERFORMANCE OF THIS SOFTWARE.
ALTER TABLE trust_center_aliases RENAME TO resource_aliases;
ALTER TABLE resource_aliases
RENAME CONSTRAINT trust_center_aliases_organization_id_alias_key TO resource_aliases_organization_id_alias_key;

22
pkg/coredata/migrations/20260622T080513Z.sql Normal file
View File

@@ -0,0 +1,22 @@
-- Copyright (c) 2025-2026 Probo Inc <hello@probo.com>.
--
-- Permission to use, copy, modify, and/or distribute this software for any
-- purpose with or without fee is hereby granted, provided that the above
-- copyright notice and this permission notice appear in all copies.
--
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-- PERFORMANCE OF THIS SOFTWARE.
ALTER TABLE resource_aliases
DROP CONSTRAINT resource_aliases_organization_id_alias_key;
ALTER TABLE resource_aliases
ADD CONSTRAINT resource_aliases_tenant_id_alias_key UNIQUE (tenant_id, alias);
ALTER TABLE resource_aliases
DROP COLUMN organization_id;

76
pkg/coredata/trust_center_alias.go → pkg/coredata/resource_alias.go
View File

@@ -28,18 +28,17 @@ import (
) )
type ( type (
TrustCenterAlias struct { ResourceAlias struct {
OrganizationID gid.GID `db:"organization_id"` Alias string `db:"alias"`
Alias string `db:"alias"` ResourceID gid.GID `db:"resource_id"`
ResourceID gid.GID `db:"resource_id"` CreatedAt time.Time `db:"created_at"`
CreatedAt time.Time `db:"created_at"` UpdatedAt time.Time `db:"updated_at"`
UpdatedAt time.Time `db:"updated_at"`
} }
TrustCenterAliases []*TrustCenterAlias ResourceAliases []*ResourceAlias
) )
func (t *TrustCenterAlias) Upsert( func (t *ResourceAlias) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Querier, conn pg.Querier,
scope Scoper, scope Scoper,
@@ -49,9 +48,8 @@ func (t *TrustCenterAlias) Upsert(
now := time.Now() now := time.Now()
q := ` q := `
INSERT INTO trust_center_aliases ( INSERT INTO resource_aliases (
tenant_id, tenant_id,
organization_id,
alias, alias,
resource_id, resource_id,
created_at, created_at,
@@ -59,11 +57,6 @@ INSERT INTO trust_center_aliases (
) )
VALUES ( VALUES (
@tenant_id, @tenant_id,
COALESCE(
(SELECT organization_id FROM documents WHERE id = @resource_id AND tenant_id = @tenant_id),
(SELECT organization_id FROM trust_center_files WHERE id = @resource_id AND tenant_id = @tenant_id),
(SELECT organization_id FROM files WHERE id = @resource_id AND tenant_id = @tenant_id)
),
@alias, @alias,
@resource_id, @resource_id,
@created_at, @created_at,
@@ -74,7 +67,6 @@ SET
alias = EXCLUDED.alias, alias = EXCLUDED.alias,
updated_at = EXCLUDED.updated_at updated_at = EXCLUDED.updated_at
RETURNING RETURNING
organization_id,
alias, alias,
resource_id, resource_id,
created_at, created_at,
@@ -92,17 +84,17 @@ RETURNING
rows, err := conn.Query(ctx, q, args) rows, err := conn.Query(ctx, q, args)
if err != nil { if err != nil {
if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok { if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok {
if pgErr.Code == "23505" && pgErr.ConstraintName == "trust_center_aliases_organization_id_alias_key" { if pgErr.Code == "23505" && pgErr.ConstraintName == "resource_aliases_tenant_id_alias_key" {
return ErrResourceAlreadyExists return ErrResourceAlreadyExists
} }
} }
return fmt.Errorf("cannot upsert trust center alias: %w", err) return fmt.Errorf("cannot upsert resource alias: %w", err)
} }
row, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[TrustCenterAlias]) row, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[ResourceAlias])
if err != nil { if err != nil {
return fmt.Errorf("cannot collect trust center alias: %w", err) return fmt.Errorf("cannot collect resource alias: %w", err)
} }
*t = row *t = row
@@ -110,25 +102,22 @@ RETURNING
return nil return nil
} }
func (t *TrustCenterAlias) LoadByAlias( func (t *ResourceAlias) LoadByAlias(
ctx context.Context, ctx context.Context,
conn pg.Querier, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID,
alias string, alias string,
) error { ) error {
q := ` q := `
SELECT SELECT
organization_id,
alias, alias,
resource_id, resource_id,
created_at, created_at,
updated_at updated_at
FROM FROM
trust_center_aliases resource_aliases
WHERE WHERE
%s %s
AND organization_id = @organization_id
AND alias = @alias AND alias = @alias
LIMIT 1; LIMIT 1;
` `
@@ -136,23 +125,22 @@ LIMIT 1;
q = fmt.Sprintf(q, scope.SQLFragment()) q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{ args := pgx.StrictNamedArgs{
"organization_id": organizationID, "alias": alias,
"alias": alias,
} }
maps.Copy(args, scope.SQLArguments()) maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args) rows, err := conn.Query(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot query trust center alias: %w", err) return fmt.Errorf("cannot query resource alias: %w", err)
} }
row, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[TrustCenterAlias]) row, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[ResourceAlias])
if err != nil { if err != nil {
if errors.Is(err, pgx.ErrNoRows) { if errors.Is(err, pgx.ErrNoRows) {
return ErrResourceNotFound return ErrResourceNotFound
} }
return fmt.Errorf("cannot collect trust center alias: %w", err) return fmt.Errorf("cannot collect resource alias: %w", err)
} }
*t = row *t = row
@@ -160,7 +148,7 @@ LIMIT 1;
return nil return nil
} }
func (t *TrustCenterAlias) LoadByResourceID( func (t *ResourceAlias) LoadByResourceID(
ctx context.Context, ctx context.Context,
conn pg.Querier, conn pg.Querier,
scope Scoper, scope Scoper,
@@ -168,13 +156,12 @@ func (t *TrustCenterAlias) LoadByResourceID(
) error { ) error {
q := ` q := `
SELECT SELECT
organization_id,
alias, alias,
resource_id, resource_id,
created_at, created_at,
updated_at updated_at
FROM FROM
trust_center_aliases resource_aliases
WHERE WHERE
%s %s
AND resource_id = @resource_id AND resource_id = @resource_id
@@ -188,16 +175,16 @@ LIMIT 1;
rows, err := conn.Query(ctx, q, args) rows, err := conn.Query(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot query trust center alias: %w", err) return fmt.Errorf("cannot query resource alias: %w", err)
} }
row, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[TrustCenterAlias]) row, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[ResourceAlias])
if err != nil { if err != nil {
if errors.Is(err, pgx.ErrNoRows) { if errors.Is(err, pgx.ErrNoRows) {
return ErrResourceNotFound return ErrResourceNotFound
} }
return fmt.Errorf("cannot collect trust center alias: %w", err) return fmt.Errorf("cannot collect resource alias: %w", err)
} }
*t = row *t = row
@@ -205,7 +192,7 @@ LIMIT 1;
return nil return nil
} }
func (ts *TrustCenterAliases) LoadByResourceIDs( func (ts *ResourceAliases) LoadByResourceIDs(
ctx context.Context, ctx context.Context,
conn pg.Querier, conn pg.Querier,
scope Scoper, scope Scoper,
@@ -219,13 +206,12 @@ func (ts *TrustCenterAliases) LoadByResourceIDs(
q := ` q := `
SELECT SELECT
organization_id,
alias, alias,
resource_id, resource_id,
created_at, created_at,
updated_at updated_at
FROM FROM
trust_center_aliases resource_aliases
WHERE WHERE
%s %s
AND resource_id = ANY(@resource_ids) AND resource_id = ANY(@resource_ids)
@@ -238,12 +224,12 @@ WHERE
rows, err := conn.Query(ctx, q, args) rows, err := conn.Query(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot query trust center aliases: %w", err) return fmt.Errorf("cannot query resource aliases: %w", err)
} }
aliases, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[TrustCenterAlias]) aliases, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[ResourceAlias])
if err != nil { if err != nil {
return fmt.Errorf("cannot collect trust center aliases: %w", err) return fmt.Errorf("cannot collect resource aliases: %w", err)
} }
*ts = aliases *ts = aliases
@@ -251,13 +237,13 @@ WHERE
return nil return nil
} }
func (t *TrustCenterAlias) Delete( func (t *ResourceAlias) Delete(
ctx context.Context, ctx context.Context,
conn pg.Querier, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
DELETE FROM trust_center_aliases DELETE FROM resource_aliases
WHERE WHERE
%s %s
AND resource_id = @resource_id AND resource_id = @resource_id
@@ -270,7 +256,7 @@ WHERE
_, err := conn.Exec(ctx, q, args) _, err := conn.Exec(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot delete trust center alias: %w", err) return fmt.Errorf("cannot delete resource alias: %w", err)
} }
return nil return nil