Merge remote-tracking branch 'origin/release' into develop

YAPP-admin · May 5, 2024 · 1604d9a · 1604d9a
2 parents 0c33446 + 0b936d9
commit 1604d9a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 33 deletions.
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -5,12 +5,11 @@ addReviewers: true
 addAssignees: author
 
 # A list of reviewers to be added to pull requests (GitHub user name)
-reviewers: 
-  - taeseongyun
+reviewers:
   - toastmeister1
   - jihee-dev
   - hoyahozz
 
 # A number of reviewers added to the pull request
 # Set 0 to add all the reviewers (default: 0)
-numberOfReviewers: 3
+numberOfReviewers: 2
diff --git a/data/src/main/java/com/yapp/data/model/types/PositionTypeEntity.kt b/data/src/main/java/com/yapp/data/model/types/PositionTypeEntity.kt
@@ -4,27 +4,35 @@ import com.yapp.domain.model.types.PositionType
 
 
 enum class PositionTypeEntity {
-    DEV_ANDROID, DEV_WEB, DEV_IOS, DEV_SERVER, DESIGNER, PROJECT_MANAGER;
+    PROJECT_MANAGER,
+    DESIGNER,
+    DEV_ANDROID,
+    DEV_IOS,
+    DEV_WEB,
+    DEV_SERVER,
+    DEV_FLUTTER;
 }
 
 fun PositionTypeEntity.toDomain(): PositionType {
     return when (this) {
+        PositionTypeEntity.PROJECT_MANAGER -> PositionType.PROJECT_MANAGER
+        PositionTypeEntity.DESIGNER -> PositionType.DESIGNER
         PositionTypeEntity.DEV_ANDROID -> PositionType.DEV_ANDROID
-        PositionTypeEntity.DEV_WEB -> PositionType.DEV_WEB
         PositionTypeEntity.DEV_IOS -> PositionType.DEV_IOS
+        PositionTypeEntity.DEV_WEB -> PositionType.DEV_WEB
         PositionTypeEntity.DEV_SERVER -> PositionType.DEV_SERVER
-        PositionTypeEntity.DESIGNER -> PositionType.DESIGNER
-        PositionTypeEntity.PROJECT_MANAGER -> PositionType.PROJECT_MANAGER
+        PositionTypeEntity.DEV_FLUTTER -> PositionType.DEV_FLUTTER
     }
 }
 
 fun PositionType.toData(): PositionTypeEntity {
     return when (this) {
+        PositionType.PROJECT_MANAGER -> PositionTypeEntity.PROJECT_MANAGER
+        PositionType.DESIGNER -> PositionTypeEntity.DESIGNER
         PositionType.DEV_ANDROID -> PositionTypeEntity.DEV_ANDROID
-        PositionType.DEV_WEB -> PositionTypeEntity.DEV_WEB
         PositionType.DEV_IOS -> PositionTypeEntity.DEV_IOS
+        PositionType.DEV_WEB -> PositionTypeEntity.DEV_WEB
         PositionType.DEV_SERVER -> PositionTypeEntity.DEV_SERVER
-        PositionType.DESIGNER -> PositionTypeEntity.DESIGNER
-        PositionType.PROJECT_MANAGER -> PositionTypeEntity.PROJECT_MANAGER
+        PositionType.DEV_FLUTTER -> PositionTypeEntity.DEV_FLUTTER
     }
-}
+}
diff --git a/domain/src/main/java/com/yapp/domain/model/types/PositionType.kt b/domain/src/main/java/com/yapp/domain/model/types/PositionType.kt
@@ -7,19 +7,21 @@ enum class PositionType(val value: String) {
     DEV_ANDROID("Android"),
     DEV_IOS("iOS"),
     DEV_WEB("Web"),
-    DEV_SERVER("Server");
+    DEV_SERVER("Server"),
+    DEV_FLUTTER("Flutter"),;
 
     companion object {
         fun of(value: String): PositionType {
             return when (value) {
+                "PROJECT_MANAGER" -> PROJECT_MANAGER
+                "DESIGNER" -> DESIGNER
                 "DEV_ANDROID" -> DEV_ANDROID
-                "DEV_WEB" -> DEV_WEB
                 "DEV_IOS" -> DEV_IOS
+                "DEV_WEB" -> DEV_WEB
                 "DEV_SERVER" -> DEV_SERVER
-                "DESIGNER" -> DESIGNER
-                "PROJECT_MANAGER" -> PROJECT_MANAGER
+                "DEV_FLUTTER" -> DEV_FLUTTER
                 else -> error("잘못된 PositionType 입니다.")
             }
         }
     }
-}
+}
diff --git a/domain/src/main/java/com/yapp/domain/model/types/TeamType.kt b/domain/src/main/java/com/yapp/domain/model/types/TeamType.kt
@@ -4,7 +4,9 @@ package com.yapp.domain.model.types
 enum class TeamType(val value: String) {
     ANDROID("Android"),
     IOS("iOS"),
+    APP("APP"),
     WEB("Web"),
+    FLUTTER("Flutter"),
     BASECAMP("BASECAMP"),
     NONE("None");
 
@@ -14,7 +16,9 @@ enum class TeamType(val value: String) {
                 "NONE" -> NONE
                 "ANDROID" -> ANDROID
                 "IOS" -> IOS
+                "APP" -> APP
                 "WEB" -> WEB
+                "FLUTTER" -> FLUTTER
                 "BASECAMP" -> BASECAMP
                 else -> error("$rawValue 에 해당하는 TeamType이 없습니다.")
             }

diff --git a/presentation/src/main/java/com/yapp/presentation/ui/member/score/MemberScoreViewModel.kt b/presentation/src/main/java/com/yapp/presentation/ui/member/score/MemberScoreViewModel.kt
@@ -8,6 +8,7 @@ import com.yapp.presentation.ui.member.score.MemberScoreContract.MemberScoreUiEv
 import com.yapp.presentation.ui.member.score.MemberScoreContract.MemberScoreUiSideEffect
 import com.yapp.presentation.ui.member.score.MemberScoreContract.MemberScoreUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -22,7 +23,7 @@ class MemberScoreViewModel @Inject constructor(
 
     private suspend fun fetchMemberScore() {
         setState { copy(loadState = MemberScoreUiState.LoadState.Loading) }
-        getMemberAttendanceListUseCase().collect { result ->
+        getMemberAttendanceListUseCase().collectLatest { result ->
             result.onSuccess { (sessions, attendances) ->
                 if (attendances.isEmpty()) {
                     setState { copy(loadState = MemberScoreUiState.LoadState.Error) }

diff --git a/...tion/src/main/java/com/yapp/presentation/ui/member/score/detail/SessionDetailViewModel.kt b/...tion/src/main/java/com/yapp/presentation/ui/member/score/detail/SessionDetailViewModel.kt
@@ -6,6 +6,7 @@ import com.yapp.common.base.BaseViewModel
 import com.yapp.domain.usecases.GetMemberAttendanceListUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
@@ -24,24 +25,21 @@ class SessionDetailViewModel @Inject constructor(
 
         if (sessionId != null) {
             viewModelScope.launch {
-                withContext(Dispatchers.IO) {
-                    getMemberAttendanceListUseCase().collect { result ->
-                        result.onSuccess { (sessions, attendances) ->
-                            if (attendances.isEmpty()) {
-                                setState { copy(loadState = SessionDetailContract.SessionDetailUiState.LoadState.Error) }
-                                return@onSuccess
-                            }
+                getMemberAttendanceListUseCase().collectLatest { result ->
+                    result.onSuccess { (sessions, attendances) ->
+                        if (attendances.isEmpty()) {
+                            setState { copy(loadState = SessionDetailContract.SessionDetailUiState.LoadState.Error) }
+                            return@onSuccess
+                        }
 
-                            setState {
-                                copy(
-                                    loadState = SessionDetailContract.SessionDetailUiState.LoadState.Idle,
-                                    session = sessions[sessionId] to attendances[sessionId]
-                                )
-                            }
+                        setState {
+                            copy(
+                                loadState = SessionDetailContract.SessionDetailUiState.LoadState.Idle,
+                                session = sessions[sessionId] to attendances[sessionId]
+                            )
                         }
-                            .onFailure {
-                                setState { copy(loadState = SessionDetailContract.SessionDetailUiState.LoadState.Error) }
-                            }
+                    }.onFailure {
+                        setState { copy(loadState = SessionDetailContract.SessionDetailUiState.LoadState.Error) }
                     }
                 }
             }