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

Rename accept to grant

Browse Source 
Signed-off-by: Émile Ré <nemile.re@gmail.com>
This commit is contained in:
Émile Ré
2025-12-08 11:39:37 +01:00
parent 19d850e90a
commit 886e6b0210
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/coredata/trust_center_document_access.go
View File

@@ -663,7 +663,7 @@ WHERE
return nil return nil
} }
func ActivateByDocumentIDs( func GrantByDocumentIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Conn,
scope Scoper, scope Scoper,
@@ -691,7 +691,7 @@ WHERE
_, err := conn.Exec(ctx, q, args) _, err := conn.Exec(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot activate trust center document accesses by document IDs: %w", err) return fmt.Errorf("cannot grant trust center document accesses by document IDs: %w", err)
} }
return nil return nil
@@ -729,7 +729,7 @@ WHERE
return nil return nil
} }
func ActivateByReportIDs( func GrantByReportIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Conn,
scope Scoper, scope Scoper,
@@ -757,7 +757,7 @@ WHERE
_, err := conn.Exec(ctx, q, args) _, err := conn.Exec(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot activate trust center document accesses by report IDs: %w", err) return fmt.Errorf("cannot grant trust center document accesses by report IDs: %w", err)
} }
return nil return nil
@@ -966,7 +966,7 @@ LIMIT 1;
return nil return nil
} }
func ActivateByTrustCenterFileIDs( func GrantByTrustCenterFileIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Conn,
scope Scoper, scope Scoper,
@@ -994,7 +994,7 @@ WHERE
_, err := conn.Exec(ctx, q, args) _, err := conn.Exec(ctx, q, args)
if err != nil { if err != nil {
return fmt.Errorf("cannot activate trust center document accesses by trust center file IDs: %w", err) return fmt.Errorf("cannot grant trust center document accesses by trust center file IDs: %w", err)
} }
return nil return nil

12
pkg/probo/trust_center_access_service.go
View File

@@ -406,8 +406,8 @@ func (s TrustCenterAccessService) upsertDocumentAccesses(
if err := documentAccesses.BulkInsertDocumentAccesses(ctx, tx, s.svc.scope, accessID, organizationID, documentIDs, false, now); err != nil { if err := documentAccesses.BulkInsertDocumentAccesses(ctx, tx, s.svc.scope, accessID, organizationID, documentIDs, false, now); err != nil {
return fmt.Errorf("cannot create document accesses: %w", err) return fmt.Errorf("cannot create document accesses: %w", err)
} }
if err := coredata.ActivateByDocumentIDs(ctx, tx, s.svc.scope, accessID, documentIDs, now); err != nil { if err := coredata.GrantByDocumentIDs(ctx, tx, s.svc.scope, accessID, documentIDs, now); err != nil {
return fmt.Errorf("cannot activate document accesses: %w", err) return fmt.Errorf("cannot grant document accesses: %w", err)
} }
} }
@@ -416,8 +416,8 @@ func (s TrustCenterAccessService) upsertDocumentAccesses(
if err := documentAccesses.BulkInsertReportAccesses(ctx, tx, s.svc.scope, accessID, organizationID, reportIDs, false, now); err != nil { if err := documentAccesses.BulkInsertReportAccesses(ctx, tx, s.svc.scope, accessID, organizationID, reportIDs, false, now); err != nil {
return fmt.Errorf("cannot create report accesses: %w", err) return fmt.Errorf("cannot create report accesses: %w", err)
} }
if err := coredata.ActivateByReportIDs(ctx, tx, s.svc.scope, accessID, reportIDs, now); err != nil { if err := coredata.GrantByReportIDs(ctx, tx, s.svc.scope, accessID, reportIDs, now); err != nil {
return fmt.Errorf("cannot activate report accesses: %w", err) return fmt.Errorf("cannot grant report accesses: %w", err)
} }
} }
@@ -426,8 +426,8 @@ func (s TrustCenterAccessService) upsertDocumentAccesses(
if err := documentAccesses.BulkInsertTrustCenterFileAccesses(ctx, tx, s.svc.scope, accessID, organizationID, trustCenterFileIDs, false, now); err != nil { if err := documentAccesses.BulkInsertTrustCenterFileAccesses(ctx, tx, s.svc.scope, accessID, organizationID, trustCenterFileIDs, false, now); err != nil {
return fmt.Errorf("cannot create trust center file accesses: %w", err) return fmt.Errorf("cannot create trust center file accesses: %w", err)
} }
if err := coredata.ActivateByTrustCenterFileIDs(ctx, tx, s.svc.scope, accessID, trustCenterFileIDs, now); err != nil { if err := coredata.GrantByTrustCenterFileIDs(ctx, tx, s.svc.scope, accessID, trustCenterFileIDs, now); err != nil {
return fmt.Errorf("cannot activate trust center file accesses: %w", err) return fmt.Errorf("cannot grant trust center file accesses: %w", err)
} }
} }

2
pkg/server/api/trust/v1/slack_handler.go
View File

@@ -194,7 +194,7 @@ func slackHandler(trustSvc *trust.Service, slackSigningSecret string, logger *lo
} }
if strings.HasPrefix(action.ActionID, "accept_") { if strings.HasPrefix(action.ActionID, "accept_") {
if err := tenantSvc.TrustCenterAccesses.AcceptByIDs( if err := tenantSvc.TrustCenterAccesses.GrantByIDs(
ctx, ctx,
initialSlackMessage.OrganizationID, initialSlackMessage.OrganizationID,
requesterEmail, requesterEmail,

14
pkg/trust/trust_center_access_service.go
View File

@@ -391,7 +391,7 @@ func (s TrustCenterAccessService) LoadTrustCenterFileAccess(
return fileAccess, nil return fileAccess, nil
} }
func (s *TrustCenterAccessService) AcceptByIDs( func (s *TrustCenterAccessService) GrantByIDs(
ctx context.Context, ctx context.Context,
organizationID gid.GID, organizationID gid.GID,
email string, email string,
@@ -414,18 +414,18 @@ func (s *TrustCenterAccessService) AcceptByIDs(
now := time.Now() now := time.Now()
if len(documentIDs) > 0 { if len(documentIDs) > 0 {
if err := coredata.ActivateByDocumentIDs(ctx, tx, s.svc.scope, access.ID, documentIDs, now); err != nil { if err := coredata.GrantByDocumentIDs(ctx, tx, s.svc.scope, access.ID, documentIDs, now); err != nil {
return fmt.Errorf("cannot activate document accesses: %w", err) return fmt.Errorf("cannot grant document accesses: %w", err)
} }
} }
if len(reportIDs) > 0 { if len(reportIDs) > 0 {
if err := coredata.ActivateByReportIDs(ctx, tx, s.svc.scope, access.ID, reportIDs, now); err != nil { if err := coredata.GrantByReportIDs(ctx, tx, s.svc.scope, access.ID, reportIDs, now); err != nil {
return fmt.Errorf("cannot activate report accesses: %w", err) return fmt.Errorf("cannot grant report accesses: %w", err)
} }
} }
if len(fileIDs) > 0 { if len(fileIDs) > 0 {
if err := coredata.ActivateByTrustCenterFileIDs(ctx, tx, s.svc.scope, access.ID, fileIDs, now); err != nil { if err := coredata.GrantByTrustCenterFileIDs(ctx, tx, s.svc.scope, access.ID, fileIDs, now); err != nil {
return fmt.Errorf("cannot activate trust center file accesses: %w", err) return fmt.Errorf("cannot grant trust center file accesses: %w", err)
} }
} }