[ Feature ] 세션별 누적점수 화면 구현

buildSrc/src/main/java/com/yapp/buildsrc/Dependencies.kt

@@ -81,7 +81,7 @@ object Dependencies {
     }
 
     object Firebase {
-        const val CRASHLYTICS_GRADLE = "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
+        const val CRASHLYTICS_GRADLE = "com.google.firebase:firebase-crashlytics-gradle:2.9.5"
         const val COMMON = "com.google.firebase:firebase-common-ktx:20.0.0"
         const val BOM = "com.google.firebase:firebase-bom:29.1.0"
         const val CONFIG_KTX = "com.google.firebase:firebase-config-ktx"

common/src/main/java/com/yapp/common/theme/Type.kt

@@ -43,7 +43,7 @@ val AttendanceTypography = Typography(
     ),
     body1 = TextStyle(
         fontFamily = Pretendard,
-        fontWeight = FontWeight.Normal,
+        fontWeight = FontWeight.Medium,
         fontSize = 16.sp,
         lineHeight = 24.sp
     ),

data/src/main/java/com/yapp/data/datasource/MemberRemoteDataSource.kt

@@ -9,5 +9,5 @@ interface MemberRemoteDataSource {
     suspend fun getMember(id: Long): MemberEntity?
     suspend fun getMemberWithFlow(id: Long): Flow<MemberEntity?>
     suspend fun deleteMember(id: Long)
-    suspend fun getAllMember(): Flow<List<MemberEntity>>
+    fun getAllMember(): Flow<List<MemberEntity>>
 }

data/src/main/java/com/yapp/data/datasource/MemberRemoteDataSourceImpl.kt

@@ -87,7 +87,7 @@ class MemberRemoteDataSourceImpl @Inject constructor(
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override suspend fun getAllMember(): Flow<List<MemberEntity>> {
+    override fun getAllMember(): Flow<List<MemberEntity>> {
         return callbackFlow {
             val fsRef = fireStore.memberRef()
             val listener = fsRef.addSnapshotListener { snapshot, error ->

data/src/main/java/com/yapp/data/repository/MemberRepositoryImpl.kt

@@ -60,10 +60,10 @@ class MemberRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun getAllMember(): Flow<Result<List<Member>>> {
+    override fun getAllMember(): Flow<List<Member>> {
         return memberRemoteDataSource.getAllMember()
             .map { entities ->
-                Result.success(entities.map { it.toDomain() })
+                entities.map { it.toDomain() }
             }
     }
 

domain/src/main/java/com/yapp/domain/model/collections/AttendanceList.kt

@@ -39,10 +39,10 @@ class AttendanceList private constructor(
     }
 
     // 데이터를 변경하는 행위는 오로지 Domain에서만 가능하게끔 interal을 붙여주었다.
-    internal fun changeAttendanceType(sessionId: Int, changingAttendance: Attendance): AttendanceList {
+    internal fun changeAttendanceType(sessionId: Int, changingAttendance: Attendance.Status): AttendanceList {
         return this.value.map {
             if (it.sessionId == sessionId) {
-                return@map changingAttendance
+                return@map it.copy(status = changingAttendance)
             }
 
             return@map it

domain/src/main/java/com/yapp/domain/repository/MemberRepository.kt

@@ -9,5 +9,5 @@ interface MemberRepository {
     suspend fun getMember(id: Long): Result<Member?>
     suspend fun getMemberWithFlow(id: Long): Flow<Result<Member>>
     suspend fun deleteMember(id: Long): Result<Unit>
-    suspend fun getAllMember(): Flow<Result<List<Member>>>
+    fun getAllMember(): Flow<List<Member>>
 }

domain/src/main/java/com/yapp/domain/usecases/GetAllMemberUseCase.kt

@@ -10,7 +10,7 @@ class GetAllMemberUseCase @Inject constructor(
     private val memberRepository: MemberRepository,
 ) {
 
-    suspend operator fun invoke(): Flow<Result<List<Member>>> {
+    operator fun invoke(): Flow<List<Member>> {
         return memberRepository.getAllMember()
     }
 

domain/src/main/java/com/yapp/domain/usecases/MarkAttendanceUseCase.kt

@@ -16,16 +16,11 @@ class MarkAttendanceUseCase @Inject constructor(
         return localRepository.getMemberId().mapCatching { currentUserId: Long? ->
             require(currentUserId != null)
 
-            val markedAttendanceState = Attendance(
-                sessionId = checkedSession.sessionId,
-                status = checkAttendanceState(checkedSession.date)
-            )
-
             val currentMemberInfo = memberRepository.getMember(currentUserId).getOrThrow()
 
             currentMemberInfo!!.attendances.changeAttendanceType(
                 sessionId = checkedSession.sessionId,
-                changingAttendance = markedAttendanceState
+                changingAttendance = checkAttendanceState(checkedSession.date)
             ).also { updatedAttendanceList ->
                 memberRepository.setMember(member = currentMemberInfo.copy(attendances = updatedAttendanceList))
             }

domain/src/main/java/com/yapp/domain/usecases/SetMemberAttendanceUseCase.kt

@@ -13,12 +13,14 @@ class SetMemberAttendanceUseCase @Inject constructor(
         return memberRepository.getMember(params.memberId).mapCatching { targetMemeber ->
             require(targetMemeber != null)
 
+            if (targetMemeber.attendances[params.sessionId].status == params.changedAttendance) {
+                return@mapCatching
+            }
+
             val changedAttendances =  targetMemeber.attendances.changeAttendanceType(
                 sessionId = params.sessionId,
                 changingAttendance = params.changedAttendance
-            ).also {
-
-            }
+            )
 
             memberRepository.setMember(member = targetMemeber.copy(attendances = changedAttendances))
         }
@@ -32,7 +34,7 @@ class SetMemberAttendanceUseCase @Inject constructor(
     class Params(
         val memberId: Long,
         val sessionId: Int,
-        val changedAttendance: Attendance,
+        val changedAttendance: Attendance.Status,
     )
 
 }