🔀(64) :: 검색 기능을 구현 및 파일구조 변경 등 리펙토링을 했습니다.

app/src/main/java/DMNavHost.kt

@@ -2,13 +2,9 @@ package com.kim.Dormitorymanager
 
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.remember
-import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
-import view.Mypage.navigation.MyScreen
 import view.login.navigation.LoginScreen
 import view.login.navigation.navigateToLogin
 
@@ -18,16 +14,8 @@ fun DMNavHost(
     navController: NavHostController = rememberNavController(),
     startDestination: String
 ){
-
-
     NavHost(navController = navController,
         startDestination =startDestination ){
         LoginScreen(navigateToHome = navController::navigateToLogin)
-
-
-        MyScreen(
-            navigationBack = navController::popBackStack,
-            onErrorToast = { throwable, message ->}
-        )
     }
 }

buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-5
+3
 0

data/src/main/java/local/datasource/LocalDataSource.kt

@@ -15,6 +15,10 @@ interface LocalDataSource {
 
     suspend fun deleteAccessTime()
 
+    fun getAuthority(): Flow<String>
+
+    suspend fun setAuthority(authority: String)
+
     fun getRefreshToken(): Flow<String>
 
     suspend fun setRefreshToken(refreshToken: String)

data/src/main/java/local/datasource/LocalDataSourceImpl.kt

@@ -11,12 +11,23 @@ import javax.inject.Inject
 class LocalDataSourceImpl @Inject constructor(
     private val dataStore: DataStore<Preferences>
 ): LocalDataSource {
-
     companion object AuthDataStoreKey {
         val ACCESS_TOKEN = stringPreferencesKey("access_token")
         val ACCESS_TIME = stringPreferencesKey("access_time")
         val REFRESH_TOKEN = stringPreferencesKey("refresh_token")
         val REFRESH_TIME = stringPreferencesKey("refresh_time")
+        val AUTHORITY = stringPreferencesKey("authority")
+    }
+
+    override fun getAuthority(): Flow<String> =
+        dataStore.data.map {
+            it[AUTHORITY] ?: ""
+    }
+
+    override suspend fun setAuthority(authority: String) {
+        dataStore.edit {
+            it[AUTHORITY] = authority
+        }
     }
 
     override fun getAccessToken(): Flow<String> = dataStore.data.map {

data/src/main/java/remote/api/auth/AdminAPI.kt

@@ -2,13 +2,14 @@ package remote.api.auth
 
 import remote.dto.admin.request.AdminCleanRequest
 import remote.dto.admin.request.AdminPenaltyRequest
+import remote.dto.admin.request.AuthorityRequest
 import remote.dto.admin.response.AdminPenaltyListResponse
 import remote.dto.admin.response.AdminPenaltyResponse
 import remote.dto.admin.response.AdminUserListResponse
 import remote.dto.admin.response.AdminUserResponse
-import remote.dto.users.response.UsersResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
@@ -18,12 +19,17 @@ interface AdminAPI {
     @GET("admin/users/list")
     suspend fun getUsers(): List<AdminUserListResponse>
 
+    @PATCH("admin/users/authority")
+    suspend fun changeAuthority(
+        @Body body: AuthorityRequest
+    )
+
     @GET("admin/users/list")
-    suspend fun getUsersName(
-        @Query("name") name: String?
+    suspend fun getStudentSearch(
+        @Query("name") name: String,
     ): List<AdminUserListResponse>
 
-    @POST("admin/user_id/penalty")
+    @POST("admin/{user_id}/penalty")
     suspend fun postPenalty(
         @Path("user_id") userId: String,
         @Body body: AdminPenaltyRequest
@@ -32,7 +38,7 @@ interface AdminAPI {
     @GET("admin/users/penalty-list")
     suspend fun getPenaltyList(): AdminPenaltyListResponse
 
-    @POST("admin/user_id/clean")
+    @POST("admin/{user_id}/clean")
     suspend fun postClean(
         @Path("user_id") userId: String,
         @Body body: AdminCleanRequest

data/src/main/java/remote/api/auth/NoticeAPI.kt

@@ -10,5 +10,4 @@ interface NoticeAPI {
     suspend fun getNotice(
         @Path("notice_id") noticeId: UUID,
     ): List<NoticeResponse>
-
 }

data/src/main/java/remote/datasource/admin/AdminDataSource.kt

@@ -3,29 +3,22 @@ package remote.datasource.admin
 import kotlinx.coroutines.flow.Flow
 import remote.dto.admin.request.AdminCleanRequest
 import remote.dto.admin.request.AdminPenaltyRequest
+import remote.dto.admin.request.AuthorityRequest
 import remote.dto.admin.response.AdminPenaltyListResponse
 import remote.dto.admin.response.AdminPenaltyResponse
 import remote.dto.admin.response.AdminUserListResponse
 import remote.dto.admin.response.AdminUserResponse
-import remote.dto.myrank.response.MyRankResponse
-import remote.dto.rank.response.RankResponse
 
 interface AdminDataSource {
     fun getUsers(): Flow<List<AdminUserListResponse>>
 
-    fun getUsersName(
-        name: String?
-    ): Flow<List<AdminUserListResponse>>
+    fun changeAuthority(body: AuthorityRequest): Flow<Unit>
 
-    fun postPenalty(
-        userId: String,
-        body: AdminPenaltyRequest
-    ): Flow<List<AdminPenaltyResponse>>
+    fun getStudentSearch(name: String): Flow<List<AdminUserListResponse>>
+
+    fun postPenalty(userId: String, body: AdminPenaltyRequest): Flow<List<AdminPenaltyResponse>>
 
     fun getPenaltyList(): Flow<AdminPenaltyListResponse>
 
-    fun postClean(
-        userId: String,
-        body: AdminCleanRequest
-    ): Flow<AdminUserResponse>
+    fun postClean(userId: String, body: AdminCleanRequest): Flow<AdminUserResponse>
 }

data/src/main/java/remote/datasource/admin/AdminDataSourceImpl.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.flow.Flow
 import remote.api.auth.AdminAPI
 import remote.dto.admin.request.AdminCleanRequest
 import remote.dto.admin.request.AdminPenaltyRequest
+import remote.dto.admin.request.AuthorityRequest
 import remote.dto.admin.response.AdminPenaltyListResponse
 import remote.dto.admin.response.AdminPenaltyResponse
 import remote.dto.admin.response.AdminUserListResponse
@@ -15,6 +16,12 @@ class AdminDataSourceImpl @Inject constructor(
     private val adminService: AdminAPI
 ): AdminDataSource
 {
+    override fun getStudentSearch(name: String): Flow<List<AdminUserListResponse>> =
+        performApiRequest { adminService.getStudentSearch(name = name) }
+
+    override fun changeAuthority(body: AuthorityRequest): Flow<Unit> =
+        performApiRequest { adminService.changeAuthority(body = body) }
+
     override  fun getUsers(): Flow<List<AdminUserListResponse>> =
         performApiRequest { adminService.getUsers() }
 
@@ -26,7 +33,4 @@ class AdminDataSourceImpl @Inject constructor(
 
     override fun getPenaltyList(): Flow<AdminPenaltyListResponse> =
         performApiRequest { adminService.getPenaltyList() }
-
-    override fun getUsersName(name: String?): Flow<List<AdminUserListResponse>> =
-        performApiRequest { adminService.getUsersName(name = name) }
 }

data/src/main/java/remote/dto/admin/request/AdminCleanRequest.kt

@@ -2,21 +2,29 @@ package remote.dto.admin.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import emumtype.Authority
 import model.admin.request.AdminCleanRequestModel
+import java.util.UUID
 
 @JsonClass(generateAdapter = true)
 data class AdminCleanRequest(
     @Json(name = "toDayClean") val toDayClean: String,
     @Json(name = "cleanPoint") val cleanPoint: Int,
+    @Json(name = "accountIdx") val accountIdx: UUID,
+    @Json(name = "authority") val authority: Authority,
 )
 
 fun AdminCleanRequestModel.toDto() = AdminCleanRequest(
     toDayClean = toDayClean,
     cleanPoint = cleanPoint,
+    accountIdx = accountIdx,
+    authority = authority
 )
 
 fun AdminCleanRequest.toModel() = AdminCleanRequestModel(
     toDayClean = toDayClean,
     cleanPoint = cleanPoint,
+    accountIdx = accountIdx,
+    authority = authority
 )
 

data/src/main/java/remote/dto/admin/request/AdminPenaltyRequest.kt

@@ -2,21 +2,28 @@ package remote.dto.admin.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import emumtype.Authority
 import model.admin.request.AdminPenaltyRequestModel
-import model.admin.response.AdminPenaltyResponseModel
+import java.util.UUID
 
 @JsonClass(generateAdapter = true)
 data class AdminPenaltyRequest (
     @Json(name = "penaltyPoint") val penaltyPoint: Int,
     @Json(name = "because") val because: String,
+    @Json(name = "accountIdx") val accountIdx: UUID,
+    @Json(name = "authority") val authority: Authority
 )
 
 fun AdminPenaltyRequestModel.toDto() = AdminPenaltyRequest(
     because = because,
     penaltyPoint = penaltyPoint,
+    accountIdx = accountIdx,
+    authority = authority
 )
 
 fun AdminPenaltyRequest.toModel() = AdminPenaltyRequestModel(
     because = because,
     penaltyPoint = penaltyPoint,
+    accountIdx = accountIdx,
+    authority = authority
 )