fix: use PropertySchemaID.Equal

reearth · Aug 9, 2021 · 1c3cf15 · 1c3cf15
1 parent 41c3771
commit 1c3cf15
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/pkg/layer/infobox.go b/pkg/layer/infobox.go
@@ -165,7 +165,7 @@ func (i *Infobox) ValidateProperties(pm property.Map) error {
 	if lp == nil {
 		return errors.New("property does not exist")
 	}
-	if lp.Schema() != builtin.PropertySchemaIDInfobox {
+	if !lp.Schema().Equal(builtin.PropertySchemaIDInfobox) {
 		return errors.New("property has a invalid schema")
 	}
 

diff --git a/pkg/layer/infobox_field.go b/pkg/layer/infobox_field.go
@@ -48,7 +48,7 @@ func (i *InfoboxField) ValidateProperty(pm property.Map) error {
 	if lp == nil {
 		return errors.New("property does not exist")
 	}
-	if lp.Schema() != id.MustPropertySchemaIDFromExtension(i.plugin, i.extension) {
+	if !lp.Schema().Equal(id.MustPropertySchemaIDFromExtension(i.plugin, i.extension)) {
 		return errors.New("property has a invalid schema")
 	}
 

diff --git a/pkg/layer/layer.go b/pkg/layer/layer.go
@@ -211,7 +211,7 @@ func (l *layerBase) ValidateProperties(pm property.Map) error {
 			return errors.New("layer property does not exist")
 		}
 
-		if lp.Schema() != psid {
+		if !lp.Schema().Equal(psid) {
 			return errors.New("layer property has a invalid schema")
 		}
 	} else if l.plugin != nil || l.extension != nil {

diff --git a/pkg/property/builder.go b/pkg/property/builder.go
@@ -33,7 +33,7 @@ func (b *Builder) Build() (*Property, error) {
 		return nil, ErrInvalidPropertySchemaID
 	}
 	for _, i := range b.p.items {
-		if i.Schema() != b.p.schema {
+		if !i.Schema().Equal(b.p.schema) {
 			return nil, ErrInvalidItem
 		}
 	}

diff --git a/pkg/property/group.go b/pkg/property/group.go
@@ -163,7 +163,7 @@ func (g *Group) MigrateSchema(ctx context.Context, newSchema *Schema, dl dataset
 
 // GetOrCreateField _
 func (g *Group) GetOrCreateField(ps *Schema, fid id.PropertySchemaFieldID) (*Field, bool) {
-	if g == nil || ps == nil || g.Schema() != ps.ID() {
+	if g == nil || ps == nil || !g.Schema().Equal(ps.ID()) {
 		return nil, false
 	}
 	psg := ps.Group(g.SchemaGroup())
@@ -249,7 +249,7 @@ func (g *Group) MigrateDataset(q DatasetMigrationParam) {
 }
 
 func (g *Group) UpdateNameFieldValue(ps *Schema, value *Value) error {
-	if g == nil || ps == nil || g.Schema() != ps.ID() {
+	if g == nil || ps == nil || !g.Schema().Equal(ps.ID()) {
 		return nil
 	}
 	if psg := ps.GroupByPointer(NewPointer(&g.itemBase.SchemaGroup, nil, nil)); psg != nil {
@@ -269,7 +269,7 @@ func (p *Group) ValidateSchema(ps *SchemaGroup) error {
 	if ps == nil {
 		return errors.New("invalid schema")
 	}
-	if p.Schema() != ps.Schema() {
+	if !p.Schema().Equal(ps.Schema()) {
 		return errors.New("invalid schema id")
 	}
 	if p.SchemaGroup() != ps.ID() {

diff --git a/pkg/property/group_list.go b/pkg/property/group_list.go
@@ -339,7 +339,7 @@ func (g *GroupList) GetOrCreateField(ps *Schema, ptr *Pointer) (*Field, bool) {
 
 // CreateAndAddListItem _
 func (g *GroupList) CreateAndAddListItem(ps *Schema, index *int) *Group {
-	if g == nil || ps == nil || g.Schema() != ps.ID() {
+	if g == nil || ps == nil || !g.Schema().Equal(ps.ID()) {
 		return nil
 	}
 	psg := ps.Group(g.SchemaGroup())
@@ -377,7 +377,7 @@ func (p *GroupList) ValidateSchema(ps *SchemaGroup) error {
 	if ps == nil {
 		return errors.New("invalid schema")
 	}
-	if p.Schema() != ps.Schema() {
+	if !p.Schema().Equal(ps.Schema()) {
 		return errors.New("invalid schema id")
 	}
 	if p.SchemaGroup() != ps.ID() {

diff --git a/pkg/property/merged.go b/pkg/property/merged.go
@@ -109,7 +109,7 @@ func (f *MergedField) DatasetValue(ctx context.Context, d dataset.GraphLoader) (
 
 // Merge merges two properties
 func Merge(o *Property, p *Property, linked *id.DatasetID) *Merged {
-	if o == nil && p == nil || o != nil && p != nil && o.Schema() != p.Schema() {
+	if o == nil && p == nil || o != nil && p != nil && !o.Schema().Equal(p.Schema()) {
 		return nil
 	}