From 9bae6dbd23acb886f8def351395d9ee7cf71f3e4 Mon Sep 17 00:00:00 2001 From: Rune Dyselinck Date: Mon, 15 May 2023 23:36:44 +0200 Subject: [PATCH 1/5] Update FireBaseSubjectDAO.kt --- .../domain/implementation/FireBaseSubjectDAO.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt index 915a7f9..05e0258 100644 --- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt +++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt @@ -1,5 +1,6 @@ package be.ugent.sel.studeez.domain.implementation +import android.util.Log import be.ugent.sel.studeez.data.local.models.task.Subject import be.ugent.sel.studeez.data.local.models.task.SubjectDocument import be.ugent.sel.studeez.data.local.models.task.Task @@ -18,7 +19,7 @@ import kotlinx.coroutines.tasks.await import javax.inject.Inject import kotlin.collections.count -class FireBaseSubjectDAO @Inject constructor( +class FirebaseSubjectDAO @Inject constructor( private val firestore: FirebaseFirestore, private val auth: AccountDAO, private val taskDAO: TaskDAO, @@ -49,7 +50,7 @@ class FireBaseSubjectDAO @Inject constructor( override suspend fun archiveSubject(subject: Subject) { currentUserSubjectsCollection().document(subject.id).update(SubjectDocument.archived, true) currentUserSubjectsCollection().document(subject.id) - .collection(FireBaseCollections.TASK_COLLECTION) + .collection(FirebaseCollections.TASK_COLLECTION) .taskNotArchived() .get().await() .documents @@ -74,20 +75,20 @@ class FireBaseSubjectDAO @Inject constructor( } private fun currentUserSubjectsCollection(): CollectionReference = - firestore.collection(FireBaseCollections.USER_COLLECTION) + firestore.collection(FirebaseCollections.USER_COLLECTION) .document(auth.currentUserId) - .collection(FireBaseCollections.SUBJECT_COLLECTION) + .collection(FirebaseCollections.SUBJECT_COLLECTION) private fun subjectTasksCollection(subject: Subject): CollectionReference = - firestore.collection(FireBaseCollections.USER_COLLECTION) + firestore.collection(FirebaseCollections.USER_COLLECTION) .document(auth.currentUserId) - .collection(FireBaseCollections.SUBJECT_COLLECTION) + .collection(FirebaseCollections.SUBJECT_COLLECTION) .document(subject.id) - .collection(FireBaseCollections.TASK_COLLECTION) + .collection(FirebaseCollections.TASK_COLLECTION) fun CollectionReference.subjectNotArchived(): Query = this.whereEqualTo(SubjectDocument.archived, false) fun Query.subjectNotArchived(): Query = this.whereEqualTo(SubjectDocument.archived, false) -} \ No newline at end of file +} From 4420cede7e15efdcbe13e31b72201cda49701066 Mon Sep 17 00:00:00 2001 From: Rune Dyselinck Date: Mon, 15 May 2023 23:41:39 +0200 Subject: [PATCH 2/5] Update FireBaseSubjectDAO.kt From 21c42cb6939a44553ea131e5681244da4ef94711 Mon Sep 17 00:00:00 2001 From: Rune Dyselinck Date: Mon, 15 May 2023 23:45:12 +0200 Subject: [PATCH 3/5] Update FireBaseSubjectDAO.kt --- .../domain/implementation/FireBaseSubjectDAO.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt index 05e0258..4ecd20d 100644 --- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt +++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSubjectDAO.kt @@ -19,7 +19,7 @@ import kotlinx.coroutines.tasks.await import javax.inject.Inject import kotlin.collections.count -class FirebaseSubjectDAO @Inject constructor( +class FireBaseSubjectDAO @Inject constructor( private val firestore: FirebaseFirestore, private val auth: AccountDAO, private val taskDAO: TaskDAO, @@ -50,7 +50,7 @@ class FirebaseSubjectDAO @Inject constructor( override suspend fun archiveSubject(subject: Subject) { currentUserSubjectsCollection().document(subject.id).update(SubjectDocument.archived, true) currentUserSubjectsCollection().document(subject.id) - .collection(FirebaseCollections.TASK_COLLECTION) + .collection(FireBaseCollections.TASK_COLLECTION) .taskNotArchived() .get().await() .documents @@ -75,16 +75,16 @@ class FirebaseSubjectDAO @Inject constructor( } private fun currentUserSubjectsCollection(): CollectionReference = - firestore.collection(FirebaseCollections.USER_COLLECTION) + firestore.collection(FireBaseCollections.USER_COLLECTION) .document(auth.currentUserId) - .collection(FirebaseCollections.SUBJECT_COLLECTION) + .collection(FireBaseCollections.SUBJECT_COLLECTION) private fun subjectTasksCollection(subject: Subject): CollectionReference = - firestore.collection(FirebaseCollections.USER_COLLECTION) + firestore.collection(FireBaseCollections.USER_COLLECTION) .document(auth.currentUserId) - .collection(FirebaseCollections.SUBJECT_COLLECTION) + .collection(FireBaseCollections.SUBJECT_COLLECTION) .document(subject.id) - .collection(FirebaseCollections.TASK_COLLECTION) + .collection(FireBaseCollections.TASK_COLLECTION) fun CollectionReference.subjectNotArchived(): Query = this.whereEqualTo(SubjectDocument.archived, false) From b97cbb70c42473c3a13abbe72e64bf8792ed1c2f Mon Sep 17 00:00:00 2001 From: Rune Dyselinck Date: Mon, 15 May 2023 23:45:38 +0200 Subject: [PATCH 4/5] Update FireBaseSubjectDAO.kt From e6956a5343b3a71b0ba58c369860dc7c8393b459 Mon Sep 17 00:00:00 2001 From: Rune Dyselinck Date: Mon, 15 May 2023 23:46:32 +0200 Subject: [PATCH 5/5] Update FireBaseSubjectDAO.kt