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

Use coredata models in log export batch loaders

Browse Source 
Drop export-only row types; load Identity, PersonalAPIKey,
and MembershipProfile through the usual slice LoadByIDs helpers.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
Cursor Agent
2026-07-29 21:45:45 +00:00
parent e4d86f0f9e
commit 6cbf16814c
4 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/coredata/personal_api_key.go
View File

@@ -302,16 +302,7 @@ WHERE
return nil
}
type (
PersonalAPIKeyAuditLogActorRow struct {
ID gid.GID `db:"id"`
Name string `db:"name"`
}
PersonalAPIKeyAuditLogActorRows []*PersonalAPIKeyAuditLogActorRow
)
func (rows *PersonalAPIKeyAuditLogActorRows) LoadByIDs(
func (a *PersonalAPIKeys) LoadByIDs(
ctx context.Context,
conn pg.Querier,
apiKeyIDs []gid.GID,
@@ -319,7 +310,13 @@ func (rows *PersonalAPIKeyAuditLogActorRows) LoadByIDs(
q := `
SELECT
id,
name
identity_id,
name,
expires_at,
expire_reason,
last_used_at,
created_at,
updated_at
FROM
iam_personal_api_keys
WHERE
@@ -328,17 +325,17 @@ WHERE
args := pgx.StrictNamedArgs{"api_key_ids": apiKeyIDs}
rowsResult, err := conn.Query(ctx, q, args)
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query personal api key audit log actors: %w", err)
return fmt.Errorf("cannot query personal api keys: %w", err)
}
actors, err := pgx.CollectRows(rowsResult, pgx.RowToAddrOfStructByName[PersonalAPIKeyAuditLogActorRow])
apiKeys, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[PersonalAPIKey])
if err != nil {
return fmt.Errorf("cannot collect personal api key audit log actors: %w", err)
return fmt.Errorf("cannot collect personal api keys: %w", err)
}
*rows = actors
*a = apiKeys
return nil
}