From 35910d1e6ea710bbf98b293b131dba298383ecd9 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 15 Jun 2026 15:33:14 +0200 Subject: [PATCH] Style Signed-off-by: Bryan Frimin --- e2e/console/access_review_test.go | 1 + pkg/accessreview/campaign_service.go | 1 + pkg/accessreview/entry_service.go | 1 + pkg/coredata/access_review_campaign_source_fetch_attempt.go | 1 + pkg/coredata/access_review_campaign_source_test.go | 4 ++++ 5 files changed, 8 insertions(+) diff --git a/e2e/console/access_review_test.go b/e2e/console/access_review_test.go index ec22fad15..dae80aaad 100644 --- a/e2e/console/access_review_test.go +++ b/e2e/console/access_review_test.go @@ -914,6 +914,7 @@ func TestAccessReviewCampaignSource_NameSurvivesSourceDeletion(t *testing.T) { orgID := owner.GetOrganizationID().String() const snapshotName = "Archived Snapshot Source" + sourceID := factory.NewAccessReviewSource(owner, orgID). WithName(snapshotName). WithCsvData(testCsvData). diff --git a/pkg/accessreview/campaign_service.go b/pkg/accessreview/campaign_service.go index 27345e97f..ce26c4376 100644 --- a/pkg/accessreview/campaign_service.go +++ b/pkg/accessreview/campaign_service.go @@ -590,6 +590,7 @@ func (s *Service) CountFetchAttemptsForCampaignSourceID( var attempts coredata.AccessReviewCampaignSourceFetchAttempts var err error + count, err = attempts.CountByCampaignSourceID(ctx, conn, scope, campaignSourceID) if err != nil { return fmt.Errorf("cannot count fetch attempts: %w", err) diff --git a/pkg/accessreview/entry_service.go b/pkg/accessreview/entry_service.go index 6d5dadde4..56e6bdf3d 100644 --- a/pkg/accessreview/entry_service.go +++ b/pkg/accessreview/entry_service.go @@ -133,6 +133,7 @@ func (s *Service) RecordDecisions( decidedByID, ok := decidedByCache[entry.OrganizationID] if !ok { decidedByID = nil + if d.DecidedByID != nil { profile := &coredata.MembershipProfile{} if err := profile.LoadByIdentityIDAndOrganizationID(ctx, conn, scope, *d.DecidedByID, entry.OrganizationID); err == nil { diff --git a/pkg/coredata/access_review_campaign_source_fetch_attempt.go b/pkg/coredata/access_review_campaign_source_fetch_attempt.go index 86344df6c..2a368dc81 100644 --- a/pkg/coredata/access_review_campaign_source_fetch_attempt.go +++ b/pkg/coredata/access_review_campaign_source_fetch_attempt.go @@ -439,6 +439,7 @@ WHERE status = 'FETCHING' AND updated_at < @stale_threshold FOR UPDATE SKIP LOCKED ` + rows, err := conn.Query(ctx, q, pgx.StrictNamedArgs{"stale_threshold": staleThreshold}) if err != nil { return 0, fmt.Errorf("cannot query stale fetch attempts: %w", err) diff --git a/pkg/coredata/access_review_campaign_source_test.go b/pkg/coredata/access_review_campaign_source_test.go index 0b25403fb..2db48ed26 100644 --- a/pkg/coredata/access_review_campaign_source_test.go +++ b/pkg/coredata/access_review_campaign_source_test.go @@ -80,12 +80,14 @@ func TestAccessReviewSourceDeletion_PreservesSnapshotAndEntries(t *testing.T) { })) loadedEntry := &coredata.AccessReviewEntry{} + require.NoError(t, client.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return loadedEntry.LoadByID(ctx, conn, fx.scope, entryID) })) assert.Equal(t, "preserve-me@example.com", loadedEntry.Email, "entry must survive source deletion") loadedSource := &coredata.AccessReviewCampaignSource{} + require.NoError(t, client.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return loadedSource.LoadByID(ctx, conn, fx.scope, fx.campaignSourceID) })) @@ -137,6 +139,7 @@ func TestSourceFetchAttempts_AppendOnly(t *testing.T) { })) var history coredata.AccessReviewCampaignSourceFetchAttempts + require.NoError(t, client.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return history.LoadAllByCampaignSourceID(ctx, conn, fx.scope, fx.campaignSourceID) })) @@ -147,6 +150,7 @@ func TestSourceFetchAttempts_AppendOnly(t *testing.T) { assert.Equal(t, failureMsg, *history[1].Error, "the failed attempt's error is retained") var latest coredata.AccessReviewCampaignSourceFetchAttempts + require.NoError(t, client.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return latest.LoadLatestByCampaignID(ctx, conn, fx.scope, fx.campaignID) }))