Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add CollectionReference.document to firestore for all targets #194

Merged
merged 3 commits into from
Jun 14, 2021
Merged

Add CollectionReference.document to firestore for all targets #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7520d99
Added CollectionReference.document (Android, iOS and js)
tiagonuneslx Jun 10, 2021
52cd43e
Added CollectionReference.document (AutoId) test
tiagonuneslx Jun 10, 2021
4e616f0
Merge branch 'master' into firestore-document
nbransby Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ external object firebase {

open class CollectionReference : Query {
val path: String
fun doc(path: String): DocumentReference
fun doc(path: String = definedExternally): DocumentReference
fun add(data: Any): Promise<DocumentReference>
}

Expand Down
3 changes: 3 additions & 0 deletions firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,9 @@ actual class CollectionReference(override val android: com.google.firebase.fires
actual val path: String
get() = android.path

actual val document: DocumentReference
get() = DocumentReference(android.document())

actual fun document(documentPath: String) = DocumentReference(android.document(documentPath))

actual suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean) =
Expand Down
1 change: 1 addition & 0 deletions firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ expect class DocumentReference {

expect class CollectionReference : Query {
val path: String
val document: DocumentReference

fun document(documentPath: String): DocumentReference
suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean = true): DocumentReference
Expand Down
18 changes: 18 additions & 0 deletions firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,24 @@ class FirebaseFirestoreTest {

}


@Test
fun testDocumentAutoId() = runTest {
val doc = Firebase.firestore
.collection("testDocumentAutoId")
.document

doc.set(FirestoreTest.serializer(), FirestoreTest("AutoId"))

val resultDoc = Firebase.firestore
.collection("testDocumentAutoId")
.document(doc.id)
.get()

assertEquals(true, resultDoc.exists)
assertEquals("AutoId", resultDoc.get("prop1"))
}

private suspend fun setupFirestoreData() {
Firebase.firestore.collection("FirebaseFirestoreTest")
.document("one")
Expand Down
2 changes: 2 additions & 0 deletions firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ actual class CollectionReference(override val ios: FIRCollectionReference) : Que
actual val path: String
get() = ios.path

actual val document get() = DocumentReference(ios.documentWithAutoID())

actual fun document(documentPath: String) = DocumentReference(ios.documentWithPath(documentPath))

actual suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean) =
Expand Down
2 changes: 2 additions & 0 deletions firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,8 @@ actual class CollectionReference(override val js: firebase.firestore.CollectionR
actual val path: String
get() = rethrow { js.path }

actual val document get() = rethrow { DocumentReference(js.doc()) }

actual fun document(documentPath: String) = rethrow { DocumentReference(js.doc(documentPath)) }

actual suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean) =
Expand Down