Merge branch 'main' of https://github.com/gcp-kit/fti into issues/10/main

Author: mopeneko

.github/workflows/build.yml

@@ -0,0 +1,38 @@
+name: build
+on: [pull_request]
+jobs:
+  golangci-lint:
+    name: runner / build_and_run
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.17
+      - name: Install JRE
+        run: |
+          sudo apt update && sudo apt install openjdk-17-jre
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+      - name: Install emulator
+        run: |
+          npm ci
+      - name: Run emulator
+        run: |
+          make emulator &
+      - name: Ensure samples are generated
+        env:
+          TZ: Asia/Tokyo
+        run: |
+          make gen_samples
+
+          clean=$(git status | grep "nothing to commit" || true)
+          if [ -z "$clean" ]; then
+            git diff
+            echo 'Please run "make gen_samples"'
+            exit 1
+          fi

.github/workflows/linter.yml

@@ -10,34 +10,8 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install JRE
-        run: |
-          sudo apt update && sudo apt install openjdk-17-jre
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "16"
-          cache: "npm"
-          cache-dependency-path: package-lock.json
-      - name: Install emulator
-        run: |
-          npm ci
-      - name: Run emulator
-        run: |
-          make emulator &
-      - name: Ensure samples are generated
-        env:
-          TZ: Asia/Tokyo
-        run: |
-          make gen_samples
-          
-          clean=$(git status | grep "nothing to commit" || true)
-          if [ -z "$clean" ]; then
-            git diff
-            echo 'Please run "make gen_samples"'
-            exit 1
-          fi
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
           args: "--config=.github/.golangci.yml"
-          skip-go-installation: true`
+          skip-go-installation: true

pkg/inserter/common_inserter.go

@@ -68,16 +68,31 @@ func (c *CommonInserter) tryParseDate(item map[string]interface{}) map[string]in
 func (c *CommonInserter) setRefs(item map[string]interface{}) map[string]interface{} {
 	for k, v := range item {
 		switch vt := v.(type) {
-		case string:
-			if strings.HasPrefix(vt, "$") {
-				refID := strings.TrimPrefix(vt, "$")
-				rv, ok := c.refIDs[refID]
+		case map[string]interface{}:
+			for vtk, vtv := range vt {
+				if !strings.HasPrefix(vtk, "$") {
+					continue
+				}
+				refID := strings.TrimPrefix(vtk, "$")
+				rk, ok := c.refIDs[refID]
 				if !ok {
 					log.Printf("%s was not found", refID)
 					continue
 				}
-				item[k] = rv
+				vt[rk] = vtv
+				delete(vt, vtk)
+			}
+		case string:
+			if !strings.HasPrefix(vt, "$") {
+				continue
+			}
+			refID := strings.TrimPrefix(vt, "$")
+			rv, ok := c.refIDs[refID]
+			if !ok {
+				log.Printf("%s was not found", refID)
+				continue
 			}
+			item[k] = rv
 		}
 	}
 

pkg/inserter/js_inserter.go

@@ -69,8 +69,8 @@ func (j *JSInserter) Execute(ctx context.Context, cn, path string) error {
 	return nil
 }
 
-//nolint:dupl
 // CreateItem - Firestore にアイテムを生成する
+// nolint:dupl
 func (j *JSInserter) CreateItem(ctx context.Context, path []string, items []Document, collectionIndexes []int) error {
 	for idx, parentItem := range items {
 		nowIndexes := append(collectionIndexes, idx)

pkg/inserter/json_inserter.go

@@ -45,8 +45,8 @@ func (j *JSONInserter) Execute(ctx context.Context, cn, path string) error {
 	return nil
 }
 
-//nolint:dupl
 // CreateItem - Firestore にアイテムを生成する
+// nolint: dupl
 func (j *JSONInserter) CreateItem(ctx context.Context, path []string, items []Document, collectionIndexes []int) error {
 	for idx, parentItem := range items {
 		nowIndexes := append(collectionIndexes, idx)

samples/Option/dummies.json

@@ -0,0 +1,17 @@
+{
+  "versions": "1.0",
+  "items": [
+    {
+      "ref": "Option__dummy_0",
+      "payload": {
+        "name": "選択肢0"
+      }
+    },
+    {
+      "ref": "Option__dummy_1",
+      "payload": {
+        "name": "選択肢1"
+      }
+    }
+  ]
+}

samples/Survey/dummies.json

@@ -0,0 +1,15 @@
+{
+  "version": "1.0",
+  "items": [
+    {
+      "ref": "Foo__dummy_0",
+      "payload": {
+        "defaultOption": "$Option__dummy_0",
+        "options": {
+          "$Option__dummy_0": true,
+          "$Option__dummy_1": true
+        }
+      }
+    }
+  ]
+}

samples/config.yaml

@@ -1,5 +1,7 @@
 targets:
   - ./samples/Account
   - ./samples/Food
+  - ./samples/Option
+  - ./samples/Survey
 firestore_project_on_emulator: sample
 firestore_emulator_host: localhost:41848