diff --git a/pkg/coredata/trust_center_document_access.go b/pkg/coredata/trust_center_document_access.go index 48f802e3e..752de1ed7 100644 --- a/pkg/coredata/trust_center_document_access.go +++ b/pkg/coredata/trust_center_document_access.go @@ -663,7 +663,7 @@ WHERE return nil } -func ActivateByDocumentIDs( +func GrantByDocumentIDs( ctx context.Context, conn pg.Conn, scope Scoper, @@ -691,7 +691,7 @@ WHERE _, err := conn.Exec(ctx, q, args) 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 @@ -729,7 +729,7 @@ WHERE return nil } -func ActivateByReportIDs( +func GrantByReportIDs( ctx context.Context, conn pg.Conn, scope Scoper, @@ -757,7 +757,7 @@ WHERE _, err := conn.Exec(ctx, q, args) 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 @@ -966,7 +966,7 @@ LIMIT 1; return nil } -func ActivateByTrustCenterFileIDs( +func GrantByTrustCenterFileIDs( ctx context.Context, conn pg.Conn, scope Scoper, @@ -994,7 +994,7 @@ WHERE _, err := conn.Exec(ctx, q, args) 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 diff --git a/pkg/probo/trust_center_access_service.go b/pkg/probo/trust_center_access_service.go index b928aba85..261c79fe9 100644 --- a/pkg/probo/trust_center_access_service.go +++ b/pkg/probo/trust_center_access_service.go @@ -406,8 +406,8 @@ func (s TrustCenterAccessService) upsertDocumentAccesses( 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) } - if err := coredata.ActivateByDocumentIDs(ctx, tx, s.svc.scope, accessID, documentIDs, now); err != nil { - return fmt.Errorf("cannot activate document accesses: %w", err) + if err := coredata.GrantByDocumentIDs(ctx, tx, s.svc.scope, accessID, documentIDs, now); err != nil { + 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 { return fmt.Errorf("cannot create report accesses: %w", err) } - if err := coredata.ActivateByReportIDs(ctx, tx, s.svc.scope, accessID, reportIDs, now); err != nil { - return fmt.Errorf("cannot activate report accesses: %w", err) + if err := coredata.GrantByReportIDs(ctx, tx, s.svc.scope, accessID, reportIDs, now); err != nil { + 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 { 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 { - return fmt.Errorf("cannot activate trust center file accesses: %w", err) + if err := coredata.GrantByTrustCenterFileIDs(ctx, tx, s.svc.scope, accessID, trustCenterFileIDs, now); err != nil { + return fmt.Errorf("cannot grant trust center file accesses: %w", err) } } diff --git a/pkg/server/api/trust/v1/slack_handler.go b/pkg/server/api/trust/v1/slack_handler.go index 2139081fa..5074ac67b 100644 --- a/pkg/server/api/trust/v1/slack_handler.go +++ b/pkg/server/api/trust/v1/slack_handler.go @@ -194,7 +194,7 @@ func slackHandler(trustSvc *trust.Service, slackSigningSecret string, logger *lo } if strings.HasPrefix(action.ActionID, "accept_") { - if err := tenantSvc.TrustCenterAccesses.AcceptByIDs( + if err := tenantSvc.TrustCenterAccesses.GrantByIDs( ctx, initialSlackMessage.OrganizationID, requesterEmail, diff --git a/pkg/trust/trust_center_access_service.go b/pkg/trust/trust_center_access_service.go index 11cc632fb..22e0fe497 100644 --- a/pkg/trust/trust_center_access_service.go +++ b/pkg/trust/trust_center_access_service.go @@ -391,7 +391,7 @@ func (s TrustCenterAccessService) LoadTrustCenterFileAccess( return fileAccess, nil } -func (s *TrustCenterAccessService) AcceptByIDs( +func (s *TrustCenterAccessService) GrantByIDs( ctx context.Context, organizationID gid.GID, email string, @@ -414,18 +414,18 @@ func (s *TrustCenterAccessService) AcceptByIDs( now := time.Now() if len(documentIDs) > 0 { - if err := coredata.ActivateByDocumentIDs(ctx, tx, s.svc.scope, access.ID, documentIDs, now); err != nil { - return fmt.Errorf("cannot activate document accesses: %w", err) + if err := coredata.GrantByDocumentIDs(ctx, tx, s.svc.scope, access.ID, documentIDs, now); err != nil { + return fmt.Errorf("cannot grant document accesses: %w", err) } } if len(reportIDs) > 0 { - if err := coredata.ActivateByReportIDs(ctx, tx, s.svc.scope, access.ID, reportIDs, now); err != nil { - return fmt.Errorf("cannot activate report accesses: %w", err) + if err := coredata.GrantByReportIDs(ctx, tx, s.svc.scope, access.ID, reportIDs, now); err != nil { + return fmt.Errorf("cannot grant report accesses: %w", err) } } if len(fileIDs) > 0 { - if err := coredata.ActivateByTrustCenterFileIDs(ctx, tx, s.svc.scope, access.ID, fileIDs, now); err != nil { - return fmt.Errorf("cannot activate trust center file accesses: %w", err) + if err := coredata.GrantByTrustCenterFileIDs(ctx, tx, s.svc.scope, access.ID, fileIDs, now); err != nil { + return fmt.Errorf("cannot grant trust center file accesses: %w", err) } }