Merge pull request #34 from AaronJRubin/arubin/accept-non-numeric-val…

…ues-for-calc-fields Change type for Calc Fields from BigDecimal to String
kintone · May 12, 2022 · e74d495 · e74d495
2 parents 76118bd + c3c456e
commit e74d495
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/com/kintone/client/RecordDeserializer.java b/src/main/java/com/kintone/client/RecordDeserializer.java
@@ -90,8 +90,7 @@ private FieldValue deserialize(FieldType fieldType, JsonNode node) {
         switch (fieldType) {
             case CALC:
                 {
-                    BigDecimal value = convertValue(node, BigDecimal::new);
-                    return new CalcFieldValue(value);
+                    return new CalcFieldValue(node.textValue());
                 }
             case CATEGORY:
                 {

diff --git a/src/main/java/com/kintone/client/model/record/CalcFieldValue.java b/src/main/java/com/kintone/client/model/record/CalcFieldValue.java
@@ -8,7 +8,7 @@
 public class CalcFieldValue implements FieldValue {
 
     /** The value of the Calculated field. */
-    private final BigDecimal value;
+    private final String value;
 
     /** {@inheritDoc} */
     @Override

diff --git a/src/main/java/com/kintone/client/model/record/Record.java b/src/main/java/com/kintone/client/model/record/Record.java
@@ -343,7 +343,7 @@ public List<String> getCheckBoxFieldValue(String fieldCode) {
      * @param fieldCode the field code
      * @return the value of the field
      */
-    public BigDecimal getCalcFieldValue(String fieldCode) {
+    public String getCalcFieldValue(String fieldCode) {
         CalcFieldValue value = (CalcFieldValue) fields.get(fieldCode);
         return value == null ? null : value.getValue();
     }

diff --git a/src/main/java/com/kintone/client/model/record/TableRow.java b/src/main/java/com/kintone/client/model/record/TableRow.java
@@ -231,7 +231,7 @@ public List<String> getCheckBoxFieldValue(String fieldCode) {
      * @param fieldCode the field code
      * @return the value of the field
      */
-    public BigDecimal getCalcFieldValue(String fieldCode) {
+    public String getCalcFieldValue(String fieldCode) {
         CalcFieldValue value = (CalcFieldValue) fields.get(fieldCode);
         return value == null ? null : value.getValue();
     }

diff --git a/src/test/java/com/kintone/client/RecordDeserializerTest.java b/src/test/java/com/kintone/client/RecordDeserializerTest.java
@@ -109,8 +109,9 @@ public void deserialize_fields() throws IOException {
                         .setFileKey("key");
         ZonedDateTime dateTime = ZonedDateTime.of(2020, 1, 2, 3, 4, 0, 0, ZoneOffset.UTC);
 
-        assertThat(record.getFieldCodes(true)).hasSize(18);
-        assertThat(record.getFieldValue("calc")).isEqualTo(new CalcFieldValue(new BigDecimal(100)));
+        assertThat(record.getFieldCodes(true)).hasSize(19);
+        assertThat(record.getFieldValue("calc")).isEqualTo(new CalcFieldValue("100"));
+        assertThat(record.getFieldValue("date_calc")).isEqualTo(new CalcFieldValue("2020-01-01"));
         assertThat(record.getFieldValue("check_box"))
                 .isEqualTo(new CheckBoxFieldValue("option 1", "option 2"));
         assertThat(record.getFieldValue("date"))

diff --git a/src/test/java/com/kintone/client/RecordSerializerTest.java b/src/test/java/com/kintone/client/RecordSerializerTest.java
@@ -69,7 +69,7 @@ public void serialize_emptyRecord() throws IOException {
 
     @Test
     public void serialize_CALC() throws IOException {
-        Record record = new Record().putField("calc", new CalcFieldValue(new BigDecimal(100)));
+        Record record = new Record().putField("calc", new CalcFieldValue("100"));
         String json = mapper.writeValueAsString(record);
         assertThat(json).isEqualTo("{}");
     }

diff --git a/src/test/resources/com/kintone/client/RecordDeserializerTest_deserialize_fields.json b/src/test/resources/com/kintone/client/RecordDeserializerTest_deserialize_fields.json
@@ -4,6 +4,10 @@
       "type": "CALC",
       "value": "100"
     },
+    "date_calc": {
+      "type": "CALC",
+      "value": "2020-01-01"
+    },
     "check_box": {
       "type": "CHECK_BOX",
       "value": [