tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Update FireBaseSubjectDAO.kt

Browse source
This commit is contained in:
Rune Dyselinck 2023-05-15 23:45:12 +02:00 • committed by GitHub Enterprise
parent 4420cede7e
commit 21c42cb693
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt
View file

@ -19,7 +19,7 @@ import kotlinx.coroutines.tasks.await
import javax.inject.Inject import javax.inject.Inject
import kotlin.collections.count import kotlin.collections.count
class FirebaseSubjectDAO @Inject constructor( class FireBaseSubjectDAO @Inject constructor(
private val firestore: FirebaseFirestore, private val firestore: FirebaseFirestore,
private val auth: AccountDAO, private val auth: AccountDAO,
private val taskDAO: TaskDAO, private val taskDAO: TaskDAO,
@ -50,7 +50,7 @@ class FirebaseSubjectDAO @Inject constructor(
override suspend fun archiveSubject(subject: Subject) { override suspend fun archiveSubject(subject: Subject) {
currentUserSubjectsCollection().document(subject.id).update(SubjectDocument.archived, true) currentUserSubjectsCollection().document(subject.id).update(SubjectDocument.archived, true)
currentUserSubjectsCollection().document(subject.id) currentUserSubjectsCollection().document(subject.id)
.collection(FirebaseCollections.TASK_COLLECTION) .collection(FireBaseCollections.TASK_COLLECTION)
.taskNotArchived() .taskNotArchived()
.get().await() .get().await()
.documents .documents
@ -75,16 +75,16 @@ class FirebaseSubjectDAO @Inject constructor(
} }
private fun currentUserSubjectsCollection(): CollectionReference = private fun currentUserSubjectsCollection(): CollectionReference =
firestore.collection(FirebaseCollections.USER_COLLECTION) firestore.collection(FireBaseCollections.USER_COLLECTION)
.document(auth.currentUserId) .document(auth.currentUserId)
.collection(FirebaseCollections.SUBJECT_COLLECTION) .collection(FireBaseCollections.SUBJECT_COLLECTION)
private fun subjectTasksCollection(subject: Subject): CollectionReference = private fun subjectTasksCollection(subject: Subject): CollectionReference =
firestore.collection(FirebaseCollections.USER_COLLECTION) firestore.collection(FireBaseCollections.USER_COLLECTION)
.document(auth.currentUserId) .document(auth.currentUserId)
.collection(FirebaseCollections.SUBJECT_COLLECTION) .collection(FireBaseCollections.SUBJECT_COLLECTION)
.document(subject.id) .document(subject.id)
.collection(FirebaseCollections.TASK_COLLECTION) .collection(FireBaseCollections.TASK_COLLECTION)
fun CollectionReference.subjectNotArchived(): Query = fun CollectionReference.subjectNotArchived(): Query =
this.whereEqualTo(SubjectDocument.archived, false) this.whereEqualTo(SubjectDocument.archived, false)