From 40359f556d5366efdf8d7be9b60867ee547bbac5 Mon Sep 17 00:00:00 2001 From: rot1024 Date: Fri, 27 Oct 2023 18:20:49 +0900 Subject: [PATCH] fix(server): rename itemGroup to group in integration API field type --- .../adapter/gql/gqlmodel/convert_item.go | 8 +- .../internal/adapter/integration/convert.go | 10 +-- .../adapter/integration/server.gen.go | 78 +++++++++---------- server/internal/usecase/interactor/item.go | 6 +- server/internal/usecase/interfaces/item.go | 10 +-- server/pkg/integrationapi/item.go | 10 +-- server/pkg/integrationapi/types.gen.go | 10 +-- server/pkg/item/field.go | 14 ++-- server/pkg/item/item.go | 8 +- server/schemas/integration.yml | 2 +- 10 files changed, 78 insertions(+), 78 deletions(-) diff --git a/server/internal/adapter/gql/gqlmodel/convert_item.go b/server/internal/adapter/gql/gqlmodel/convert_item.go index eb0699fb7b..58173f9687 100644 --- 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 index 08de30037c..f7b8d51d6f 100644 --- 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 index c5812fe894..29896bd1bd 100644 --- a/server/internal/adapter/integration/server.gen.go +++ b/server/internal/adapter/integration/server.gen.go @@ -2308,45 +2308,45 @@ func (sh *strictHandler) AssetCreate(ctx echo.Context, projectId ProjectIdParam) // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/server/internal/usecase/interactor/item.go b/server/internal/usecase/interactor/item.go index fbfb999d80..9811340143 100644 --- 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 index 8fc8fe23b0..a836767305 100644 --- 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 index b7dce2e81a..bcdc95eefc 100644 --- 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 index fc93107513..9f891403f3 100644 --- a/server/pkg/integrationapi/types.gen.go +++ b/server/pkg/integrationapi/types.gen.go @@ -181,11 +181,11 @@ type CommentAuthorType string // Field defines model for field. type Field struct { - Id *id.FieldID `json:"id,omitempty"` - ItemGroup *id.ItemGroupID `json:"itemGroup,omitempty"` - Key *string `json:"key,omitempty"` - Type *ValueType `json:"type,omitempty"` - Value *interface{} `json:"value,omitempty"` + Group *id.ItemGroupID `json:"group,omitempty"` + Id *id.FieldID `json:"id,omitempty"` + Key *string `json:"key,omitempty"` + Type *ValueType `json:"type,omitempty"` + Value *interface{} `json:"value,omitempty"` } // File defines model for file. diff --git a/server/pkg/item/field.go b/server/pkg/item/field.go index e3063db4a9..512d67ca7d 100644 --- a/server/pkg/item/field.go +++ b/server/pkg/item/field.go @@ -6,9 +6,9 @@ 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 { @@ -16,9 +16,9 @@ func NewField(field FieldID, v *value.Multiple, ig *ItemGroupID) *Field { 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 index f657e2a6fb..ec0d273216 100644 --- 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 index aadfb2701d..39f856c92f 100644 --- 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: