From a8a8c1103f9fd2c11e1e9570f21bab35ab1e9400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Fri, 30 Jan 2026 19:15:53 +0400 Subject: [PATCH] Avoid loading trust center twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- pkg/probo/trust_center_access_service.go | 10 ++-------- pkg/trust/trust_center_access_service.go | 19 ++++--------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/pkg/probo/trust_center_access_service.go b/pkg/probo/trust_center_access_service.go index 1e983eb33..950360380 100644 --- a/pkg/probo/trust_center_access_service.go +++ b/pkg/probo/trust_center_access_service.go @@ -400,14 +400,8 @@ func (s TrustCenterAccessService) Delete( } func (s TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Conn, access *coredata.TrustCenterAccess) error { - trustCenter := &coredata.TrustCenter{} - - if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, access.TrustCenterID); err != nil { - return fmt.Errorf("cannot load trust center: %w", err) - } - organization := &coredata.Organization{} - if err := organization.LoadByID(ctx, tx, s.svc.scope, trustCenter.OrganizationID); err != nil { + if err := organization.LoadByID(ctx, tx, s.svc.scope, access.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -418,7 +412,7 @@ func (s TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Con return fmt.Errorf("cannot update trust center access with expiration: %w", err) } - emailPresenterCfg, err := s.svc.TrustCenters.EmailPresenterConfig(ctx, trustCenter.ID) + emailPresenterCfg, err := s.svc.TrustCenters.EmailPresenterConfig(ctx, access.TrustCenterID) if err != nil { return fmt.Errorf("cannot get compliance page email presenter config: %w", err) } diff --git a/pkg/trust/trust_center_access_service.go b/pkg/trust/trust_center_access_service.go index 04a9e5ee1..66cface30 100644 --- a/pkg/trust/trust_center_access_service.go +++ b/pkg/trust/trust_center_access_service.go @@ -466,14 +466,8 @@ func (s *TrustCenterAccessService) GrantByIDs( } func (s *TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Conn, access *coredata.TrustCenterAccess) error { - trustCenter := &coredata.TrustCenter{} - - if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, access.TrustCenterID); err != nil { - return fmt.Errorf("cannot load trust center: %w", err) - } - organization := &coredata.Organization{} - if err := organization.LoadByID(ctx, tx, s.svc.scope, trustCenter.OrganizationID); err != nil { + if err := organization.LoadByID(ctx, tx, s.svc.scope, access.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -484,7 +478,7 @@ func (s *TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Co return fmt.Errorf("cannot update trust center access with expiration: %w", err) } - emailPresenterCfg, err := s.svc.TrustCenters.EmailPresenterConfig(ctx, trustCenter.ID) + emailPresenterCfg, err := s.svc.TrustCenters.EmailPresenterConfig(ctx, access.TrustCenterID) if err != nil { return fmt.Errorf("cannot get compliance page email presenter config: %w", err) } @@ -569,13 +563,8 @@ func (s *TrustCenterAccessService) sendDocumentAccessRejectedEmail( reportIDs []gid.GID, fileIDs []gid.GID, ) error { - trustCenter := &coredata.TrustCenter{} - if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, access.TrustCenterID); err != nil { - return fmt.Errorf("cannot load trust center: %w", err) - } - organization := &coredata.Organization{} - if err := organization.LoadByID(ctx, tx, s.svc.scope, trustCenter.OrganizationID); err != nil { + if err := organization.LoadByID(ctx, tx, s.svc.scope, access.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -608,7 +597,7 @@ func (s *TrustCenterAccessService) sendDocumentAccessRejectedEmail( } } - emailPresenterCfg, err := s.svc.TrustCenters.EmailPresenterConfig(ctx, trustCenter.ID) + emailPresenterCfg, err := s.svc.TrustCenters.EmailPresenterConfig(ctx, access.TrustCenterID) if err != nil { return fmt.Errorf("cannot get compliance page email presenter config: %w", err) }