Merge pull request #12 from ryokdy/v0.8

V0.8

README.md

@@ -5,7 +5,7 @@ cli-kintone is a command line utility for kintone.
 
 ## Version
 
-0.7
+0.8
 
 ## How to Build
 

export.go

@@ -86,6 +86,10 @@ func makeColumns(fields map[string]*kintone.FieldInfo) (Columns) {
 			continue
 		}
 		if val.Type == kintone.FT_SUBTABLE {
+			// record id for subtable
+			column := &Column{Code: val.Code, Type: val.Type}
+			columns = append(columns, column)
+
 			for _, subField := range val.Fields {
 				column := &Column{Code: subField.Code, Type: subField.Type, IsSubField: true, Table: val.Code}
 				columns = append(columns, column)
@@ -109,6 +113,10 @@ func makePartialColumns(fields map[string]*kintone.FieldInfo, partialFields []st
 			continue
 		}
 		if column.Type == kintone.FT_SUBTABLE {
+			// record id for subtable
+			column := &Column{Code: column.Code, Type: column.Type}
+			columns = append(columns, column)
+
 			// append all sub fields
 			field := fields[val]
 
@@ -217,6 +225,11 @@ func writeCsv(app *kintone.App, _writer io.Writer) error {
 						fmt.Fprintf(writer, "\"%d\"",  record.Id())
 					} else if f.Code == "$revision" {
 						fmt.Fprintf(writer, "\"%d\"",  record.Revision())
+					} else if f.Type == kintone.FT_SUBTABLE {
+						table := record.Fields[f.Code].(kintone.SubTableField)
+						if j < len(table) {
+							fmt.Fprintf(writer, "\"%d\"",  table[j].Id())
+						}
 					} else if f.IsSubField {
 						table := record.Fields[f.Table].(kintone.SubTableField)
 						if j < len(table) {

export_test.go

@@ -7,7 +7,7 @@ import (
   "fmt"
 	"testing"
 	"encoding/csv"
-  "github.com/ryokdy/go-kintone"
+  "github.com/kintone/go-kintone"
 )
 
 func makeTestData(app *kintone.App) error {
@@ -148,10 +148,13 @@ func TestExport2(t *testing.T) {
 	if row[3] != "number" {
 		t.Error("Invalid field code")
 	}
-	if row[4] != "table_single_line_text" {
+	if row[4] != "table" {
 		t.Error("Invalid field code")
 	}
-	if row[5] != "table_multi_line_text" {
+	if row[5] != "table_single_line_text" {
+		t.Error("Invalid field code")
+	}
+	if row[6] != "table_multi_line_text" {
 		t.Error("Invalid field code")
 	}
 
@@ -171,10 +174,10 @@ func TestExport2(t *testing.T) {
 	if row[3] != "12345" {
 		t.Error("Invalid 4th field value of row 1")
 	}
-	if row[4] != "table single line1" {
+	if row[5] != "table single line1" {
 		t.Error("Invalid 5th field value of row 1")
 	}
-	if row[5] != "table multi line1\nmulti line" {
+	if row[6] != "table multi line1\nmulti line" {
 		t.Error("Invalid 6th field value of row 1")
 	}
 
@@ -194,10 +197,10 @@ func TestExport2(t *testing.T) {
 	if row[3] != "12345" {
 		t.Error("Invalid 4th field value of row 2")
 	}
-	if row[4] != "table single line2" {
+	if row[5] != "table single line2" {
 		t.Error("Invalid 5th field value of row 2")
 	}
-	if row[5] != "table multi line2\nmulti line" {
+	if row[6] != "table multi line2\nmulti line" {
 		t.Error("Invalid 6th field value of row 2")
 	}
 
@@ -217,10 +220,10 @@ func TestExport2(t *testing.T) {
 	if row[3] != "12345" {
 		t.Error("Invalid 4th field value of row 3")
 	}
-	if row[4] != "" {
+	if row[5] != "" {
 		t.Error("Invalid 5th field value of row 3")
 	}
-	if row[5] != "" {
+	if row[6] != "" {
 		t.Error("Invalid 6th field value of row 3")
 	}
 

import.go

@@ -16,6 +16,11 @@ import (
 	"golang.org/x/text/transform"
 )
 
+type SubRecord struct {
+	Id       uint64
+	Fields   map[string]interface{}
+}
+
 func getReader(reader io.Reader) io.Reader {
 	encoding := getEncoding()
 	if (encoding == nil) {
@@ -24,15 +29,20 @@ func getReader(reader io.Reader) io.Reader {
 	return transform.NewReader(reader, encoding.NewDecoder())
 }
 
-func addSubField(app *kintone.App, column *Column, col string, tables map[string]map[string]interface{}) error {
-	if len(col) == 0 {
-		return nil
+func getSubRecord(tableName string, tables map[string]*SubRecord) *SubRecord {
+	table := tables[tableName]
+	if table == nil {
+		fields := make(map[string]interface{})
+		table = &SubRecord{0, fields}
+		tables[tableName] = table
 	}
 
-	table := tables[column.Table]
-	if table == nil {
-		table = make(map[string]interface{})
-		tables[column.Table] = table
+	return table
+}
+
+func addSubField(app *kintone.App, column *Column, col string, table *SubRecord) error {
+	if len(col) == 0 {
+		return nil
 	}
 
 	if column.Type == kintone.FT_FILE {
@@ -41,12 +51,12 @@ func addSubField(app *kintone.App, column *Column, col string, tables map[string
 			return err
 		}
 		if field != nil {
-			table[column.Code] = field
+			table.Fields[column.Code] = field
 		}
 	} else {
 		field := getField(column.Type, col)
 		if field != nil {
-			table[column.Code] = field
+			table.Fields[column.Code] = field
 		}
 	}
 	return nil
@@ -125,21 +135,28 @@ func readCsv(app *kintone.App, _reader io.Reader) error {
 			record := make(map[string]interface{})
 
 			for {
-				tables := make(map[string]map[string]interface{})
+				tables := make(map[string]*SubRecord)
 				for i, col := range row {
 					column := columns[i]
 					if column.IsSubField {
-						err := addSubField(app, column, col, tables)
+						table := getSubRecord(column.Table, tables)
+						err := addSubField(app, column, col, table)
 						if err != nil {
 							return err
 						}
+					} else if column.Type == kintone.FT_SUBTABLE {
+						if col != "" {
+							subId, _ := strconv.ParseUint(col, 10, 64)
+							table := getSubRecord(column.Code, tables)
+							table.Id = subId
+						}
 					} else {
 						if hasTable && row[0] != "*" {
 							continue
 						}
 						if column.Code == "$id" {
 							if col != "" {
-								id, err = strconv.ParseUint(col, 10, 64)
+								id, _ = strconv.ParseUint(col, 10, 64)
 							}
 						} else if column.Code == "$revision" {
 
@@ -168,7 +185,7 @@ func readCsv(app *kintone.App, _reader io.Reader) error {
 					}
 
 					stf := record[key].(kintone.SubTableField)
-					stf = append(stf, kintone.NewRecord(table))
+					stf = append(stf, kintone.NewRecordWithId(table.Id, table.Fields))
 					record[key] = stf
 				}
 

import_test.go

@@ -6,7 +6,7 @@ import (
 	//"io"
   //"fmt"
 	"testing"
-  "github.com/ryokdy/go-kintone"
+  "github.com/kintone/go-kintone"
 )
 
 func TestImport1(t *testing.T) {

main.go

@@ -164,6 +164,9 @@ func main() {
 
 	if colNames != "" {
 		config.fields = strings.Split(colNames, ",")
+		for i, field := range config.fields {
+			config.fields[i] = strings.TrimSpace(field)
+		}
 	}
 
 

main_test.go

@@ -4,7 +4,7 @@ package main
 import (
 	"os"
   "strconv"
-  "github.com/ryokdy/go-kintone"
+  "github.com/kintone/go-kintone"
 )
 
 func newApp() *kintone.App {