Skip to content

Commit 5a3b2a9

Browse files
committed
fix(firestore): android write batch
fixes: date serialization
1 parent bd131c5 commit 5a3b2a9

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

packages/firebase-firestore/index.android.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ function serializeItems(value) {
139139
return java.lang.Boolean.valueOf(value);
140140
}
141141

142+
if (value instanceof Date) {
143+
return new java.util.Date(value.getTime());
144+
}
145+
142146
if (value instanceof Timestamp) {
143147
return value.native;
144148
}
@@ -1371,23 +1375,23 @@ export class WriteBatch implements IWriteBatch {
13711375
if (options) {
13721376
if (typeof options?.merge === 'boolean') {
13731377
const opts = com.google.firebase.firestore.SetOptions.merge();
1374-
return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native, opts));
1378+
return WriteBatch.fromNative(this.native.set(documentRef.native, serializeItems(data), opts));
13751379
}
13761380

13771381
if (options.mergeFields) {
13781382
if (Array.isArray(options.mergeFields)) {
13791383
if (typeof options.mergeFields[0] === 'string') {
1380-
return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native, com.google.firebase.firestore.SetOptions.mergeFields(options.mergeFields as any)));
1384+
return WriteBatch.fromNative(this.native.set(documentRef.native, serializeItems(data), com.google.firebase.firestore.SetOptions.mergeFields(options.mergeFields as any)));
13811385
}
13821386

13831387
const list = java.util.Arrays.asList(options.mergeFields.map((field) => field.native));
1384-
return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native, com.google.firebase.firestore.SetOptions.mergeFields(list)));
1388+
return WriteBatch.fromNative(this.native.set(documentRef.native, serializeItems(data), com.google.firebase.firestore.SetOptions.mergeFields(list)));
13851389
}
13861390
}
13871391

13881392
return null;
13891393
} else {
1390-
return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native));
1394+
return WriteBatch.fromNative(this.native.set(documentRef.native, serializeItems(data)));
13911395
}
13921396
}
13931397

0 commit comments

Comments
 (0)