Merge pull request #19 from gcp-kit/feat/settable-ID

任意ID対応

Author: moezakura

pkg/inserter/common_inserter.go

@@ -26,11 +26,16 @@ func NewCommonInserter(client *firestore.Client) *CommonInserter {
 }
 
 // CreateItem - item を Firestore に作る
-func (c *CommonInserter) CreateItem(ctx context.Context, cn, refID string, item map[string]interface{}) error {
+func (c *CommonInserter) CreateItem(ctx context.Context, cn, ID, refID string, item map[string]interface{}) error {
 	item = c.tryParseDate(item)
 	item = c.setRefs(item)
 
-	d := c.client.Collection(cn).NewDoc()
+	var d *firestore.DocumentRef
+	if ID == "" {
+		d = c.client.Collection(cn).NewDoc()
+	} else {
+		d = c.client.Collection(cn).Doc(ID)
+	}
 	_, err := d.Create(ctx, item)
 	if err != nil {
 		return xerrors.Errorf("failed to create item: %w", err)

pkg/inserter/js_inserter.go

@@ -75,7 +75,7 @@ func (j *JSInserter) CreateItem(ctx context.Context, path []string, items []Docu
 	for idx, parentItem := range items {
 		nowIndexes := append(collectionIndexes, idx)
 		docPath := strings.Join(path, "/")
-		err := j.ci.CreateItem(ctx, docPath, parentItem.Ref, parentItem.Payload)
+		err := j.ci.CreateItem(ctx, docPath, parentItem.ID, parentItem.Ref, parentItem.Payload)
 		if err != nil {
 			errorIndexes := make([]string, 0)
 			for _, v := range nowIndexes {

pkg/inserter/json_inserter.go

@@ -51,7 +51,7 @@ func (j *JSONInserter) CreateItem(ctx context.Context, path []string, items []Do
 	for idx, parentItem := range items {
 		nowIndexes := append(collectionIndexes, idx)
 		docPath := strings.Join(path, "/")
-		err := j.ci.CreateItem(ctx, docPath, parentItem.Ref, parentItem.Payload)
+		err := j.ci.CreateItem(ctx, docPath, parentItem.ID, parentItem.Ref, parentItem.Payload)
 		if err != nil {
 			errorIndexes := make([]string, 0)
 			for _, v := range nowIndexes {

pkg/inserter/model.go

@@ -11,6 +11,7 @@ type Collection struct {
 
 // Document - Modelが持つアイテム
 type Document struct {
+	ID             string                        `json:"id" yaml:"id"`
 	Ref            string                        `json:"ref" yaml:"ref"`
 	Payload        map[string]interface{}        `json:"payload" yaml:"payload"`
 	SubCollections map[CollectionName][]Document `json:"sub_collections"`

pkg/inserter/yaml_inserter.go

@@ -34,7 +34,7 @@ func (y *YAMLInserter) Execute(ctx context.Context, cn, path string) error {
 	}
 
 	for idx, item := range ym.Items {
-		err := y.ci.CreateItem(ctx, cn, item.Ref, item.Payload)
+		err := y.ci.CreateItem(ctx, cn, item.ID, item.Ref, item.Payload)
 		if err != nil {
 			return xerrors.Errorf("failed to create item in array (index=%d): %w", idx, err)
 		}

samples/Car/dummies.json

@@ -0,0 +1,12 @@
+{
+  "version": "1.0",
+  "items": [
+    {
+      "id": "car-id-1",
+      "ref": "dummy-car-1",
+      "payload": {
+        "name": "Car1"
+      }
+    }
+  ]
+}