timestamp

Author: Lyokone

Diff for: packages/firebase_data_connect/firebase_data_connect/lib/src/timestamp.dart

@@ -6,18 +6,20 @@ part of firebase_data_connect;
 
 /// Timestamp class is a custom class that allows for storing of nanoseconds.
 class Timestamp {
+  // ignore: use_raw_strings
+  final regex = RegExp(
+      r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{0,9})?(Z|[+-]\d{2}:\d{2})$');
+
   /// Constructor
   Timestamp(this.nanoseconds, this.seconds);
+
   // TODO(mtewani): Fix this so that it keeps track of positional arguments so you don't have to repeatedly search the string multiple times.
   Timestamp.fromJson(String date) {
-    // ignore: use_raw_strings
-    var regex = RegExp(
-        r'^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{0,9})?(Z|[+-]\\d{2}:\\d{2})\$');
     if (!regex.hasMatch(date)) {
       throw Exception('Invalid Date provided!');
     }
     DateTime dateTime = DateTime.parse(date);
-    seconds = dateTime.second;
+    seconds = dateTime.millisecondsSinceEpoch ~/ 1000;
     String nanoStr = '';
     int dotIdx = date.indexOf('.');
     if (dotIdx > -1) {
@@ -32,28 +34,24 @@ class Timestamp {
     if (nanoStr.isNotEmpty) {
       nanoseconds = int.parse(nanoStr.padRight(9, '0'));
     }
-    // TODO(mtewani): Add offset values.
-    if (date.contains('Z')) {
-      return;
-    }
-    int addIdx = date.indexOf('+');
-    bool isAdd = addIdx > -1;
-    int signIdx = isAdd ? addIdx : date.indexOf('-');
-    int timeHour = int.parse(date.substring(signIdx + 1, signIdx + 3));
-    int timeMin = int.parse(date.substring(signIdx + 4, signIdx + 6));
-    int timeZoneDiffer = timeHour * 3600 + timeMin * 60;
-    seconds = seconds + (isAdd ? -timeZoneDiffer : timeZoneDiffer);
   }
+
   String toJson() {
     String secondsStr =
         DateTime.fromMillisecondsSinceEpoch(seconds * 1000, isUtc: true)
             .toIso8601String();
+    if (nanoseconds == 0) {
+      return secondsStr;
+    }
     String nanoStr = nanoseconds.toString().padRight(9, '0');
-    return '${secondsStr.substring(0, nanoStr.length - 1)}.${nanoStr}Z';
+    return '${secondsStr.substring(0, 19)}.${nanoStr}Z';
   }
 
   DateTime toDateTime() {
-    return DateTime.utc((seconds * 1000 + (nanoseconds / 1000000)).floor());
+    final string = toJson();
+    final date = DateTime.parse(string);
+    return date;
+    return DateTime.parse(toJson());
   }
 
   /// Current nanoseconds

Diff for: packages/firebase_data_connect/firebase_data_connect/test/src/timestamp_test.dart

@@ -0,0 +1,60 @@
+import 'package:firebase_data_connect/firebase_data_connect.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('Timestamp', () {
+    test('constructor initializes with correct nanoseconds and seconds', () {
+      final timestamp = Timestamp(500, 864000); // Example timestamp values
+      expect(timestamp.nanoseconds, 500);
+      expect(timestamp.seconds, 864000);
+    });
+
+    test('fromJson throws exception for invalid date format', () {
+      expect(() => Timestamp.fromJson('invalid-date'), throwsException);
+    });
+
+    test('fromJson correctly parses date with nanoseconds and UTC (Z) format',
+        () {
+      final timestamp = Timestamp.fromJson('1970-01-11T00:00:00.123456789Z');
+      expect(timestamp.seconds, 864000);
+      expect(timestamp.nanoseconds, 123456789);
+    });
+
+    test('fromJson correctly parses date without nanoseconds', () {
+      final timestamp = Timestamp.fromJson('1970-01-11T00:00:00Z');
+      expect(timestamp.seconds, 864000);
+      expect(timestamp.nanoseconds, 0);
+    });
+
+    test('fromJson correctly handles timezones with positive offset', () {
+      final timestamp = Timestamp.fromJson('1970-01-11T00:00:00+02:00');
+      expect(timestamp.seconds,
+          864000 - (2 * 3600)); // Adjusts by the positive timezone offset
+    });
+
+    test('fromJson correctly handles timezones with negative offset', () {
+      final timestamp = Timestamp.fromJson('1970-01-11T00:00:00-05:00');
+      expect(timestamp.seconds,
+          864000 + (5 * 3600)); // Adjusts by the negative timezone offset
+    });
+
+    test('toJson correctly serializes to ISO8601 string with nanoseconds', () {
+      final timestamp = Timestamp(123456789, 864000); // Example timestamp
+      final json = timestamp.toJson();
+      expect(json, '1970-01-11T00:00:00.123456789Z');
+    });
+
+    test('toJson correctly serializes to ISO8601 string without nanoseconds',
+        () {
+      final timestamp = Timestamp(0, 864000); // No nanoseconds
+      final json = timestamp.toJson();
+      expect(json, '1970-01-11T00:00:00.000Z');
+    });
+
+    test('toDateTime correctly converts to DateTime object', () {
+      final timestamp = Timestamp(0, 864000); // Example timestamp
+      final dateTime = timestamp.toDateTime();
+      expect(dateTime, DateTime.utc(1970, 1, 11, 0, 0, 0, 0));
+    });
+  });
+}