From e5518beba598381095ceda3d8cc062c7dda59c45 Mon Sep 17 00:00:00 2001
From: Eran Leshem <1707552+eranl@users.noreply.github.com>
Date: Sun, 3 Dec 2023 09:22:02 +0200
Subject: [PATCH] Fix time column with precision > ms (#973)

---
 src/main/java/org/influxdb/dto/Point.java     |  3 +--
 src/test/java/org/influxdb/dto/PointTest.java | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/influxdb/dto/Point.java b/src/main/java/org/influxdb/dto/Point.java
index b8cc9e2e..d7eb0396 100755
--- a/src/main/java/org/influxdb/dto/Point.java
+++ b/src/main/java/org/influxdb/dto/Point.java
@@ -331,8 +331,7 @@ private void addFieldByAttribute(final Object pojo, final Field field, final boo
                                     .add(BigInteger.valueOf(instant.getNano()))
                                     .divide(BigInteger.valueOf(TimeUnit.NANOSECONDS.convert(1, timeUnit)));
             } else {
-              this.time = TimeUnit.MILLISECONDS.convert(instant.toEpochMilli(), timeUnit);
-              this.precision = timeUnit;
+              this.time = timeUnit.convert(instant.toEpochMilli(), TimeUnit.MILLISECONDS);
             }
             this.precision = timeUnit;
           });
diff --git a/src/test/java/org/influxdb/dto/PointTest.java b/src/test/java/org/influxdb/dto/PointTest.java
index c315aad2..b59440c6 100755
--- a/src/test/java/org/influxdb/dto/PointTest.java
+++ b/src/test/java/org/influxdb/dto/PointTest.java
@@ -695,6 +695,23 @@ public void testAddFieldsFromPOJOWithTimeColumnNanoseconds() throws NoSuchFieldE
         pojo.time = null;
     }
 
+    @Test
+    public void testAddFieldsFromPOJOWithTimeColumnSeconds() throws NoSuchFieldException, IllegalAccessException {
+        TimeColumnPojoSec pojo = new TimeColumnPojoSec();
+        pojo.time = Instant.now().plusSeconds(132L).plus(365L * 12000, ChronoUnit.DAYS);
+        pojo.booleanPrimitive = true;
+
+        Point p = Point.measurementByPOJO(pojo.getClass()).addFieldsFromPOJO(pojo).build();
+        Field timeField = p.getClass().getDeclaredField("time");
+        Field precisionField = p.getClass().getDeclaredField("precision");
+        timeField.setAccessible(true);
+        precisionField.setAccessible(true);
+
+        Assertions.assertEquals(pojo.booleanPrimitive, p.getFields().get("booleanPrimitive"));
+        Assertions.assertEquals(TimeUnit.SECONDS, precisionField.get(p));
+        Assertions.assertEquals(pojo.time.getEpochSecond(), timeField.get(p));
+    }
+
     @Test
     public void testAddFieldsFromPOJOWithTimeColumnNull() throws NoSuchFieldException, IllegalAccessException {
         TimeColumnPojo pojo = new TimeColumnPojo();
@@ -914,6 +931,14 @@ static class TimeColumnPojoNano {
         private Instant time;
     }
 
+    @Measurement(name = "tcmeasurement", allFields = true)
+    static class TimeColumnPojoSec {
+        boolean booleanPrimitive;
+
+        @TimeColumn(timeUnit = TimeUnit.SECONDS)
+        Instant time;
+    }
+
     @Measurement(name = "mymeasurement")
     static class Pojo {