Rename types

Author: mopeneko

pkg/inserter/js_inserter.go

@@ -54,7 +54,7 @@ func (j *JSInserter) Execute(ctx context.Context, cn, path string) error {
 		return xerrors.Errorf("failed to marshal json of returned value: %w", err)
 	}
 
-	jms := make([]ModelItem, 0)
+	jms := make([]Document, 0)
 	err = json.Unmarshal(jb, &jms)
 	if err != nil {
 		return xerrors.Errorf("failed to unmarshal json: %w", err)
@@ -71,7 +71,7 @@ func (j *JSInserter) Execute(ctx context.Context, cn, path string) error {
 
 //nolint:dupl
 // CreateItem - Firestore にアイテムを生成する
-func (j *JSInserter) CreateItem(ctx context.Context, path []string, items []ModelItem, collectionIndexes []int) error {
+func (j *JSInserter) CreateItem(ctx context.Context, path []string, items []Document, collectionIndexes []int) error {
 	for idx, parentItem := range items {
 		nowIndexes := append(collectionIndexes, idx)
 		docPath := strings.Join(path, "/")
@@ -87,7 +87,7 @@ func (j *JSInserter) CreateItem(ctx context.Context, path []string, items []Mode
 			continue
 		}
 		for collectionName, subItems := range parentItem.SubCollections {
-			err := j.CreateItem(ctx, append(path, j.ci.refIDs[parentItem.Ref], collectionName), subItems, nowIndexes)
+			err := j.CreateItem(ctx, append(path, j.ci.refIDs[parentItem.Ref], string(collectionName)), subItems, nowIndexes)
 			if err != nil {
 				return xerrors.Errorf("failed to create item in array: %w", err)
 			}

pkg/inserter/json_inserter.go

@@ -30,7 +30,7 @@ func (j *JSONInserter) Execute(ctx context.Context, cn, path string) error {
 		return xerrors.Errorf("failed to read json file: %+v", err)
 	}
 
-	jm := new(Model)
+	jm := new(Collection)
 	err = json.Unmarshal(jb, jm)
 	if err != nil {
 		return xerrors.Errorf("failed to unmarshal json: %w", err)
@@ -47,7 +47,7 @@ func (j *JSONInserter) Execute(ctx context.Context, cn, path string) error {
 
 //nolint:dupl
 // CreateItem - Firestore にアイテムを生成する
-func (j *JSONInserter) CreateItem(ctx context.Context, path []string, items []ModelItem, collectionIndexes []int) error {
+func (j *JSONInserter) CreateItem(ctx context.Context, path []string, items []Document, collectionIndexes []int) error {
 	for idx, parentItem := range items {
 		nowIndexes := append(collectionIndexes, idx)
 		docPath := strings.Join(path, "/")
@@ -63,7 +63,7 @@ func (j *JSONInserter) CreateItem(ctx context.Context, path []string, items []Mo
 			continue
 		}
 		for collectionName, subItems := range parentItem.SubCollections {
-			err := j.CreateItem(ctx, append(path, j.ci.refIDs[parentItem.Ref], collectionName), subItems, nowIndexes)
+			err := j.CreateItem(ctx, append(path, j.ci.refIDs[parentItem.Ref], string(collectionName)), subItems, nowIndexes)
 			if err != nil {
 				return xerrors.Errorf("failed to create item in array: %w", err)
 			}

pkg/inserter/model.go

@@ -1,14 +1,16 @@
 package inserter
 
-// Model - JSONやYAMLのモデル
-type Model struct {
+type CollectionName string
+
+// Collection - JSONやYAMLのモデル
+type Collection struct {
 	Version string      `json:"version" yaml:"version"`
-	Items   []ModelItem `json:"items" yaml:"version"`
+	Items   []Document `json:"items" yaml:"version"`
 }
 
-// ModelItem - Modelが持つアイテム
-type ModelItem struct {
+// Document - Modelが持つアイテム
+type Document struct {
 	Ref            string                 `json:"ref" yaml:"ref"`
 	Payload        map[string]interface{} `json:"payload" yaml:"payload"`
-	SubCollections map[string][]ModelItem `json:"sub_collections"`
+	SubCollections map[CollectionName][]Document `json:"sub_collections"`
 }

pkg/inserter/yaml_inserter.go

@@ -27,7 +27,7 @@ func (y *YAMLInserter) Execute(ctx context.Context, cn, path string) error {
 		return xerrors.Errorf("failed to read yaml file: %+v", err)
 	}
 
-	ym := new(Model)
+	ym := new(Collection)
 	err = yaml.Unmarshal(yb, ym)
 	if err != nil {
 		return xerrors.Errorf("failed to unmarshal yaml: %w", err)