refactor: add PropertySchemaGroupID to pkg/id (#70)

reearth · Nov 5, 2021 · 9ece9e8 · 9ece9e8
1 parent 25c5810
commit 9ece9e8
Show file tree

Hide file tree

Showing 58 changed files with 494 additions and 419 deletions.
diff --git a/gqlgen.yml b/gqlgen.yml
@@ -29,6 +29,8 @@ models:
     model: github.com/reearth/reearth-backend/internal/adapter/gql/gqlmodel.PluginExtensionID
   PropertySchemaID:
     model: github.com/reearth/reearth-backend/internal/adapter/gql/gqlmodel.PropertySchemaID
+  PropertySchemaGroupID:
+    model: github.com/reearth/reearth-backend/internal/adapter/gql/gqlmodel.PropertySchemaGroupID
   PropertySchemaFieldID:
     model: github.com/reearth/reearth-backend/internal/adapter/gql/gqlmodel.PropertySchemaFieldID
   DatasetSchemaFieldID:

diff --git a/internal/adapter/gql/generated.go b/internal/adapter/gql/generated.go
diff --git a/internal/adapter/gql/gqlmodel/convert_property.go b/internal/adapter/gql/gqlmodel/convert_property.go
@@ -608,7 +608,7 @@ func ToPropertyConditon(c *property.Condition) *PropertyCondition {
 	}
 }
 
-func FromPointer(schemaItem *id.PropertySchemaFieldID, item *id.ID, field *id.PropertySchemaFieldID) *property.Pointer {
+func FromPointer(schemaItem *id.PropertySchemaGroupID, item *id.ID, field *id.PropertySchemaFieldID) *property.Pointer {
 	i := id.PropertyItemIDFromRefID(item)
 	return property.NewPointer(schemaItem, i, field)
 }

diff --git a/internal/adapter/gql/gqlmodel/models.go b/internal/adapter/gql/gqlmodel/models.go
@@ -152,7 +152,7 @@ func (d *PropertyGroup) Field(id id.PropertySchemaFieldID) *PropertyField {
 	return nil
 }
 
-func (d *PropertySchema) Group(id id.PropertySchemaFieldID) *PropertySchemaGroup {
+func (d *PropertySchema) Group(id id.PropertySchemaGroupID) *PropertySchemaGroup {
 	if d == nil || id == "" {
 		return nil
 	}