Skip to content

Commit 32b5776

Browse files
soneda-yuyasoneda-yuya
authored
fix(server): Revert "feat(server): remove ErrInvalidID" (#1749)
1 parent cdf3dd6 commit 32b5776

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+305
-355
lines changed

‎server/internal/infrastructure/memory/scene_lock.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package memory
22

33
import (
44
"context"
5-
"errors"
65
"sync"
76

87
"github.com/reearth/reearth/server/internal/usecase/repo"
@@ -20,7 +19,7 @@ func NewSceneLock() repo.SceneLock {
2019

2120
func (r *sceneLock) GetLock(ctx context.Context, sceneID id.SceneID) (scene.LockMode, error) {
2221
if sceneID.IsNil() {
23-
return "", errors.New("invalid ID memory SceneLock ")
22+
return "", id.ErrInvalidID
2423
}
2524
if v, ok := r.lock.Load(sceneID); ok {
2625
if v2, ok2 := v.(scene.LockMode); ok2 {
@@ -34,7 +33,7 @@ func (r *sceneLock) GetAllLock(ctx context.Context, sceneID id.SceneIDList) ([]s
3433
res := make([]scene.LockMode, 0, len(sceneID))
3534
for _, si := range sceneID {
3635
if si.IsNil() {
37-
return nil, errors.New("invalid ID memory SceneLock ")
36+
return nil, id.ErrInvalidID
3837
}
3938
if v, ok := r.lock.Load(si); ok {
4039
if v2, ok2 := v.(scene.LockMode); ok2 {

‎server/pkg/asset/builder.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package asset
22

33
import (
4-
"errors"
54
"time"
65

76
"github.com/reearth/reearth/server/pkg/id"
@@ -18,7 +17,7 @@ func New() *Builder {
1817

1918
func (b *Builder) Build() (*Asset, error) {
2019
if b.a.id.IsNil() {
21-
return nil, errors.New("invalid ID asset.ID ")
20+
return nil, id.ErrInvalidID
2221
}
2322
if b.a.workspace.IsNil() {
2423
return nil, ErrEmptyWorkspaceID

‎server/pkg/asset/builder_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestBuilder_Build(t *testing.T) {
9797
url: "tt://xxx.zz",
9898
contentType: "bbb",
9999
},
100-
// err: id.ErrInvalidID,
100+
err: id.ErrInvalidID,
101101
},
102102
}
103103

@@ -116,7 +116,7 @@ func TestBuilder_Build(t *testing.T) {
116116
Build()
117117
if tt.err == nil {
118118
assert.Equal(t, tt.expected, res)
119-
// assert.Nil(t, err)
119+
assert.Nil(t, err)
120120
} else {
121121
assert.Nil(t, res)
122122
assert.Equal(t, tt.err, err)
@@ -213,7 +213,7 @@ func TestBuilder_MustBuild(t *testing.T) {
213213
url: "tt://xxx.zz",
214214
contentType: "bbb",
215215
},
216-
// err: id.ErrInvalidID,
216+
err: id.ErrInvalidID,
217217
},
218218
}
219219

@@ -238,7 +238,7 @@ func TestBuilder_MustBuild(t *testing.T) {
238238
if tt.err != nil {
239239
assert.PanicsWithValue(t, tt.err, func() { _ = build() })
240240
} else {
241-
// assert.Equal(t, tt.expected, build())
241+
assert.Equal(t, tt.expected, build())
242242
}
243243
})
244244
}

‎server/pkg/id/common.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package id
2+
3+
import "github.com/reearth/reearthx/idx"
4+
5+
var ErrInvalidID = idx.ErrInvalidID

‎server/pkg/id/plugin.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package id
22

33
import (
4-
"errors"
54
"regexp"
65
"strings"
76

@@ -40,11 +39,11 @@ func NewPluginID(name string, version string, scene *SceneID) (PluginID, error)
4039
}
4140

4241
if !validatePluginName(name) {
43-
return PluginID{}, errors.New("invalid ID Plugin.ID ")
42+
return PluginID{}, ErrInvalidID
4443
}
4544

4645
if _, err := semver.Parse(version); err != nil {
47-
return PluginID{}, errors.New("invalid ID Plugin.ID ")
46+
return PluginID{}, ErrInvalidID
4847
}
4948

5049
return PluginID{
@@ -72,13 +71,13 @@ func PluginIDFrom(id string) (PluginID, error) {
7271
case 3:
7372
sceneID2, err := SceneIDFrom(ids[0])
7473
if err != nil {
75-
return PluginID{}, errors.New("invalid ID PluginID ")
74+
return PluginID{}, ErrInvalidID
7675
}
7776
sceneID = &sceneID2
7877
name = ids[1]
7978
version = ids[2]
8079
default:
81-
return PluginID{}, errors.New("invalid ID PluginID ")
80+
return PluginID{}, ErrInvalidID
8281
}
8382

8483
return NewPluginID(name, version, sceneID)

‎server/pkg/id/plugin_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ func TestPluginIDsFrom(t *testing.T) {
730730
"Test",
731731
},
732732
expected: nil,
733-
// err: ErrInvalidID,
733+
err: ErrInvalidID,
734734
},
735735
}
736736

@@ -745,7 +745,7 @@ func TestPluginIDsFrom(t *testing.T) {
745745
assert.Equal(t, tt.err, err)
746746
} else {
747747
assert.Equal(t, tt.expected, res)
748-
// assert.Nil(t, err)
748+
assert.Nil(t, err)
749749
}
750750
})
751751
}

‎server/pkg/id/property_schema.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package id
22

33
import (
4-
"errors"
5-
"fmt"
64
"regexp"
75
"strings"
86
)
@@ -26,11 +24,11 @@ func NewPropertySchemaID(p PluginID, name string) PropertySchemaID {
2624
func PropertySchemaIDFrom(id string) (PropertySchemaID, error) {
2725
ids := strings.SplitN(id, "/", 2)
2826
if len(ids) < 2 || !propertySchemaIDRe.MatchString(ids[len(ids)-1]) {
29-
return PropertySchemaID{}, errors.New("invalid ID PropertySchema.ID ")
27+
return PropertySchemaID{}, ErrInvalidID
3028
}
3129
pid, err := PluginIDFrom(ids[0])
3230
if err != nil {
33-
return PropertySchemaID{}, errors.New("invalid ID PropertySchema.ID ")
31+
return PropertySchemaID{}, ErrInvalidID
3432
}
3533
return PropertySchemaID{plugin: pid, id: ids[1]}, nil
3634
}
@@ -51,8 +49,7 @@ func PropertySchemaIDFromRef(id *string) *PropertySchemaID {
5149
func MustPropertySchemaID(id string) PropertySchemaID {
5250
did, err := PropertySchemaIDFrom(id)
5351
if err != nil {
54-
// panic(err)
55-
fmt.Println(err.Error())
52+
panic(err)
5653
}
5754
return did
5855
}

‎server/pkg/id/property_schema_test.go‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,35 +68,31 @@ func TestPropertySchemaIDFrom(t *testing.T) {
6868
expected: struct {
6969
result PropertySchemaID
7070
err error
71-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
72-
71+
}{result: PropertySchemaID{}, err: ErrInvalidID},
7372
},
7473
{
7574
name: "fail 2",
7675
input: "Test/+dsad",
7776
expected: struct {
7877
result PropertySchemaID
7978
err error
80-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
81-
79+
}{result: PropertySchemaID{}, err: ErrInvalidID},
8280
},
8381
{
8482
name: "fail 3",
8583
input: "Test/-",
8684
expected: struct {
8785
result PropertySchemaID
8886
err error
89-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
90-
87+
}{result: PropertySchemaID{}, err: ErrInvalidID},
9188
},
9289
{
9390
name: "fail 4",
9491
input: "Test/__",
9592
expected: struct {
9693
result PropertySchemaID
9794
err error
98-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
99-
95+
}{result: PropertySchemaID{}, err: ErrInvalidID},
10096
},
10197
}
10298

@@ -110,7 +106,7 @@ func TestPropertySchemaIDFrom(t *testing.T) {
110106
assert.Equal(t, tt.expected.err, err)
111107
} else {
112108
assert.Equal(t, tt.expected.result, result)
113-
// assert.Nil(t, err)
109+
assert.Nil(t, err)
114110
}
115111
})
116112
}
@@ -145,26 +141,23 @@ func TestMustPropertySchemaID(t *testing.T) {
145141
expected: struct {
146142
result PropertySchemaID
147143
err error
148-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
149-
144+
}{result: PropertySchemaID{}, err: ErrInvalidID},
150145
},
151146
{
152147
name: "fail:invalid name",
153148
input: "Test/+dsad",
154149
expected: struct {
155150
result PropertySchemaID
156151
err error
157-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
158-
152+
}{result: PropertySchemaID{}, err: ErrInvalidID},
159153
},
160154
{
161155
name: "fail:invalid name",
162156
input: "Test/dsa d",
163157
expected: struct {
164158
result PropertySchemaID
165159
err error
166-
}{result: PropertySchemaID{}}, // err: ErrInvalidID
167-
160+
}{result: PropertySchemaID{}, err: ErrInvalidID},
168161
},
169162
}
170163

@@ -408,7 +401,7 @@ func TestPropertySchemaIDsFrom(t *testing.T) {
408401
"Test~1.0.1/test",
409402
"Test~1.0.2",
410403
},
411-
// err: ErrInvalidID,
404+
err: ErrInvalidID,
412405
},
413406
}
414407

@@ -423,7 +416,7 @@ func TestPropertySchemaIDsFrom(t *testing.T) {
423416
assert.Equal(t, tt.err, err)
424417
} else {
425418
assert.Equal(t, tt.expected, res)
426-
// assert.Nil(t, err)
419+
assert.Nil(t, err)
427420
}
428421
})
429422
}

‎server/pkg/nlslayer/group_builder.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package nlslayer
22

3-
import (
4-
"errors"
5-
6-
"github.com/reearth/reearth/server/pkg/id"
7-
)
3+
import "github.com/reearth/reearth/server/pkg/id"
84

95
func NLSLayerGroupFromLayer(l NLSLayer) *NLSLayerGroup {
106
li, ok := l.(*NLSLayerGroup)
@@ -35,7 +31,7 @@ func NewNLSLayerGroup() *NLSLayerGroupBuilder {
3531

3632
func (b *NLSLayerGroupBuilder) Build() (*NLSLayerGroup, error) {
3733
if b.l.id.IsNil() {
38-
return nil, errors.New("invalid ID NLSLayerGroupBuilder ")
34+
return nil, id.ErrInvalidID
3935
}
4036
return b.l, nil
4137
}

‎server/pkg/nlslayer/infobox_block_builder.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package nlslayer
22

3-
import (
4-
"errors"
5-
6-
"github.com/reearth/reearth/server/pkg/id"
7-
)
3+
import "github.com/reearth/reearth/server/pkg/id"
84

95
type InfoboxBlockBuilder struct {
106
i *InfoboxBlock
@@ -16,7 +12,7 @@ func NewInfoboxBlock() *InfoboxBlockBuilder {
1612

1713
func (b *InfoboxBlockBuilder) Build() (*InfoboxBlock, error) {
1814
if b.i.id.IsNil() || b.i.property.IsNil() {
19-
return nil, errors.New("invalid ID InfoboxBlockBuilder ")
15+
return nil, id.ErrInvalidID
2016
}
2117
return b.i, nil
2218
}

0 commit comments

Comments
 (0)