Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 96d772a

Browse files
sashaostrikovsashaostrikov
committed
chore: clean up pagination relater code.
Test plan: CI.
1 parent 8c63877 commit 96d772a

File tree

8 files changed

+50
-51
lines changed

8 files changed

+50
-51
lines changed

‎cmd/frontend/graphqlbackend/executor_secrets.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ func (r *UserResolver) ExecutorSecrets(ctx context.Context, args ExecutorSecrets
258258
}, nil
259259
}
260260

261-
func (r *OrgResolver) ExecutorSecrets(ctx context.Context, args ExecutorSecretsListArgs) (*executorSecretConnectionResolver, error) {
261+
func (o *OrgResolver) ExecutorSecrets(ctx context.Context, args ExecutorSecretsListArgs) (*executorSecretConnectionResolver, error) {
262262
// 🚨 SECURITY: Only allow access to list secrets if the user has access to the namespace.
263-
if err := checkNamespaceAccess(ctx, r.db, 0, r.org.ID); err != nil {
263+
if err := checkNamespaceAccess(ctx, o.db, 0, o.org.ID); err != nil {
264264
return nil, err
265265
}
266266

@@ -270,12 +270,12 @@ func (r *OrgResolver) ExecutorSecrets(ctx context.Context, args ExecutorSecretsL
270270
}
271271

272272
return &executorSecretConnectionResolver{
273-
db: r.db,
273+
db: o.db,
274274
scope: args.Scope,
275275
opts: database.ExecutorSecretsListOpts{
276276
LimitOffset: limit,
277277
NamespaceUserID: 0,
278-
NamespaceOrgID: r.org.ID,
278+
NamespaceOrgID: o.org.ID,
279279
},
280280
}, nil
281281
}

‎cmd/frontend/graphqlbackend/graphqlutil/connection_resolver.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/sourcegraph/sourcegraph/lib/errors"
99
)
1010

11-
const DEFAULT_MAX_PAGE_SIZE = 100
11+
const DefaultMaxPageSize = 100
1212

1313
type ConnectionResolver[N any] struct {
1414
store ConnectionResolverStore[N]
@@ -36,7 +36,7 @@ type ConnectionResolverArgs struct {
3636
Before *string
3737
}
3838

39-
// Limit returns max nodes limit based on resolver arguments
39+
// Limit returns max nodes limit based on resolver arguments.
4040
func (a *ConnectionResolverArgs) Limit(options *ConnectionResolverOptions) int {
4141
var limit *int32
4242

@@ -60,22 +60,22 @@ type ConnectionResolverOptions struct {
6060
//
6161
// Defaults to `true` when not set.
6262
Reverse *bool
63-
// Columns to order by
63+
// Columns to order by.
6464
OrderBy database.OrderBy
65-
// Order direction
65+
// Order direction.
6666
Ascending bool
6767
}
6868

69-
// MaxPageSize returns the configured max page limit for the connection
69+
// MaxPageSizeOrDefault returns the configured max page limit for the connection.
7070
func (o *ConnectionResolverOptions) MaxPageSizeOrDefault() int {
7171
if o.MaxPageSize != nil {
7272
return *o.MaxPageSize
7373
}
7474

75-
return DEFAULT_MAX_PAGE_SIZE
75+
return DefaultMaxPageSize
7676
}
7777

78-
// ApplyMaxPageSize return max page size by applying the configured max limit to the first, last arguments
78+
// ApplyMaxPageSize return max page size by applying the configured max limit to the first, last arguments.
7979
func (o *ConnectionResolverOptions) ApplyMaxPageSize(limit *int32) int {
8080
maxPageSize := o.MaxPageSizeOrDefault()
8181

‎cmd/frontend/graphqlbackend/org.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/graph-gophers/graphql-go"
88
"github.com/graph-gophers/graphql-go/relay"
9-
"github.com/inconshreveable/log15"
9+
"github.com/sourcegraph/log"
1010

1111
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
1212
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
@@ -109,8 +109,6 @@ type OrgResolver struct {
109109
org *types.Org
110110
}
111111

112-
func NewOrg(db database.DB, org *types.Org) *OrgResolver { return &OrgResolver{db: db, org: org} }
113-
114112
func (o *OrgResolver) ID() graphql.ID { return MarshalOrgID(o.org.ID) }
115113

116114
func MarshalOrgID(id int32) graphql.ID { return relay.MarshalID("Org", id) }
@@ -205,8 +203,8 @@ func (s *membersConnectionStore) MarshalCursor(node *UserResolver, _ database.Or
205203
return &cursor, nil
206204
}
207205

208-
func (s *membersConnectionStore) UnmarshalCursor(cusror string, _ database.OrderBy) (*string, error) {
209-
nodeID, err := UnmarshalUserID(graphql.ID(cusror))
206+
func (s *membersConnectionStore) UnmarshalCursor(cursor string, _ database.OrderBy) (*string, error) {
207+
nodeID, err := UnmarshalUserID(graphql.ID(cursor))
210208
if err != nil {
211209
return nil, err
212210
}
@@ -316,7 +314,7 @@ func (r *schemaResolver) CreateOrganization(ctx context.Context, args *struct {
316314
// we do not throw errors here as this is best effort
317315
err = r.db.Orgs().UpdateOrgsOpenBetaStats(ctx, *args.StatsID, newOrg.ID)
318316
if err != nil {
319-
log15.Warn("Cannot update orgs open beta stats", "id", *args.StatsID, "orgID", newOrg.ID, "error", err)
317+
r.logger.Warn("Cannot update orgs open beta stats", log.String("id", *args.StatsID), log.Int32("orgID", newOrg.ID), log.Error(err))
320318
}
321319
}
322320

@@ -377,7 +375,7 @@ func (r *schemaResolver) RemoveUserFromOrganization(ctx context.Context, args *s
377375
if memberCount == 1 && !r.siteAdminSelfRemoving(ctx, userID) {
378376
return nil, errors.New("you can’t remove the only member of an organization")
379377
}
380-
log15.Info("removing user from org", "user", userID, "org", orgID)
378+
r.logger.Info("removing user from org", log.Int32("userID", userID), log.Int32("orgID", orgID))
381379
if err := r.db.OrgMembers().Remove(ctx, orgID, userID); err != nil {
382380
return nil, err
383381
}

‎cmd/frontend/graphqlbackend/repositories.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,10 @@ func (s *repositoriesConnectionStore) UnmarshalCursor(cursor string, orderBy dat
198198

199199
func i32ptr(v int32) *int32 { return &v }
200200

201-
func (r *repositoriesConnectionStore) ComputeTotal(ctx context.Context) (countptr *int32, err error) {
201+
func (s *repositoriesConnectionStore) ComputeTotal(ctx context.Context) (countptr *int32, err error) {
202202
// 🚨 SECURITY: Only site admins can list all repos, because a total repository
203203
// count does not respect repository permissions.
204-
if err := auth.CheckCurrentUserIsSiteAdmin(ctx, r.db); err != nil {
204+
if err := auth.CheckCurrentUserIsSiteAdmin(ctx, s.db); err != nil {
205205
return i32ptr(int32(0)), nil
206206
}
207207

@@ -210,23 +210,23 @@ func (r *repositoriesConnectionStore) ComputeTotal(ctx context.Context) (countpt
210210
return i32ptr(int32(0)), nil
211211
}
212212

213-
count, err := r.db.Repos().Count(ctx, r.opt)
213+
count, err := s.db.Repos().Count(ctx, s.opt)
214214
return i32ptr(int32(count)), err
215215
}
216216

217-
func (r *repositoriesConnectionStore) ComputeNodes(ctx context.Context, args *database.PaginationArgs) ([]*RepositoryResolver, error) {
218-
opt := r.opt
217+
func (s *repositoriesConnectionStore) ComputeNodes(ctx context.Context, args *database.PaginationArgs) ([]*RepositoryResolver, error) {
218+
opt := s.opt
219219
opt.PaginationArgs = args
220220

221221
client := gitserver.NewClient()
222-
repos, err := backend.NewRepos(r.logger, r.db, client).List(ctx, opt)
222+
repos, err := backend.NewRepos(s.logger, s.db, client).List(ctx, opt)
223223
if err != nil {
224224
return nil, err
225225
}
226226

227227
resolvers := make([]*RepositoryResolver, 0, len(repos))
228228
for _, repo := range repos {
229-
resolvers = append(resolvers, NewRepositoryResolver(r.db, client, repo))
229+
resolvers = append(resolvers, NewRepositoryResolver(s.db, client, repo))
230230
}
231231

232232
return resolvers, nil

‎cmd/frontend/graphqlbackend/repository_contributors.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ func (r *RepositoryResolver) Contributors(args *struct {
2424
graphqlutil.ConnectionResolverArgs
2525
}) (*graphqlutil.ConnectionResolver[*repositoryContributorResolver], error) {
2626
connectionStore := &repositoryContributorConnectionStore{
27-
db: r.db,
28-
args: &args.repositoryContributorsArgs,
29-
connectionArgs: &args.ConnectionResolverArgs,
30-
repo: r,
27+
db: r.db,
28+
args: &args.repositoryContributorsArgs,
29+
repo: r,
3130
}
3231
reverse := false
3332
connectionOptions := graphqlutil.ConnectionResolverOptions{
@@ -37,9 +36,8 @@ func (r *RepositoryResolver) Contributors(args *struct {
3736
}
3837

3938
type repositoryContributorConnectionStore struct {
40-
db database.DB
41-
args *repositoryContributorsArgs
42-
connectionArgs *graphqlutil.ConnectionResolverArgs
39+
db database.DB
40+
args *repositoryContributorsArgs
4341

4442
repo *RepositoryResolver
4543

‎cmd/frontend/graphqlbackend/site_users.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
sgusers "github.com/sourcegraph/sourcegraph/internal/users"
1313
)
1414

15-
func (s *siteResolver) Users(ctx context.Context, args *struct {
15+
func (r *siteResolver) Users(ctx context.Context, args *struct {
1616
Query *string
1717
SiteAdmin *bool
1818
Username *string
@@ -24,12 +24,12 @@ func (s *siteResolver) Users(ctx context.Context, args *struct {
2424
},
2525
) (*siteUsersResolver, error) {
2626
// 🚨 SECURITY: Only site admins can see users.
27-
if err := auth.CheckCurrentUserIsSiteAdmin(ctx, s.db); err != nil {
27+
if err := auth.CheckCurrentUserIsSiteAdmin(ctx, r.db); err != nil {
2828
return nil, err
2929
}
3030

3131
return &siteUsersResolver{
32-
&sgusers.UsersStats{DB: s.db, Filters: sgusers.UsersStatsFilters{
32+
&sgusers.UsersStats{DB: r.db, Filters: sgusers.UsersStatsFilters{
3333
Query: args.Query,
3434
SiteAdmin: args.SiteAdmin,
3535
Username: args.Username,

‎enterprise/cmd/frontend/internal/insights/resolvers/admin_resolver.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,59 +119,59 @@ type insightSeriesMetadataPayloadResolver struct {
119119
series *types.InsightSeries
120120
}
121121

122-
func (i *insightSeriesMetadataPayloadResolver) Series(ctx context.Context) graphqlbackend.InsightSeriesMetadataResolver {
122+
func (i *insightSeriesMetadataPayloadResolver) Series(_ context.Context) graphqlbackend.InsightSeriesMetadataResolver {
123123
return &insightSeriesMetadataResolver{series: i.series}
124124
}
125125

126126
type insightSeriesMetadataResolver struct {
127127
series *types.InsightSeries
128128
}
129129

130-
func (i *insightSeriesMetadataResolver) SeriesId(ctx context.Context) (string, error) {
130+
func (i *insightSeriesMetadataResolver) SeriesId(_ context.Context) (string, error) {
131131
return i.series.SeriesID, nil
132132
}
133133

134-
func (i *insightSeriesMetadataResolver) Query(ctx context.Context) (string, error) {
134+
func (i *insightSeriesMetadataResolver) Query(_ context.Context) (string, error) {
135135
return i.series.Query, nil
136136
}
137137

138-
func (i *insightSeriesMetadataResolver) Enabled(ctx context.Context) (bool, error) {
138+
func (i *insightSeriesMetadataResolver) Enabled(_ context.Context) (bool, error) {
139139
return i.series.Enabled, nil
140140
}
141141

142142
type insightSeriesQueryStatusResolver struct {
143143
status types.InsightSeriesStatus
144144
}
145145

146-
func (i *insightSeriesQueryStatusResolver) SeriesId(ctx context.Context) (string, error) {
146+
func (i *insightSeriesQueryStatusResolver) SeriesId(_ context.Context) (string, error) {
147147
return i.status.SeriesId, nil
148148
}
149149

150-
func (i *insightSeriesQueryStatusResolver) Query(ctx context.Context) (string, error) {
150+
func (i *insightSeriesQueryStatusResolver) Query(_ context.Context) (string, error) {
151151
return i.status.Query, nil
152152
}
153153

154-
func (i *insightSeriesQueryStatusResolver) Enabled(ctx context.Context) (bool, error) {
154+
func (i *insightSeriesQueryStatusResolver) Enabled(_ context.Context) (bool, error) {
155155
return i.status.Enabled, nil
156156
}
157157

158-
func (i *insightSeriesQueryStatusResolver) Errored(ctx context.Context) (int32, error) {
158+
func (i *insightSeriesQueryStatusResolver) Errored(_ context.Context) (int32, error) {
159159
return int32(i.status.Errored), nil
160160
}
161161

162-
func (i *insightSeriesQueryStatusResolver) Completed(ctx context.Context) (int32, error) {
162+
func (i *insightSeriesQueryStatusResolver) Completed(_ context.Context) (int32, error) {
163163
return int32(i.status.Completed), nil
164164
}
165165

166-
func (i *insightSeriesQueryStatusResolver) Processing(ctx context.Context) (int32, error) {
166+
func (i *insightSeriesQueryStatusResolver) Processing(_ context.Context) (int32, error) {
167167
return int32(i.status.Processing), nil
168168
}
169169

170-
func (i *insightSeriesQueryStatusResolver) Failed(ctx context.Context) (int32, error) {
170+
func (i *insightSeriesQueryStatusResolver) Failed(_ context.Context) (int32, error) {
171171
return int32(i.status.Failed), nil
172172
}
173173

174-
func (i *insightSeriesQueryStatusResolver) Queued(ctx context.Context) (int32, error) {
174+
func (i *insightSeriesQueryStatusResolver) Queued(_ context.Context) (int32, error) {
175175
return int32(i.status.Queued), nil
176176
}
177177

‎internal/database/helpers.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ import (
1010
"github.com/keegancsmith/sqlf"
1111
)
1212

13-
// LimitOffset specifies SQL LIMIT and OFFSET counts. A pointer to it is typically embedded in other options
14-
// structs that need to perform SQL queries with LIMIT and OFFSET.
13+
// LimitOffset specifies SQL LIMIT and OFFSET counts. A pointer to it is
14+
// typically embedded in other options structs that need to perform SQL queries
15+
// with LIMIT and OFFSET.
1516
type LimitOffset struct {
1617
Limit int // SQL LIMIT count
1718
Offset int // SQL OFFSET count
1819
}
1920

20-
// SQL returns the SQL query fragment ("LIMIT %d OFFSET %d") for use in SQL queries.
21+
// SQL returns the SQL query fragment ("LIMIT %d OFFSET %d") for use in SQL
22+
// queries.
2123
func (o *LimitOffset) SQL() *sqlf.Query {
2224
if o == nil {
2325
return &sqlf.Query{}
@@ -190,7 +192,8 @@ func copyPtr[T any](n *T) *T {
190192
return &c
191193
}
192194

193-
// Clone (aka deepcopy) returns a new PaginationArgs object with the same values as "p".
195+
// Clone (aka deepcopy) returns a new PaginationArgs object with the same values
196+
// as "p".
194197
func (p *PaginationArgs) Clone() *PaginationArgs {
195198
return &PaginationArgs{
196199
First: copyPtr(p.First),

0 commit comments

Comments
 (0)