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

Unify DAO names

Browse source
This commit is contained in:
Tibo De Peuter 2023-05-10 12:38:58 +02:00
parent 81e777f21d
commit 4419c86b05
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
View file

@ -26,11 +26,11 @@ abstract class DatabaseModule {
abstract fun provideConfigurationService(impl: FirebaseConfigurationService): ConfigurationService abstract fun provideConfigurationService(impl: FirebaseConfigurationService): ConfigurationService
@Binds @Binds
abstract fun provideSessionDAO(impl: FireBaseSessionDAO): SessionDAO abstract fun provideSessionDAO(impl: FirebaseSessionDAO): SessionDAO
@Binds @Binds
abstract fun provideSubjectDAO(impl: FireBaseSubjectDAO): SubjectDAO abstract fun provideSubjectDAO(impl: FirebaseSubjectDAO): SubjectDAO
@Binds @Binds
abstract fun provideTaskDAO(impl: FireBaseTaskDAO): TaskDAO abstract fun provideTaskDAO(impl: FirebaseTaskDAO): TaskDAO
} }

2
app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseCollections.kt → app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseCollections.kt
View file

@ -1,6 +1,6 @@
package be.ugent.sel.studeez.domain.implementation package be.ugent.sel.studeez.domain.implementation
object FireBaseCollections { object FirebaseCollections {
const val SESSION_COLLECTION = "sessions" const val SESSION_COLLECTION = "sessions"
const val USER_COLLECTION = "users" const val USER_COLLECTION = "users"
const val TIMER_COLLECTION = "timers" const val TIMER_COLLECTION = "timers"

6
app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseSessionDAO.kt → app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseSessionDAO.kt
View file

@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import javax.inject.Inject import javax.inject.Inject
class FireBaseSessionDAO @Inject constructor( class FirebaseSessionDAO @Inject constructor(
private val firestore: FirebaseFirestore, private val firestore: FirebaseFirestore,
private val auth: AccountDAO private val auth: AccountDAO
) : SessionDAO { ) : SessionDAO {
@ -31,7 +31,7 @@ class FireBaseSessionDAO @Inject constructor(
} }
private fun currentUserSessionsCollection(): CollectionReference = private fun currentUserSessionsCollection(): CollectionReference =
firestore.collection(FireBaseCollections.USER_COLLECTION) firestore.collection(FirebaseCollections.USER_COLLECTION)
.document(auth.currentUserId) .document(auth.currentUserId)
.collection(FireBaseCollections.SESSION_COLLECTION) .collection(FirebaseCollections.SESSION_COLLECTION)
} }

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

@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import javax.inject.Inject import javax.inject.Inject
class FireBaseSubjectDAO @Inject constructor( class FirebaseSubjectDAO @Inject constructor(
private val firestore: FirebaseFirestore, private val firestore: FirebaseFirestore,
private val auth: AccountDAO, private val auth: AccountDAO,
) : SubjectDAO { ) : SubjectDAO {
@ -33,7 +33,7 @@ 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)
} }

8
app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseTaskDAO.kt → app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTaskDAO.kt
View file

@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import javax.inject.Inject import javax.inject.Inject
class FireBaseTaskDAO @Inject constructor( class FirebaseTaskDAO @Inject constructor(
private val firestore: FirebaseFirestore, private val firestore: FirebaseFirestore,
private val auth: AccountDAO, private val auth: AccountDAO,
) : TaskDAO { ) : TaskDAO {
@ -41,9 +41,9 @@ class FireBaseTaskDAO @Inject constructor(
} }
private fun selectedSubjectTasksCollection(subjectId: String): CollectionReference = private fun selectedSubjectTasksCollection(subjectId: String): 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(subjectId) .document(subjectId)
.collection(FireBaseCollections.TASK_COLLECTION) .collection(FirebaseCollections.TASK_COLLECTION)
} }

4
app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseTimerDAO.kt
View file

@ -48,8 +48,8 @@ class FirebaseTimerDAO @Inject constructor(
} }
private fun currentUserTimersCollection(): CollectionReference = private fun currentUserTimersCollection(): CollectionReference =
firestore.collection(FireBaseCollections.USER_COLLECTION) firestore.collection(FirebaseCollections.USER_COLLECTION)
.document(auth.currentUserId) .document(auth.currentUserId)
.collection(FireBaseCollections.TIMER_COLLECTION) .collection(FirebaseCollections.TIMER_COLLECTION)
} }