Add set/update extended methods #36
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
143
to
161
| @JvmName("updateFieldsExtended") | ||
| actual inline fun <reified T> update( | ||
| documentRef: DocumentReference, | ||
| strategy: SerializationStrategy<T>, | ||
| data: T, | ||
| encodeDefaults: Boolean, | ||
| vararg fieldsAndValues: Pair<String, Any?> | ||
| ): WriteBatch { | ||
| val serializedItem = encode(data, encodeDefaults) as Map<String, Any> | ||
|
|
||
| val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() } | ||
| ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap() | ||
|
|
||
| val result = (serializedFieldAndValues?.let { | ||
| serializedItem.plus(it) | ||
| } ?: serializedItem) | ||
|
|
||
| return android.update(documentRef.android, result).let { this } | ||
| } |
There was a problem hiding this comment.
Android specific impl of new added method, basically it combines the mapping of data and fieldsAndValues into one update query. Use case example is an update on a data class A with fields A.field1 and A.field2 where field1 value needs to be updated and field2 value needs to be deleted. In that case new value for field1 is included on the "data" and field2 in the fieldsAndValues. (Due to limitation of FieldValue.delete() or FieldValue.serverTimestamp() that can only by included in fieldsAndValues and not in the data class itself)
Comment on lines
125
to
139
| actual inline fun <reified T> update( | ||
| documentRef: DocumentReference, | ||
| strategy: SerializationStrategy<T>, | ||
| data: T, | ||
| encodeDefaults: Boolean, | ||
| vararg fieldsAndValues: Pair<String, Any?> | ||
| ): WriteBatch { | ||
| val serializedItem = encode(strategy, data, encodeDefaults) as Map<Any?, *> | ||
| val serializedFieldAndValues = fieldsAndValues.associate { (field, value) -> field to encode(value, encodeDefaults) } | ||
|
|
||
| val result = serializedFieldAndValues?.let { | ||
| serializedItem.plus(it) | ||
| } ?: serializedItem | ||
| return ios.updateData(result, documentRef.ios).let { this } | ||
| } |
Comment on lines
102
to
126
| actual fun <T> set( | ||
| documentRef: DocumentReference, | ||
| strategy: SerializationStrategy<T>, | ||
| data: T, | ||
| encodeDefaults: Boolean, | ||
| merge: Boolean, | ||
| vararg fieldsAndValues: Pair<String, Any?> | ||
| ): WriteBatch { | ||
| val serializedItem = encode(strategy, data, encodeDefaults) as Map<String, Any>? | ||
| val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() } | ||
| ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap() | ||
|
|
||
| val result = serializedItem?.let { item -> | ||
| serializedFieldAndValues?.let { fieldsAndValues -> | ||
| item + fieldsAndValues | ||
| } | ||
| } as Any? ?: return this | ||
|
|
||
| if (merge) { | ||
| android.set(documentRef.android, result, SetOptions.merge()) | ||
| } else { | ||
| android.set(documentRef.android, result) | ||
| } | ||
| return this | ||
| } |
firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
Outdated
Show resolved
Hide resolved
Comment on lines
89
to
113
| actual fun <T> set( | ||
| documentRef: DocumentReference, | ||
| strategy: SerializationStrategy<T>, | ||
| data: T, | ||
| encodeDefaults: Boolean, | ||
| merge: Boolean, | ||
| vararg fieldsAndValues: Pair<String, Any?> | ||
| ): WriteBatch { | ||
| val serializedItem = encode(strategy, data, encodeDefaults) as Map<String, Any>? | ||
| val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() } | ||
| ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap() | ||
|
|
||
| val result = serializedItem?.let { item -> | ||
| serializedFieldAndValues?.let { fieldsAndValues -> | ||
| item + fieldsAndValues | ||
| } | ||
| } as Any? ?: return this | ||
|
|
||
| if (merge) { | ||
| js.set(documentRef.js, result, json("merge" to merge)) | ||
| } else { | ||
| js.set(documentRef.js, result) | ||
| } | ||
| return this | ||
| } |
Comment on lines
129
to
146
| actual inline fun <reified T> update( | ||
| documentRef: DocumentReference, | ||
| strategy: SerializationStrategy<T>, | ||
| data: T, | ||
| encodeDefaults: Boolean, | ||
| vararg fieldsAndValues: Pair<String, Any?> | ||
| ): WriteBatch { | ||
| val serializedItem = encode(data, encodeDefaults) as Map<String, Any> | ||
|
|
||
| val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() } | ||
| ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap() | ||
|
|
||
| val result = (serializedFieldAndValues?.let { | ||
| serializedItem.plus(it) | ||
| } ?: serializedItem) | ||
|
|
||
| return js.update(documentRef.js, result).let { this } | ||
| } |
ChristoferAlexander
approved these changes
Jan 10, 2022
ChristoferAlexander
changed the title
firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
Show resolved
Hide resolved
…estore/firestore.kt
…ebase-kotlin-sdk into 35-add-batch-methods
…tlin-sdk into 35-add-batch-methods
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#35