Skip to content

Commit 2343037

Browse files
siyul-parksiyul-park
committed
refactor: remove util
1 parent 75509c2 commit 2343037

File tree

12 files changed

+54
-97
lines changed

12 files changed

+54
-97
lines changed

‎cmd/uniflow/apply/cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"io/fs"
66

77
"github.com/oklog/ulid/v2"
8+
"github.com/samber/lo"
89
"github.com/siyul-park/uniflow/cmd/flag"
910
"github.com/siyul-park/uniflow/cmd/resource"
10-
"github.com/siyul-park/uniflow/internal/util"
1111
"github.com/siyul-park/uniflow/pkg/database"
1212
"github.com/siyul-park/uniflow/pkg/scheme"
1313
"github.com/siyul-park/uniflow/pkg/storage"
@@ -107,7 +107,7 @@ func NewCmd(config Config) *cobra.Command {
107107
}
108108

109109
exists, err := st.FindMany(ctx, storage.Where[ulid.ULID](scheme.KeyID).IN(ids...), &database.FindOptions{
110-
Limit: util.Ptr[int](len(ids)),
110+
Limit: lo.ToPtr[int](len(ids)),
111111
})
112112
if err != nil {
113113
return err

‎cmd/uniflow/start/cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"os/signal"
88
"syscall"
99

10+
"github.com/samber/lo"
1011
"github.com/siyul-park/uniflow/cmd/flag"
1112
"github.com/siyul-park/uniflow/cmd/resource"
12-
"github.com/siyul-park/uniflow/internal/util"
1313
"github.com/siyul-park/uniflow/pkg/database"
1414
"github.com/siyul-park/uniflow/pkg/hook"
1515
"github.com/siyul-park/uniflow/pkg/runtime"
@@ -63,7 +63,7 @@ func NewCmd(config Config) *cobra.Command {
6363
}
6464

6565
if specs, err := st.FindMany(ctx, filter, &database.FindOptions{
66-
Limit: util.Ptr[int](1),
66+
Limit: lo.ToPtr[int](1),
6767
}); err != nil {
6868
return err
6969
} else if len(specs) == 0 {

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ require (
4040
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
4141
github.com/sagikazarmark/locafero v0.3.0 // indirect
4242
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
43+
github.com/samber/lo v1.38.1 // indirect
4344
github.com/shopspring/decimal v1.3.1 // indirect
4445
github.com/sourcegraph/conc v0.3.0 // indirect
4546
github.com/spf13/afero v1.10.0 // indirect

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9c
212212
github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
213213
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
214214
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
215+
github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
216+
github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
215217
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
216218
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
217219
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=

‎internal/util/ptr.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎internal/util/ptr_test.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pkg/database/collection_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,43 @@ package database
33
import (
44
"testing"
55

6-
"github.com/siyul-park/uniflow/internal/util"
6+
"github.com/samber/lo"
77
"github.com/stretchr/testify/assert"
88
)
99

1010
func TestMergeUpdateOptions(t *testing.T) {
1111
opt := MergeUpdateOptions([]*UpdateOptions{
1212
nil,
13-
util.Ptr(UpdateOptions{
13+
lo.ToPtr(UpdateOptions{
1414
Upsert: nil,
1515
}),
16-
util.Ptr(UpdateOptions{
17-
Upsert: util.Ptr(true),
16+
lo.ToPtr(UpdateOptions{
17+
Upsert: lo.ToPtr(true),
1818
}),
1919
})
2020

21-
assert.Equal(t, util.Ptr(UpdateOptions{
22-
Upsert: util.Ptr(true),
21+
assert.Equal(t, lo.ToPtr(UpdateOptions{
22+
Upsert: lo.ToPtr(true),
2323
}), opt)
2424
}
2525

2626
func TestMergeFindOptions(t *testing.T) {
2727
opt := MergeFindOptions([]*FindOptions{
2828
nil,
29-
util.Ptr(FindOptions{
30-
Limit: util.Ptr(1),
29+
lo.ToPtr(FindOptions{
30+
Limit: lo.ToPtr(1),
3131
}),
32-
util.Ptr(FindOptions{
33-
Skip: util.Ptr(1),
32+
lo.ToPtr(FindOptions{
33+
Skip: lo.ToPtr(1),
3434
}),
35-
util.Ptr(FindOptions{
35+
lo.ToPtr(FindOptions{
3636
Sorts: []Sort{{Key: "", Order: OrderASC}},
3737
}),
3838
})
3939

40-
assert.Equal(t, util.Ptr(FindOptions{
41-
Limit: util.Ptr(1),
42-
Skip: util.Ptr(1),
40+
assert.Equal(t, lo.ToPtr(FindOptions{
41+
Limit: lo.ToPtr(1),
42+
Skip: lo.ToPtr(1),
4343
Sorts: []Sort{{Key: "", Order: OrderASC}},
4444
}), opt)
4545
}

‎pkg/database/databasetest/collection.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/go-faker/faker/v4"
99
"github.com/oklog/ulid/v2"
10-
"github.com/siyul-park/uniflow/internal/util"
10+
"github.com/samber/lo"
1111
"github.com/siyul-park/uniflow/pkg/database"
1212
"github.com/siyul-park/uniflow/pkg/primitive"
1313
"github.com/stretchr/testify/assert"
@@ -116,8 +116,8 @@ func AssertCollectionUpdateOne(t *testing.T, collection database.Collection) {
116116
primitive.NewString("version"), primitive.NewInt(0),
117117
)
118118

119-
ok, err := collection.UpdateOne(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), util.Ptr(database.UpdateOptions{
120-
Upsert: util.Ptr(true),
119+
ok, err := collection.UpdateOne(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), lo.ToPtr(database.UpdateOptions{
120+
Upsert: lo.ToPtr(true),
121121
}))
122122
assert.NoError(t, err)
123123
assert.True(t, ok)
@@ -129,17 +129,17 @@ func AssertCollectionUpdateOne(t *testing.T, collection database.Collection) {
129129
primitive.NewString("version"), primitive.NewInt(0),
130130
)
131131

132-
ok, err := collection.UpdateOne(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), util.Ptr(database.UpdateOptions{
133-
Upsert: util.Ptr(false),
132+
ok, err := collection.UpdateOne(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), lo.ToPtr(database.UpdateOptions{
133+
Upsert: lo.ToPtr(false),
134134
}))
135135
assert.NoError(t, err)
136136
assert.False(t, ok)
137137

138138
_, err = collection.InsertOne(ctx, doc)
139139
assert.NoError(t, err)
140140

141-
ok, err = collection.UpdateOne(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), util.Ptr(database.UpdateOptions{
142-
Upsert: util.Ptr(false),
141+
ok, err = collection.UpdateOne(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), lo.ToPtr(database.UpdateOptions{
142+
Upsert: lo.ToPtr(false),
143143
}))
144144
assert.NoError(t, err)
145145
assert.True(t, ok)
@@ -158,8 +158,8 @@ func AssertCollectionUpdateMany(t *testing.T, collection database.Collection) {
158158
primitive.NewString("version"), primitive.NewInt(0),
159159
)
160160

161-
count, err := collection.UpdateMany(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), util.Ptr(database.UpdateOptions{
162-
Upsert: util.Ptr(true),
161+
count, err := collection.UpdateMany(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), lo.ToPtr(database.UpdateOptions{
162+
Upsert: lo.ToPtr(true),
163163
}))
164164
assert.NoError(t, err)
165165
assert.Equal(t, 1, count)
@@ -171,17 +171,17 @@ func AssertCollectionUpdateMany(t *testing.T, collection database.Collection) {
171171
primitive.NewString("version"), primitive.NewInt(0),
172172
)
173173

174-
count, err := collection.UpdateMany(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), util.Ptr(database.UpdateOptions{
175-
Upsert: util.Ptr(false),
174+
count, err := collection.UpdateMany(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), lo.ToPtr(database.UpdateOptions{
175+
Upsert: lo.ToPtr(false),
176176
}))
177177
assert.NoError(t, err)
178178
assert.Equal(t, 0, count)
179179

180180
_, err = collection.InsertOne(ctx, doc)
181181
assert.NoError(t, err)
182182

183-
count, err = collection.UpdateMany(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), util.Ptr(database.UpdateOptions{
184-
Upsert: util.Ptr(false),
183+
count, err = collection.UpdateMany(ctx, database.Where("id").EQ(doc.GetOr(primitive.NewString("id"), nil)), primitive.NewMap(primitive.NewString("version"), primitive.NewInt(1)), lo.ToPtr(database.UpdateOptions{
184+
Upsert: lo.ToPtr(false),
185185
}))
186186
assert.NoError(t, err)
187187
assert.Equal(t, 1, count)

‎pkg/database/memdb/collection.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/emirpasic/gods/maps/treemap"
1010
"github.com/emirpasic/gods/utils"
1111
"github.com/pkg/errors"
12-
"github.com/siyul-park/uniflow/internal/util"
12+
"github.com/samber/lo"
1313
"github.com/siyul-park/uniflow/pkg/database"
1414
"github.com/siyul-park/uniflow/pkg/primitive"
1515
)
@@ -122,7 +122,7 @@ func (coll *Collection) UpdateOne(ctx context.Context, filter *database.Filter,
122122
opt := database.MergeUpdateOptions(opts)
123123
upsert := false
124124
if opt != nil && opt.Upsert != nil {
125-
upsert = util.UnPtr(opt.Upsert)
125+
upsert = lo.FromPtr(opt.Upsert)
126126
}
127127

128128
old, err := coll.findOne(ctx, filter)
@@ -188,7 +188,7 @@ func (coll *Collection) UpdateMany(ctx context.Context, filter *database.Filter,
188188
opt := database.MergeUpdateOptions(opts)
189189
upsert := false
190190
if opt != nil && opt.Upsert != nil {
191-
upsert = util.UnPtr(opt.Upsert)
191+
upsert = lo.FromPtr(opt.Upsert)
192192
}
193193

194194
old, err := coll.findMany(ctx, filter)
@@ -380,7 +380,7 @@ func (coll *Collection) insertMany(ctx context.Context, docs []*primitive.Map) (
380380
}
381381

382382
func (coll *Collection) findOne(ctx context.Context, filter *database.Filter, opts ...*database.FindOptions) (*primitive.Map, error) {
383-
opt := database.MergeFindOptions(append(opts, util.Ptr(database.FindOptions{Limit: util.Ptr(1)})))
383+
opt := database.MergeFindOptions(append(opts, lo.ToPtr(database.FindOptions{Limit: lo.ToPtr(1)})))
384384

385385
if docs, err := coll.findMany(ctx, filter, opt); err != nil {
386386
return nil, err
@@ -399,11 +399,11 @@ func (coll *Collection) findMany(ctx context.Context, filter *database.Filter, o
399399

400400
limit := -1
401401
if opt != nil && opt.Limit != nil {
402-
limit = util.UnPtr(opt.Limit)
402+
limit = lo.FromPtr(opt.Limit)
403403
}
404404
skip := 0
405405
if opt != nil && opt.Skip != nil {
406-
skip = util.UnPtr(opt.Skip)
406+
skip = lo.FromPtr(opt.Skip)
407407
}
408408
var sorts []database.Sort
409409
if opt != nil && opt.Sorts != nil {

‎pkg/database/mongodb/collection.go

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

77
"github.com/pkg/errors"
8-
"github.com/siyul-park/uniflow/internal/util"
8+
"github.com/samber/lo"
99
"github.com/siyul-park/uniflow/pkg/database"
1010
"github.com/siyul-park/uniflow/pkg/primitive"
1111
"go.mongodb.org/mongo-driver/bson"
@@ -235,7 +235,7 @@ func mongoUpdateOptions(opts *database.UpdateOptions) *options.UpdateOptions {
235235
if opts == nil {
236236
return nil
237237
}
238-
return util.Ptr(options.UpdateOptions{
238+
return lo.ToPtr(options.UpdateOptions{
239239
Upsert: opts.Upsert,
240240
})
241241
}
@@ -244,8 +244,8 @@ func mongoFindOneOptions(opts *database.FindOptions) *options.FindOneOptions {
244244
if opts == nil {
245245
return nil
246246
}
247-
return util.Ptr(options.FindOneOptions{
248-
Skip: util.PtrTo(opts.Skip, func(s int) int64 { return int64(s) }),
247+
return lo.ToPtr(options.FindOneOptions{
248+
Skip: lo.EmptyableToPtr(int64(lo.FromPtr(opts.Skip))),
249249
Sort: mongoSorts(opts.Sorts),
250250
})
251251
}
@@ -254,9 +254,9 @@ func mongoFindOptions(opts *database.FindOptions) *options.FindOptions {
254254
if opts == nil {
255255
return nil
256256
}
257-
return util.Ptr(options.FindOptions{
258-
Limit: util.PtrTo(opts.Limit, func(s int) int64 { return int64(s) }),
259-
Skip: util.PtrTo(opts.Skip, func(s int) int64 { return int64(s) }),
257+
return lo.ToPtr(options.FindOptions{
258+
Limit: lo.EmptyableToPtr(int64(lo.FromPtr(opts.Limit))),
259+
Skip: lo.EmptyableToPtr(int64(lo.FromPtr(opts.Skip))),
260260
Sort: mongoSorts(opts.Sorts),
261261
})
262262
}

‎pkg/database/mongodb/index.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package mongodb
33
import (
44
"context"
55

6-
"github.com/siyul-park/uniflow/internal/util"
6+
"github.com/samber/lo"
77
"github.com/siyul-park/uniflow/pkg/database"
88
"go.mongodb.org/mongo-driver/bson"
99
"go.mongodb.org/mongo-driver/mongo"
@@ -74,8 +74,8 @@ func (iv *IndexView) Create(ctx context.Context, index database.IndexModel) erro
7474
_, err = iv.raw.CreateOne(ctx, mongo.IndexModel{
7575
Keys: keys,
7676
Options: &options.IndexOptions{
77-
Name: util.Ptr(index.Name),
78-
Unique: util.Ptr(index.Unique),
77+
Name: lo.ToPtr(index.Name),
78+
Unique: lo.ToPtr(index.Unique),
7979
PartialFilterExpression: partialFilterExpression,
8080
},
8181
})

‎pkg/plugin/systemx/reflect.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55

66
"github.com/oklog/ulid/v2"
7-
"github.com/siyul-park/uniflow/internal/util"
7+
"github.com/samber/lo"
88
"github.com/siyul-park/uniflow/pkg/database"
99
"github.com/siyul-park/uniflow/pkg/node"
1010
"github.com/siyul-park/uniflow/pkg/packet"
@@ -121,7 +121,7 @@ func (n *ReflectNode) action(proc *process.Process, inPck *packet.Packet) (*pack
121121
}
122122

123123
specs, err = n.storage.FindMany(ctx, storage.Where[ulid.ULID](scheme.KeyID).IN(ids...), &database.FindOptions{
124-
Limit: util.Ptr[int](len(ids)),
124+
Limit: lo.ToPtr(len(ids)),
125125
})
126126
if err != nil {
127127
return nil, packet.NewError(err, inPck)
@@ -169,7 +169,7 @@ func (n *ReflectNode) action(proc *process.Process, inPck *packet.Packet) (*pack
169169
}
170170

171171
specs, err := n.storage.FindMany(ctx, storage.Where[ulid.ULID](scheme.KeyID).IN(ids...), &database.FindOptions{
172-
Limit: util.Ptr[int](len(ids)),
172+
Limit: lo.ToPtr(len(ids)),
173173
})
174174
if err != nil {
175175
return nil, packet.NewError(err, inPck)
@@ -197,7 +197,7 @@ func (n *ReflectNode) action(proc *process.Process, inPck *packet.Packet) (*pack
197197
}
198198

199199
specs, err = n.storage.FindMany(ctx, storage.Where[ulid.ULID](scheme.KeyID).IN(ids...), &database.FindOptions{
200-
Limit: util.Ptr[int](len(ids)),
200+
Limit: lo.ToPtr(len(ids)),
201201
})
202202
if err != nil {
203203
return nil, packet.NewError(err, inPck)

0 commit comments

Comments
 (0)