Merge pull request #67 from Team-B1ND/hotfix/64_category

Version Up And Student Filter
Team-B1ND · Apr 16, 2024 · e965525 · e965525
2 parents 5485317 + e3c4339
commit e965525
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/buildSrc/src/main/java/ProjectProperties.kt b/buildSrc/src/main/java/ProjectProperties.kt
@@ -1,8 +1,8 @@
 import org.gradle.api.JavaVersion
 
 object ProjectProperties {
- const val VERSION_CODE = 31
- const val VERSION_NAME = "2.2.0"
+ const val VERSION_CODE = 32
+ const val VERSION_NAME = "2.2.1"
 
  const val APPLICATION_ID = "kr.hs.dgsw.smartschool.dodamdodam_teacher"
  const val NAME_SPACE_DOMAIN = "kr.hs.dgsw.smartschool.domain"

diff --git a/...c/main/java/kr/hs/dgsw/smartschool/dodamdodam_teacher/features/point/vm/PointViewModel.kt b/...c/main/java/kr/hs/dgsw/smartschool/dodamdodam_teacher/features/point/vm/PointViewModel.kt
@@ -8,6 +8,7 @@ import kr.hs.dgsw.smartschool.dodamdodam_teacher.features.point.mvi.PointSideEff
 import kr.hs.dgsw.smartschool.dodamdodam_teacher.features.point.mvi.PointState
 import kr.hs.dgsw.smartschool.domain.model.classroom.Classroom
 import kr.hs.dgsw.smartschool.domain.model.member.MemberRole
+import kr.hs.dgsw.smartschool.domain.model.member.student.Student
 import kr.hs.dgsw.smartschool.domain.model.place.Place
 import kr.hs.dgsw.smartschool.domain.model.point.PointPlace
 import kr.hs.dgsw.smartschool.domain.model.point.PointReason
@@ -89,15 +90,18 @@ class PointViewModel @Inject constructor(
  Log.d("TAG", "getMembers: $it")
  reduce {
  state.copy(
- members = it.filter {
-  Log.d("TAG", "getMembers: ${it.role == MemberRole.STUDENT}")
+ members = it,
+ students = it.filter {
  it.role == MemberRole.STUDENT
+ }.map {
+ it.student ?: Student(0, "", 0, 0, 0)
  }
  )
  }
  delay(1000)
  if (state.students.isNotEmpty())
  makePointStudents()
+ Log.d("TAG", "getMembers: ${state.members}")
  }.onFailure {
  postSideEffect(PointSideEffect.ShowException(it))
  }