Merge pull request #47 from team-haribo/feature/46-write-the-logic-st…

…udent-management 🔀 :: (#46) - write the logic student management
team-haribo · Feb 12, 2024 · 4766bbb · 4766bbb
2 parents 5af08ea + 7282ab1
commit 4766bbb
Show file tree

Hide file tree

Showing 24 changed files with 719 additions and 116 deletions.
diff --git a/core/data/src/main/java/com/goms/data/repository/council/CouncilRepository.kt b/core/data/src/main/java/com/goms/data/repository/council/CouncilRepository.kt
@@ -1,11 +1,30 @@
 package com.goms.data.repository.council
 
+import com.goms.model.request.council.AuthorityRequest
 import com.goms.model.response.council.LateResponse
+import com.goms.model.response.council.StudentResponse
 import kotlinx.coroutines.flow.Flow
 import kotlinx.datetime.LocalDate
 import java.util.UUID
 
 interface CouncilRepository {
+    suspend fun getStudentList(): Flow<List<StudentResponse>>
+
+    suspend fun changeAuthority(body: AuthorityRequest): Flow<Unit>
+
+    suspend fun setBlackList(accountIdx: UUID): Flow<Unit>
+
+    suspend fun deleteBlackList(accountIdx: UUID): Flow<Unit>
+
+    suspend fun studentSearch(
+        grade: Int?,
+        gender: String?,
+        major: String?,
+        name: String?,
+        isBlackList: Boolean?,
+        authority: String?
+    ): Flow<List<StudentResponse>>
+
     suspend fun deleteOuting(accountIdx: UUID): Flow<Unit>
 
     suspend fun getLateList(date: LocalDate): Flow<List<LateResponse>>

diff --git a/core/data/src/main/java/com/goms/data/repository/council/CouncilRepositoryImpl.kt b/core/data/src/main/java/com/goms/data/repository/council/CouncilRepositoryImpl.kt
@@ -1,6 +1,8 @@
 package com.goms.data.repository.council
 
+import com.goms.model.request.council.AuthorityRequest
 import com.goms.model.response.council.LateResponse
+import com.goms.model.response.council.StudentResponse
 import com.goms.network.datasource.council.CouncilDataSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.datetime.LocalDate
@@ -10,6 +12,40 @@ import javax.inject.Inject
 class CouncilRepositoryImpl @Inject constructor(
     private val remoteCouncilDataSource: CouncilDataSource
 ) : CouncilRepository {
+    override suspend fun getStudentList(): Flow<List<StudentResponse>> {
+        return remoteCouncilDataSource.getStudentList()
+    }
+
+    override suspend fun changeAuthority(body: AuthorityRequest): Flow<Unit> {
+        return remoteCouncilDataSource.changeAuthority(body = body)
+    }
+
+    override suspend fun setBlackList(accountIdx: UUID): Flow<Unit> {
+        return remoteCouncilDataSource.setBlackList(accountIdx = accountIdx)
+    }
+
+    override suspend fun deleteBlackList(accountIdx: UUID): Flow<Unit> {
+        return remoteCouncilDataSource.deleteBlackList(accountIdx = accountIdx)
+    }
+
+    override suspend fun studentSearch(
+        grade: Int?,
+        gender: String?,
+        major: String?,
+        name: String?,
+        isBlackList: Boolean?,
+        authority: String?
+    ): Flow<List<StudentResponse>> {
+        return remoteCouncilDataSource.studentSearch(
+            grade = grade,
+            gender = gender,
+            major = major,
+            name = name,
+            isBlackList = isBlackList,
+            authority = authority
+        )
+    }
+
     override suspend fun deleteOuting(accountIdx: UUID): Flow<Unit> {
         return remoteCouncilDataSource.deleteOuting(accountIdx = accountIdx)
     }

diff --git a/...src/main/java/com/goms/design_system/component/bottomsheet/MultipleSelectorBottomSheet.kt b/...src/main/java/com/goms/design_system/component/bottomsheet/MultipleSelectorBottomSheet.kt
@@ -43,6 +43,10 @@ fun MultipleSelectorBottomSheet(
     list3: List<String>,
     selected3: String,
     itemChange3: (String) -> Unit,
+    subTitle4: String,
+    list4: List<String>,
+    selected4: String,
+    itemChange4: (String) -> Unit,
     closeSheet: () -> Unit
 ) {
     var componentWidth by remember { mutableStateOf( 0.dp ) }
@@ -135,6 +139,27 @@ fun MultipleSelectorBottomSheet(
                         }
                     }
                 }
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(
+                    text = subTitle4,
+                    style = typography.titleSmall,
+                    fontWeight = FontWeight.SemiBold,
+                    color = colors.WHITE
+                )
+                LazyRow(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(16.dp)
+                ) {
+                    items(list4.size) {
+                        AdminBottomSheetButton(
+                            modifier = Modifier.widthIn((componentWidth - 16.dp * list4.lastIndex) / list4.size),
+                            text = list4[it],
+                            selected = selected4 == list4[it]
+                        ) {
+                            itemChange4(list4[it])
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/core/domain/src/main/java/com/goms/domain/council/ChangeAuthorityUseCase.kt b/core/domain/src/main/java/com/goms/domain/council/ChangeAuthorityUseCase.kt
@@ -0,0 +1,13 @@
+package com.goms.domain.council
+
+import com.goms.data.repository.council.CouncilRepository
+import com.goms.model.request.council.AuthorityRequest
+import javax.inject.Inject
+
+class ChangeAuthorityUseCase @Inject constructor(
+    private val councilRepository: CouncilRepository
+) {
+    suspend operator fun invoke(body: AuthorityRequest) = kotlin.runCatching {
+        councilRepository.changeAuthority(body = body)
+    }
+}
diff --git a/core/domain/src/main/java/com/goms/domain/council/DeleteBlackListUseCase.kt b/core/domain/src/main/java/com/goms/domain/council/DeleteBlackListUseCase.kt
@@ -0,0 +1,13 @@
+package com.goms.domain.council
+
+import com.goms.data.repository.council.CouncilRepository
+import java.util.UUID
+import javax.inject.Inject
+
+class DeleteBlackListUseCase @Inject constructor(
+    private val councilRepository: CouncilRepository
+) {
+    suspend operator fun invoke(accountIdx: UUID) = kotlin.runCatching {
+        councilRepository.deleteBlackList(accountIdx = accountIdx)
+    }
+}
diff --git a/core/domain/src/main/java/com/goms/domain/council/GetStudentListUseCase.kt b/core/domain/src/main/java/com/goms/domain/council/GetStudentListUseCase.kt
@@ -0,0 +1,13 @@
+package com.goms.domain.council
+
+import com.goms.data.repository.council.CouncilRepository
+import com.goms.model.response.council.StudentResponse
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GetStudentListUseCase @Inject constructor(
+    private val councilRepository: CouncilRepository
+) {
+    suspend operator fun invoke(): Flow<List<StudentResponse>> =
+        councilRepository.getStudentList()
+}
diff --git a/core/domain/src/main/java/com/goms/domain/council/SetBlackListUseCase.kt b/core/domain/src/main/java/com/goms/domain/council/SetBlackListUseCase.kt
@@ -0,0 +1,13 @@
+package com.goms.domain.council
+
+import com.goms.data.repository.council.CouncilRepository
+import java.util.UUID
+import javax.inject.Inject
+
+class SetBlackListUseCase @Inject constructor(
+    private val councilRepository: CouncilRepository
+) {
+    suspend operator fun invoke(accountIdx: UUID) = kotlin.runCatching {
+        councilRepository.setBlackList(accountIdx = accountIdx)
+    }
+}
diff --git a/core/domain/src/main/java/com/goms/domain/council/StudentSearchUseCase.kt b/core/domain/src/main/java/com/goms/domain/council/StudentSearchUseCase.kt
@@ -0,0 +1,27 @@
+package com.goms.domain.council
+
+import com.goms.data.repository.council.CouncilRepository
+import com.goms.model.response.council.StudentResponse
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class StudentSearchUseCase @Inject constructor(
+    private val councilRepository: CouncilRepository
+) {
+    suspend operator fun invoke(
+        grade: Int?,
+        gender: String?,
+        major: String?,
+        name: String?,
+        isBlackList: Boolean?,
+        authority: String?
+    ): Flow<List<StudentResponse>> =
+        councilRepository.studentSearch(
+            grade = grade,
+            gender = gender,
+            major = major,
+            name = name,
+            isBlackList = isBlackList,
+            authority = authority
+        )
+}
diff --git a/core/model/src/main/java/com/goms/model/enum/Class.kt b/core/model/src/main/java/com/goms/model/enum/Class.kt
diff --git a/core/model/src/main/java/com/goms/model/enum/Grade.kt b/core/model/src/main/java/com/goms/model/enum/Grade.kt
@@ -1,7 +1,7 @@
 package com.goms.model.enum
 
 enum class Grade(val value: String, val enum: Int) {
-    FIRST_GRADE("1학년", 1),
-    SECOND_GRADE("2학년", 2),
-    THIRD_GRADE("3학년", 3)
+    FIRST_GRADE("1학년", 8),
+    SECOND_GRADE("2학년", 7),
+    THIRD_GRADE("3학년", 6)
 }
diff --git a/core/model/src/main/java/com/goms/model/request/council/AuthorityRequest.kt b/core/model/src/main/java/com/goms/model/request/council/AuthorityRequest.kt
@@ -0,0 +1,10 @@
+package com.goms.model.request.council
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class AuthorityRequest(
+    @Json(name = "accountIdx") val accountIdx: String,
+    @Json(name = "authority") val authority: String
+)
diff --git a/core/model/src/main/java/com/goms/model/response/council/StudentResponse.kt b/core/model/src/main/java/com/goms/model/response/council/StudentResponse.kt
@@ -0,0 +1,19 @@
+package com.goms.model.response.council
+
+import com.goms.model.enum.Authority
+import com.goms.model.enum.Gender
+import com.goms.model.enum.Major
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class StudentResponse(
+    @Json(name = "accountIdx") val accountIdx: String,
+    @Json(name = "name") val name: String,
+    @Json(name = "grade") val grade: Int,
+    @Json(name = "gender") val gender: Gender,
+    @Json(name = "major") val major: Major,
+    @Json(name = "profileUrl") val profileUrl: String?,
+    @Json(name = "authority") val authority: Authority,
+    @Json(name = "isBlackList") val isBlackList: Boolean
+)
diff --git a/core/network/src/main/java/com/goms/network/api/CouncilAPI.kt b/core/network/src/main/java/com/goms/network/api/CouncilAPI.kt
@@ -1,14 +1,47 @@
 package com.goms.network.api
 
+import com.goms.model.request.council.AuthorityRequest
 import com.goms.model.response.council.LateResponse
+import com.goms.model.response.council.StudentResponse
 import kotlinx.datetime.LocalDate
+import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 import java.util.UUID
 
 interface CouncilAPI {
+    @GET("/api/v2/student-council/accounts")
+    suspend fun getStudentList(): List<StudentResponse>
+
+    @PATCH("/api/v2/student-council/authority")
+    suspend fun changeAuthority(
+        @Body body: AuthorityRequest
+    )
+
+    @POST("/api/v2/student-council/black-list/{accountIdx}")
+    suspend fun setBlackList(
+        @Path("accountIdx") accountIdx: UUID
+    )
+
+    @DELETE("/api/v2/student-council/black-list/{accountIdx}")
+    suspend fun deleteBlackList(
+        @Path("accountIdx") accountIdx: UUID
+    )
+
+    @GET("/api/v2/student-council/search")
+    suspend fun studentSearch(
+        @Query("grade") grade: Int?,
+        @Query("gender") gender: String?,
+        @Query("major") major: String?,
+        @Query("name") name: String?,
+        @Query("isBlackList") isBlackList: Boolean?,
+        @Query("authority") authority: String?
+    ): List<StudentResponse>
+
     @DELETE("/api/v2/student-council/outing/{accountIdx}")
     suspend fun deleteOuting(
         @Path("accountIdx") accountIdx: UUID

diff --git a/core/network/src/main/java/com/goms/network/datasource/council/CouncilDataSource.kt b/core/network/src/main/java/com/goms/network/datasource/council/CouncilDataSource.kt
@@ -1,11 +1,30 @@
 package com.goms.network.datasource.council
 
+import com.goms.model.request.council.AuthorityRequest
 import com.goms.model.response.council.LateResponse
+import com.goms.model.response.council.StudentResponse
 import kotlinx.coroutines.flow.Flow
 import kotlinx.datetime.LocalDate
 import java.util.UUID
 
 interface CouncilDataSource {
+    suspend fun getStudentList(): Flow<List<StudentResponse>>
+
+    suspend fun changeAuthority(body: AuthorityRequest): Flow<Unit>
+
+    suspend fun setBlackList(accountIdx: UUID): Flow<Unit>
+
+    suspend fun deleteBlackList(accountIdx: UUID): Flow<Unit>
+
+    suspend fun studentSearch(
+        grade: Int?,
+        gender: String?,
+        major: String?,
+        name: String?,
+        isBlackList: Boolean?,
+        authority: String?
+    ): Flow<List<StudentResponse>>
+
     suspend fun deleteOuting(accountIdx: UUID): Flow<Unit>
 
     suspend fun getLateList(date: LocalDate): Flow<List<LateResponse>>