fix: Add missing nano part when encoding timestamp to document

disneystreaming · Aug 31, 2024 · d2d21f4 · d2d21f4
1 parent d4edb32
commit d2d21f4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/modules/bootstrapped/test/src/smithy4s/DocumentSpec.scala b/modules/bootstrapped/test/src/smithy4s/DocumentSpec.scala
@@ -581,6 +581,30 @@ class DocumentSpec() extends FunSuite {
     )
   }
 
+  test("Document encoder - timestamp epoch seconds with nanos") {
+    val timestampWithNanos = Timestamp(1716459630L, 5000000)
+    val result = Document.Encoder
+      .withExplicitDefaultsEncoding(false)
+      .fromSchema(TimestampOperationInput.schema)
+      .encode(
+        TimestampOperationInput(
+          timestampWithNanos,
+          timestampWithNanos,
+          timestampWithNanos
+        )
+      )
+    expect.same(
+      Document.obj(
+        "httpDate" -> Document.fromString("Thu, 23 May 2024 10:20:30.005 GMT"),
+        "dateTime" -> Document.fromString("2024-05-23T10:20:30.005Z"),
+        "epochSeconds" -> Document.fromBigDecimal(
+          BigDecimal("1716459630.500000")
+        )
+      ),
+      result
+    )
+  }
+
   test("Document decoder - timestamp defaults") {
     val doc = Document.obj()
     val result = Document.Decoder

diff --git a/modules/core/src/smithy4s/internals/DocumentEncoderSchemaVisitor.scala b/modules/core/src/smithy4s/internals/DocumentEncoderSchemaVisitor.scala
@@ -99,9 +99,10 @@ class DocumentEncoderSchemaVisitor(
       hints
         .get(TimestampFormat)
         .getOrElse(TimestampFormat.EPOCH_SECONDS) match {
-        case DATE_TIME     => ts => DString(ts.format(DATE_TIME))
-        case HTTP_DATE     => ts => DString(ts.format(HTTP_DATE))
-        case EPOCH_SECONDS => ts => DNumber(BigDecimal(ts.epochSecond))
+        case DATE_TIME => ts => DString(ts.format(DATE_TIME))
+        case HTTP_DATE => ts => DString(ts.format(HTTP_DATE))
+        case EPOCH_SECONDS =>
+          ts => DNumber(BigDecimal(s"${ts.epochSecond}.${ts.nano}"))
       }
     case PDocument => from(identity)
     case PFloat    => from(float => DNumber(BigDecimal(float.toDouble)))