Update FireBaseSubjectDAO.kt
This commit is contained in:
		
							parent
							
								
									0a55771ece
								
							
						
					
					
						commit
						9bae6dbd23
					
				
					 1 changed files with 9 additions and 8 deletions
				
			
		|  | @ -1,5 +1,6 @@ | ||||||
| package be.ugent.sel.studeez.domain.implementation | 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.Subject | ||||||
| import be.ugent.sel.studeez.data.local.models.task.SubjectDocument | import be.ugent.sel.studeez.data.local.models.task.SubjectDocument | ||||||
| import be.ugent.sel.studeez.data.local.models.task.Task | import be.ugent.sel.studeez.data.local.models.task.Task | ||||||
|  | @ -18,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, | ||||||
|  | @ -49,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 | ||||||
|  | @ -74,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) | ||||||
|  |  | ||||||
		Reference in a new issue
	
	 Rune Dyselinck
						Rune Dyselinck