Decode timestamps

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.19]
+* fix document id referencing
+
+## [0.0.18]
+* add: support for Timestamp encoding
+
 ## [0.0.17]
 * fix: Query.where override
 

lib/factories.dart

@@ -36,9 +36,11 @@ MockQuerySnapshot createMockQuerySnapshot(Map<String, dynamic> colData,
   return s;
 }
 
-MockDocumentReference createDocumentReferance(Map<String, dynamic> value) {
+MockDocumentReference createDocumentReferance(String documentID, Map<String, dynamic> value) {
   MockDocumentReference r = MockDocumentReference();
+  when(r.documentID).thenReturn(documentID);
   MockDocumentSnapshot s = createDocumentSnapshot(r, value);
+  when(s.documentID).thenReturn(r?.documentID);
   when(r.get()).thenAnswer((_) => Future.value(s));
   when(r.snapshots()).thenAnswer((_) {
     Future<Null>.delayed(Duration.zero, () {
@@ -77,12 +79,12 @@ _createNestedDocumentReferance(Map<String, dynamic> map) {
           if(d is Map<String, dynamic>) {
             _createNestedDocumentReferance(d);
           }
-          MockDocumentReference documentReference = createDocumentReferance(d);
+          MockDocumentReference documentReference = createDocumentReferance(referenceKey, d);
           listDocumentReference.add(documentReference);
         }
         mapList[refName] = listDocumentReference;
       } else {
-        MockDocumentReference documentReference = createDocumentReferance(obj);
+        MockDocumentReference documentReference = createDocumentReferance(referenceKey, obj);
         mapList[refName] = documentReference;
       }      
     }
@@ -96,8 +98,7 @@ MockDocumentSnapshot createDocumentSnapshot(MockDocumentReference r, Map<String,
   if(value != null) {
     _createNestedDocumentReferance(value);
   }
-  if (value != null && value.containsKey("id"))
-    when(ds.documentID).thenReturn(value["id"]);
+  when(ds.documentID).thenReturn(r?.documentID);
   when(ds.reference).thenReturn(r);
   when(ds.data).thenReturn(value);
   when(ds.exists).thenReturn(value != null);
@@ -111,21 +112,24 @@ MockCollectionReference createCollectionReference(String collectionName,
 
   when(mcr.add(any)).thenAnswer((Invocation inv) {
     var value = inv.positionalArguments[0];
-    MockDocumentReference mdr = createDocumentReferance(value);
+    MockDocumentReference mdr = createDocumentReferance(null, value);
 
     MockQuerySnapshot mqs = createMockQuerySnapshot(colData, added: [value]);
     mcr.controller.add(mqs);
 
     return Future.value(mdr);
   });
 
-  MockDocumentReference mdr = createDocumentReferance(null);
-  when(mcr.document(any)).thenAnswer((_) => mdr);
+  when(mcr.document(any)).thenAnswer((invocation) {
+    String documentID = invocation.positionalArguments[0];
+    MockDocumentReference mdr = createDocumentReferance(documentID, null);
+    return mdr;
+  });
   if (colData == null) {
     return mcr;
   }
   colData.forEach((String key, dynamic value) {
-    MockDocumentReference mdr = createDocumentReferance(value);
+    MockDocumentReference mdr = createDocumentReferance(key, value);
     when(mcr.document(key)).thenAnswer((_) => mdr);
   });
 

lib/mock_cloud_firestore.dart

@@ -8,14 +8,37 @@ import 'package:mock_cloud_firestore/factories.dart';
 import 'package:mock_cloud_firestore/mock_types.dart';
 import 'package:mockito/mockito.dart';
 
+dynamic _reviveTimestamp(key, value) {
+  if (value is Map && value.containsKey('_seconds') && value.containsKey('_nanoseconds')) {
+    try {
+      return Timestamp(value['_seconds'], value['_nanoseconds']);
+    } catch (e) {
+      return value;
+    }
+  }
+  final timestampExp = RegExp(r'^Timestamp\(seconds=\d+, nanoseconds=\d+\)$');
+  if (value is String && timestampExp.hasMatch(value)) {
+    try {
+      final secondsExp = RegExp(r'(?:\(seconds=)(\d+)(?:,)');
+      final nanosecondsExp = RegExp(r'(?:nanoseconds=)(\d+)(?:\))');
+      final seconds = int.tryParse(secondsExp.firstMatch(value).group(1));
+      final nanoseconds = int.tryParse(nanosecondsExp.firstMatch(value).group(1));
+      return Timestamp(seconds, nanoseconds);
+    } catch (e) {
+      return value;
+    }
+  }
+  return value;
+}
+
 class MockCloudFirestore extends Mock {
   Map<String, dynamic> sourceParsed;
   Map<String, dynamic> whereData = {};
   Map<String, StreamController<QuerySnapshot>> snapshotStreams = {};
   Map<String, MockCollectionReference> collectionReferenceCache = {};
 
   MockCloudFirestore(String source) {
-    sourceParsed = json.decode(source);
+    sourceParsed = json.decode(source, reviver: _reviveTimestamp); 
     if (sourceParsed != null) {
       whereData = sourceParsed["__where__"];
     }
@@ -41,21 +64,24 @@ class MockCloudFirestore extends Mock {
 
     when(mcr.add(any)).thenAnswer((Invocation inv) {
       var value = inv.positionalArguments[0];
-      MockDocumentReference mdr = createDocumentReferance(value);
+      MockDocumentReference mdr = createDocumentReferance(null, value);
 
       MockQuerySnapshot mqs = createMockQuerySnapshot(colData, added: [value]);
       mcr.controller.add(mqs);
 
       return Future.value(mdr);
     });
 
-    MockDocumentReference mdr = createDocumentReferance(null);
-    when(mcr.document(any)).thenAnswer((_) => mdr);
+    when(mcr.document(any)).thenAnswer((invocation) {
+      String documentID = invocation.positionalArguments[0];
+      MockDocumentReference mdr = createDocumentReferance(documentID, null);
+      return mdr;
+    });
     if (colData == null) {
       return mcr;
     }
     colData.forEach((String key, dynamic value) {
-      MockDocumentReference mdr = createDocumentReferance(value);
+      MockDocumentReference mdr = createDocumentReferance(key, value);
       when(mdr.documentID).thenReturn(key);
       when(mcr.document(key)).thenAnswer((_) => mdr);