Resolve promise and send callback appropriate result.

Author: FrankSalad

ios/Firestack/FirestackDatabase.m

@@ -21,6 +21,7 @@ @interface FirestackDBReference : NSObject
 @property FIRDatabaseHandle childRemovedHandler;
 @property FIRDatabaseHandle childMovedHandler;
 @property FIRDatabaseHandle childValueHandler;
++ (NSDictionary *) snapshotToDict:(FIRDataSnapshot *) snapshot;
 @end
 
 @implementation FirestackDBReference
@@ -46,7 +47,7 @@ - (void) addEventHandler:(NSString *) eventName
 {
     if (![self isListeningTo:eventName]) {
         id withBlock = ^(FIRDataSnapshot * _Nonnull snapshot) {
-            NSDictionary *props = [self snapshotToDict:snapshot];
+            NSDictionary *props = [FirestackDBReference snapshotToDict:snapshot];
             [self sendJSEvent:DATABASE_DATA_EVENT
                         title:eventName
                         props: @{
@@ -74,7 +75,7 @@ - (void) addSingleEventHandler:(RCTResponseSenderBlock) callback
 {
     [_query observeSingleEventOfType:FIRDataEventTypeValue
                            withBlock:^(FIRDataSnapshot * _Nonnull snapshot) {
-                               NSDictionary *props = [self snapshotToDict:snapshot];
+                               NSDictionary *props = [FirestackDBReference snapshotToDict:snapshot];
                                callback(@[[NSNull null], @{
                                               @"eventName": @"value",
                                               @"path": _path,
@@ -131,7 +132,7 @@ - (void) removeEventHandler:(NSString *) name
     [self unsetListeningOn:name];
 }
 
-- (NSDictionary *) snapshotToDict:(FIRDataSnapshot *) snapshot
++ (NSDictionary *) snapshotToDict:(FIRDataSnapshot *) snapshot
 {
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     [dict setValue:snapshot.key forKey:@"key"];
@@ -485,8 +486,22 @@ - (id) init
                 currentData.value = value;
                 return [FIRTransactionResult successWithValue:currentData];
             }
-        } andCompletionBlock:^(NSError * _Nullable error, BOOL committed, FIRDataSnapshot * _Nullable snapshot) {
-            [self handleCallback:@"transaction" callback:onComplete databaseError:error];
+        } andCompletionBlock:^(NSError * _Nullable databaseError, BOOL committed, FIRDataSnapshot * _Nullable snapshot) {
+            if (databaseError != nil) {
+                NSDictionary *evt = @{
+                                      @"errorCode": [NSNumber numberWithInt:[databaseError code]],
+                                      @"errorDetails": [databaseError debugDescription],
+                                      @"description": [databaseError description]
+                                      };
+                onComplete(@[evt]);
+            } else {
+                onComplete(@[[NSNull null], @{
+                               @"committed": [NSNumber numberWithBool:committed],
+                               @"snapshot": [FirestackDBReference snapshotToDict:snapshot],
+                               @"status": @"success",
+                               @"method": @"transaction"
+                               }]);
+            }
         } withLocalEvents:applyLocally];
     });
 }

lib/modules/database/index.js

@@ -164,11 +164,17 @@ export default class Database extends Base {
     this.transactions[id] = updateCallback;
     return new Promise((resolve, reject) => {
       FirestackDatabase.beginTransaction(path, id, applyLocally || false, (error, result) => {
-        onComplete && onComplete(error);
-        if (error)
+        let snapshot;
+        if (result.snapshot)
+          snapshot = new Snapshot(new Reference(this, path.split('/'), null), result.snapshot);
+        onComplete && onComplete(error, snapshot);
+        if (error) {
           reject(error);
-        else
-          resolve();
+        }
+        else {
+          let {committed} = result;
+          resolve({committed, snapshot});
+        }
         delete this.transactions[id];
       });  
     });