fix(server): rename itemGroup to group in integration API field type

reearth · Oct 27, 2023 · 40359f5 · 40359f5
1 parent df04dd1
commit 40359f5
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 78 deletions.
diff --git a/server/internal/adapter/gql/gqlmodel/convert_item.go b/server/internal/adapter/gql/gqlmodel/convert_item.go
@@ -95,10 +95,10 @@ func ToItemParam(field *ItemFieldInput) *interfaces.ItemFieldParam {
 	}
 
 	return &interfaces.ItemFieldParam{
-		ItemGroup: ToIDRef[id.ItemGroup](field.ItemGroupID),
-		Field:     &fid,
-		Type:      FromValueType(field.Type),
-		Value:     field.Value,
+		Group: ToIDRef[id.ItemGroup](field.ItemGroupID),
+		Field: &fid,
+		Type:  FromValueType(field.Type),
+		Value: field.Value,
 	}
 }
 

diff --git a/server/internal/adapter/integration/convert.go b/server/internal/adapter/integration/convert.go
@@ -45,10 +45,10 @@ func fromItemFieldParam(f integrationapi.Field) interfaces.ItemFieldParam {
 	}
 
 	return interfaces.ItemFieldParam{
-		Field:     f.Id,
-		Key:       k,
-		Type:      integrationapi.FromValueType(f.Type),
-		Value:     v,
-		ItemGroup: f.ItemGroup,
+		Field: f.Id,
+		Key:   k,
+		Type:  integrationapi.FromValueType(f.Type),
+		Value: v,
+		Group: f.Group,
 	}
 }
diff --git a/server/internal/adapter/integration/server.gen.go b/server/internal/adapter/integration/server.gen.go
diff --git a/server/internal/usecase/interactor/item.go b/server/internal/usecase/interactor/item.go
@@ -751,12 +751,12 @@ func (i Item) handleGroupFields(ctx context.Context, params []interfaces.ItemFie
 		}
 
 		groupItemParams := lo.Filter(params, func(param interfaces.ItemFieldParam, _ int) bool {
-			if param.ItemGroup == nil {
+			if param.Group == nil {
 				return false
 			}
 
 			_, ok := lo.Find(mvg, func(item value.Group) bool {
-				return item == *param.ItemGroup
+				return item == *param.Group
 			})
 			return ok
 		})
@@ -804,7 +804,7 @@ func itemFieldsFromParams(fields []interfaces.ItemFieldParam, s *schema.Schema)
 			return nil, fmt.Errorf("field %s: %w", sf.Name(), err)
 		}
 
-		return item.NewField(sf.ID(), m, f.ItemGroup), nil
+		return item.NewField(sf.ID(), m, f.Group), nil
 	})
 }
 

diff --git a/server/internal/usecase/interfaces/item.go b/server/internal/usecase/interfaces/item.go
@@ -29,11 +29,11 @@ var (
 )
 
 type ItemFieldParam struct {
-	Field     *item.FieldID
-	Key       *key.Key
-	Type      value.Type
-	Value     any
-	ItemGroup *id.ItemGroupID
+	Field *item.FieldID
+	Key   *key.Key
+	Type  value.Type
+	Value any
+	Group *id.ItemGroupID
 }
 
 type CreateItemParam struct {

diff --git a/server/pkg/integrationapi/item.go b/server/pkg/integrationapi/item.go
@@ -49,11 +49,11 @@ func NewItem(i *item.Item, ss schema.List, assets *AssetContext) Item {
 			}
 
 			return Field{
-				Id:        f.FieldID().Ref(),
-				Type:      lo.ToPtr(ToValueType(f.Type())),
-				Value:     lo.ToPtr(ToValues(f.Value(), sf.Multiple(), assets)),
-				Key:       util.ToPtrIfNotEmpty(sf.Key().String()),
-				ItemGroup: f.ItemGroup(),
+				Id:    f.FieldID().Ref(),
+				Type:  lo.ToPtr(ToValueType(f.Type())),
+				Value: lo.ToPtr(ToValues(f.Value(), sf.Multiple(), assets)),
+				Key:   util.ToPtrIfNotEmpty(sf.Key().String()),
+				Group: f.ItemGroup(),
 			}, true
 		})
 		fs = append(fs, t...)

diff --git a/server/pkg/integrationapi/types.gen.go b/server/pkg/integrationapi/types.gen.go
diff --git a/server/pkg/item/field.go b/server/pkg/item/field.go
@@ -6,19 +6,19 @@ import (
 )
 
 type Field struct {
-	field     FieldID
-	itemGroup *ItemGroupID
-	value     *value.Multiple
+	field FieldID
+	group *ItemGroupID
+	value *value.Multiple
 }
 
 func NewField(field FieldID, v *value.Multiple, ig *ItemGroupID) *Field {
 	if v == nil {
 		return nil
 	}
 	return &Field{
-		field:     field,
-		value:     v,
-		itemGroup: ig,
+		field: field,
+		value: v,
+		group: ig,
 	}
 }
 
@@ -41,5 +41,5 @@ func (f *Field) ItemGroup() *ItemGroupID {
 	if f == nil {
 		return nil
 	}
-	return f.itemGroup
+	return f.group
 }
diff --git a/server/pkg/item/item.go b/server/pkg/item/item.go
@@ -76,10 +76,10 @@ func (i *Item) Field(f FieldID) *Field {
 
 func (i *Item) FieldByItemGroupAndID(fid FieldID, igID ItemGroupID) *Field {
 	ff, _ := lo.Find(i.fields, func(g *Field) bool {
-		if g.itemGroup == nil {
+		if g.group == nil {
 			return false
 		}
-		return g.FieldID() == fid && *g.itemGroup == igID
+		return g.FieldID() == fid && *g.group == igID
 	})
 	return ff
 }
@@ -126,10 +126,10 @@ func (i *Item) UpdateFields(fields []*Field) {
 			if g == nil || f == nil {
 				return false
 			}
-			if g.itemGroup == nil || f.itemGroup == nil {
+			if g.group == nil || f.group == nil {
 				return g.FieldID() == f.FieldID()
 			}
-			return g.FieldID() == f.FieldID() && *g.itemGroup == *f.itemGroup
+			return g.FieldID() == f.FieldID() && *g.group == *f.group
 		})
 
 		if !found {

diff --git a/server/schemas/integration.yml b/server/schemas/integration.yml
@@ -967,7 +967,7 @@ components:
         value: {}
         key:
           type: string
-        itemGroup:
+        group:
           x-go-type: id.ItemGroupID
           type: string
     refOrVersion: