embulk-output-kintone 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9130ed9cf20ce6daef71d584cc04efa8fb85383a9abae667df654d127306e8c6
-  data.tar.gz: d1fe2f819d6c8c6a70d740467751cda39a1b57babb8b65fdb94ad0f5d59ea606
+  metadata.gz: 256bcb9a1f785c4811ab072062b8bca8cf7d55cfc6dd01a883313ac341abf971
+  data.tar.gz: bec48d54a62afbee336ef60c271e5795d6567d19b93a3029857403572a8418dd
 SHA512:
-  metadata.gz: 8cc744ff5db444005e44b1100f8d1247455bb37f4c3a096d30791fc7451e67ef8c471225cc40f670c62accda1a88ea4938afb9a4e3cc97f0df690a25033d00c6
-  data.tar.gz: 701036ca929cc0dfb074101751a2fcbf5e6393a51f2dea2fd2f2c6fb68ca5752c8b557828d8b973822112a8d21448877cbf63dd7f0d8d8f472e137d478e50531
+  metadata.gz: 4fc949cbe0b4f631005b7de223902cee34c23099484d412e89bd5fad58ec099ca4e8ed536121348043cfa2b813630efc34f6274858d93ddb066b85c7b53b980a
+  data.tar.gz: 2216fee31203a3f34dfa422b488d87d966848500c43db5045fb056780f082375d434d4b3ce82645ae6ee1b39973112714608f8dfa9eaf6bc2f6edc325fb7994e

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/output/kintone/KintoneColumnVisitor.java

@@ -31,78 +31,105 @@ public class KintoneColumnVisitor
         this.record = record;
     }
 
-    private void setValue(Column column, Object value)
+    private void setValue(String fieldCode, Object value, FieldType type)
     {
         if (value == null) {
             return;
         }
+        FieldValue fieldValue = new FieldValue();
+        fieldValue.setType(type);
+        record.put(fieldCode, fieldValue);
+        fieldValue.setValue(String.valueOf(value));
+    }
+
+    private FieldType getType(Column column, FieldType defaultType)
+    {
         KintoneColumnOption option = columnOptions.get(column.getName());
         if (option == null) {
-            return;
+            return defaultType;
+        }
+        else {
+            return FieldType.valueOf(option.getType());
         }
-        FieldValue fieldValue = new FieldValue();
-        fieldValue.setType(FieldType.valueOf(option.getType()));
-        fieldValue.setValue(String.valueOf(value));
-        record.put(option.getFieldCode(), fieldValue);
+    }
+
+    private String getFieldCode(Column column)
+    {
+        KintoneColumnOption option = columnOptions.get(column.getName());
+        if (option == null) {
+            return column.getName();
+        }
+        else {
+            return option.getFieldCode();
+        }
+    }
+
+    private DateTimeZone getTimezone(Column column)
+    {
+        KintoneColumnOption option = columnOptions.get(column.getName());
+        return DateTimeZone.forID(option.getTimezone().get());
     }
 
     @Override
     public void booleanColumn(Column column)
     {
-        setValue(column, pageReader.getBoolean(column));
+        String fieldCode = getFieldCode(column);
+        FieldType type = getType(column, FieldType.NUMBER);
+        setValue(fieldCode, pageReader.getBoolean(column), type);
     }
 
     @Override
     public void longColumn(Column column)
     {
-        setValue(column, pageReader.getLong(column));
+        String fieldCode = getFieldCode(column);
+        FieldType type = getType(column, FieldType.NUMBER);
+        setValue(fieldCode, pageReader.getLong(column), type);
     }
 
     @Override
     public void doubleColumn(Column column)
     {
-        setValue(column, pageReader.getDouble(column));
+        String fieldCode = getFieldCode(column);
+        FieldType type = getType(column, FieldType.NUMBER);
+        setValue(fieldCode, pageReader.getDouble(column), type);
     }
 
     @Override
     public void stringColumn(Column column)
     {
-        setValue(column, pageReader.getString(column));
+        String fieldCode = getFieldCode(column);
+        FieldType type = getType(column, FieldType.MULTI_LINE_TEXT);
+        setValue(fieldCode, pageReader.getString(column), type);
     }
 
     @Override
     public void timestampColumn(Column column)
     {
+        String fieldCode = getFieldCode(column);
+        FieldType type = getType(column, FieldType.DATETIME);
         Timestamp value = pageReader.getTimestamp(column);
         if (value == null) {
             return;
         }
-        KintoneColumnOption option = columnOptions.get(column.getName());
-        if (option == null) {
-            return;
-        }
-        FieldType fieldType = FieldType.valueOf(option.getType());
-
-        switch (fieldType) {
+        switch (type) {
             case DATE: {
                 String format = "%Y-%m-%d";
-                DateTimeZone timezone = DateTimeZone.forID(option.getTimezone().get());
+                DateTimeZone timezone = getTimezone(column);
                 TimestampFormatter formatter = new TimestampFormatter(format, timezone);
                 String date = formatter.format(value);
-                setValue(column, date);
+                setValue(fieldCode, date, type);
                 break;
             }
             case DATETIME: {
                 String format = "%Y-%m-%dT%H:%M:%S%z";
                 DateTimeZone timezone = DateTimeZone.forID("UTC");
                 TimestampFormatter formatter = new TimestampFormatter(format, timezone);
-                String date = formatter.format(value);
-                setValue(column, date);
+                String dateTime = formatter.format(value);
+                setValue(fieldCode, dateTime, type);
                 break;
             }
             default: {
-                setValue(column, value);
-                break;
+                setValue(fieldCode, value, type);
             }
         }
     }
@@ -110,6 +137,8 @@ public class KintoneColumnVisitor
     @Override
     public void jsonColumn(Column column)
     {
-        setValue(column, pageReader.getJson(column));
+        String fieldCode = getFieldCode(column);
+        FieldType type = getType(column, FieldType.MULTI_LINE_TEXT);
+        setValue(fieldCode, pageReader.getJson(column), type);
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-kintone
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - takeshi fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler