Merge pull request #191 from GSM-MSG/feature/#137_apply_activity_api_…

…query_string_and_naming

🔀 :: (#137) Activity API 변경사항, 컨벤션 적용

core/data/src/main/java/com/msg/data/repository/activity/ActivityRepository.kt

@@ -1,8 +1,8 @@
 package com.msg.data.repository.activity
 
 import com.msg.model.remote.model.activity.StudentActivityModel
-import com.msg.model.remote.response.activity.InquiryDetailStudentActivityInfoResponse
-import com.msg.model.remote.response.activity.InquiryStudentActivityListResponse
+import com.msg.model.remote.response.activity.GetDetailStudentActivityInfoResponse
+import com.msg.model.remote.response.activity.GetStudentActivityListResponse
 import kotlinx.coroutines.flow.Flow
 import java.util.UUID
 
@@ -13,8 +13,8 @@ interface ActivityRepository {
     suspend fun approveStudentActivityInfo(id: UUID): Flow<Unit>
     suspend fun rejectStudentActivityInfo(id: UUID): Flow<Unit>
     suspend fun deleteStudentActivityInfo(id: UUID): Flow<Unit>
-    suspend fun inquiryMyStudentActivityInfoList(page: Int, size: Int, sort: String): Flow<InquiryStudentActivityListResponse>
-    suspend fun inquiryStudentActivityInfoList(page: Int, size: Int, sort: String, id: UUID): Flow<InquiryStudentActivityListResponse>
-    suspend fun inquiryEntireStudentActivityInfoList(page: Int, size: Int, sort: String): Flow<InquiryStudentActivityListResponse>
-    suspend fun inquiryDetailStudentActivityInfo(id: UUID): Flow<InquiryDetailStudentActivityInfoResponse>
+    suspend fun getMyStudentActivityInfoList(page: Int, size: Int): Flow<GetStudentActivityListResponse>
+    suspend fun getStudentActivityInfoList(page: Int, size: Int, id: UUID): Flow<GetStudentActivityListResponse>
+    suspend fun getEntireStudentActivityInfoList(page: Int, size: Int): Flow<GetStudentActivityListResponse>
+    suspend fun getDetailStudentActivityInfo(id: UUID): Flow<GetDetailStudentActivityInfoResponse>
 }

core/data/src/main/java/com/msg/data/repository/activity/ActivityRepositoryImpl.kt

@@ -1,8 +1,8 @@
 package com.msg.data.repository.activity
 
 import com.msg.model.remote.model.activity.StudentActivityModel
-import com.msg.model.remote.response.activity.InquiryDetailStudentActivityInfoResponse
-import com.msg.model.remote.response.activity.InquiryStudentActivityListResponse
+import com.msg.model.remote.response.activity.GetDetailStudentActivityInfoResponse
+import com.msg.model.remote.response.activity.GetStudentActivityListResponse
 import com.msg.network.datasource.activity.ActivityDataSource
 import kotlinx.coroutines.flow.Flow
 import java.util.UUID
@@ -42,46 +42,40 @@ class ActivityRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun inquiryMyStudentActivityInfoList(
+    override suspend fun getMyStudentActivityInfoList(
         page: Int,
         size: Int,
-        sort: String
-    ): Flow<InquiryStudentActivityListResponse> {
-        return activityDataSource.inquiryMyStudentActivityInfoList(
+    ): Flow<GetStudentActivityListResponse> {
+        return activityDataSource.getMyStudentActivityInfoList(
             page = page,
             size = size,
-            sort = sort
         )
     }
 
-    override suspend fun inquiryStudentActivityInfoList(
+    override suspend fun getStudentActivityInfoList(
         page: Int,
         size: Int,
-        sort: String,
         id: UUID
-    ): Flow<InquiryStudentActivityListResponse> {
-        return activityDataSource.inquiryStudentActivityInfoList(
+    ): Flow<GetStudentActivityListResponse> {
+        return activityDataSource.getStudentActivityInfoList(
             page = page,
             size = size,
-            sort = sort,
             id = id
         )
     }
 
-    override suspend fun inquiryEntireStudentActivityInfoList(
+    override suspend fun getEntireStudentActivityInfoList(
         page: Int,
         size: Int,
-        sort: String
-    ): Flow<InquiryStudentActivityListResponse> {
-        return activityDataSource.inquiryEntireStudentActivityInfoList(
+    ): Flow<GetStudentActivityListResponse> {
+        return activityDataSource.getEntireStudentActivityInfoList(
             page = page,
             size = size,
-            sort = sort
         )
     }
 
-    override suspend fun inquiryDetailStudentActivityInfo(id: UUID): Flow<InquiryDetailStudentActivityInfoResponse> {
-        return activityDataSource.inquiryDetailStudentActivityInfo(
+    override suspend fun getDetailStudentActivityInfo(id: UUID): Flow<GetDetailStudentActivityInfoResponse> {
+        return activityDataSource.getDetailStudentActivityInfo(
             id = id
         )
     }

core/domain/src/main/java/com/msg/domain/activity/InquiryDetailStudentActivityInfoUseCase.kt → core/domain/src/main/java/com/msg/domain/activity/GetDetailStudentActivityInfoUseCase.kt

@@ -4,10 +4,10 @@ import com.msg.data.repository.activity.ActivityRepository
 import java.util.UUID
 import javax.inject.Inject
 
-class InquiryDetailStudentActivityInfoUseCase @Inject constructor(
+class GetDetailStudentActivityInfoUseCase @Inject constructor(
     private val activityRepository: ActivityRepository
 ) {
     suspend operator fun invoke(id: UUID) = runCatching {
-        activityRepository.inquiryDetailStudentActivityInfo(id = id)
+        activityRepository.getDetailStudentActivityInfo(id = id)
     }
 }

core/domain/src/main/java/com/msg/domain/activity/InquiryMyStudentActivityInfoListUseCase.kt → core/domain/src/main/java/com/msg/domain/activity/GetEntireStudentActivityInfoListUseCase.kt

@@ -3,14 +3,13 @@ package com.msg.domain.activity
 import com.msg.data.repository.activity.ActivityRepository
 import javax.inject.Inject
 
-class InquiryMyStudentActivityInfoListUseCase @Inject constructor(
+class GetEntireStudentActivityInfoListUseCase @Inject constructor(
     private val activityRepository: ActivityRepository
 ) {
-    suspend operator fun invoke(page: Int, size: Int, sort: String) = runCatching {
-        activityRepository.inquiryMyStudentActivityInfoList(
+    suspend operator fun invoke(page: Int, size: Int) = runCatching {
+        activityRepository.getEntireStudentActivityInfoList(
             page = page,
             size = size,
-            sort = sort
         )
     }
 }

core/domain/src/main/java/com/msg/domain/activity/InquiryEntireStudentActivityInfoListUseCase.kt → core/domain/src/main/java/com/msg/domain/activity/GetMyStudentActivityInfoListUseCase.kt

@@ -3,14 +3,13 @@ package com.msg.domain.activity
 import com.msg.data.repository.activity.ActivityRepository
 import javax.inject.Inject
 
-class InquiryEntireStudentActivityInfoListUseCase @Inject constructor(
+class GetMyStudentActivityInfoListUseCase @Inject constructor(
     private val activityRepository: ActivityRepository
 ) {
-    suspend operator fun invoke(page: Int, size: Int, sort: String) = runCatching {
-        activityRepository.inquiryEntireStudentActivityInfoList(
+    suspend operator fun invoke(page: Int, size: Int) = runCatching {
+        activityRepository.getMyStudentActivityInfoList(
             page = page,
             size = size,
-            sort = sort
         )
     }
 }

core/domain/src/main/java/com/msg/domain/activity/InquiryStudentActivityInfoListUseCase.kt → core/domain/src/main/java/com/msg/domain/activity/GetStudentActivityInfoListUseCase.kt

@@ -4,14 +4,13 @@ import com.msg.data.repository.activity.ActivityRepository
 import java.util.UUID
 import javax.inject.Inject
 
-class InquiryStudentActivityInfoListUseCase @Inject constructor(
+class GetStudentActivityInfoListUseCase @Inject constructor(
     private val activityRepository: ActivityRepository
 ) {
-    suspend operator fun invoke(page: Int, size: Int, sort: String, id: UUID) = runCatching {
-        activityRepository.inquiryStudentActivityInfoList(
+    suspend operator fun invoke(page: Int, size: Int, id: UUID) = runCatching {
+        activityRepository.getStudentActivityInfoList(
             page = page,
             size = size,
-            sort = sort,
             id = id
         )
     }

core/model/src/main/java/com/msg/model/remote/model/activity/InquiryStudentActivityModel.kt → core/model/src/main/java/com/msg/model/remote/model/activity/GetStudentActivityModel.kt

@@ -4,7 +4,7 @@ import com.msg.model.remote.enumdatatype.ApproveStatus
 import java.time.LocalDate
 import java.util.UUID
 
-data class InquiryStudentActivityModel (
+data class GetStudentActivityModel (
     val activityId: UUID,
     val title: String,
     val activityDate: LocalDate,

core/model/src/main/java/com/msg/model/remote/response/activity/InquiryDetailStudentActivityInfoResponse.kt → core/model/src/main/java/com/msg/model/remote/response/activity/GetDetailStudentActivityInfoResponse.kt

@@ -5,7 +5,7 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 import java.util.UUID
 
-data class InquiryDetailStudentActivityInfoResponse(
+data class GetDetailStudentActivityInfoResponse(
     val id: UUID,
     val title: String,
     val content: String,

core/model/src/main/java/com/msg/model/remote/response/activity/InquiryStudentActivityListResponse.kt → core/model/src/main/java/com/msg/model/remote/response/activity/GetStudentActivityListResponse.kt

@@ -1,9 +1,9 @@
 package com.msg.model.remote.response.activity
 
-import com.msg.model.remote.model.activity.InquiryStudentActivityModel
+import com.msg.model.remote.model.activity.GetStudentActivityModel
 
-data class InquiryStudentActivityListResponse (
-    val content: List<InquiryStudentActivityModel>,
+data class GetStudentActivityListResponse (
+    val content: List<GetStudentActivityModel>,
     val pageable: Pageable,
     val totalPages: Int,
     val totalElements: Int,

core/network/src/main/java/com/msg/network/api/ActivityAPI.kt

@@ -1,8 +1,8 @@
 package com.msg.network.api
 
 import com.msg.model.remote.model.activity.StudentActivityModel
-import com.msg.model.remote.response.activity.InquiryDetailStudentActivityInfoResponse
-import com.msg.model.remote.response.activity.InquiryStudentActivityListResponse
+import com.msg.model.remote.response.activity.GetDetailStudentActivityInfoResponse
+import com.msg.model.remote.response.activity.GetStudentActivityListResponse
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -40,29 +40,26 @@ interface ActivityAPI {
     )
 
     @GET("activity/my")
-    suspend fun inquiryMyStudentActivityInfoList(
+    suspend fun getMyStudentActivityInfoList(
         @Query("page") page: Int,
         @Query("size") size: Int,
-        @Query("sort") sort: String
-    ): InquiryStudentActivityListResponse
+    ): GetStudentActivityListResponse
 
     @GET("activity/{student_id}")
-    suspend fun inquiryStudentActivityInfoList(
+    suspend fun getStudentActivityInfoList(
         @Query("page") page: Int,
         @Query("size") size: Int,
-        @Query("sort") sort: String,
         @Path("student_id") id: UUID
-    ): InquiryStudentActivityListResponse
+    ): GetStudentActivityListResponse
 
     @GET("activity")
-    suspend fun inquiryEntireStudentActivityInfoList(
+    suspend fun getEntireStudentActivityInfoList(
         @Query("page") page: Int,
         @Query("size") size: Int,
-        @Query("sort") sort: String
-    ): InquiryStudentActivityListResponse
+    ): GetStudentActivityListResponse
 
     @GET("activity/{id}/detail")
-    suspend fun inquiryDetailStudentActivityInfo(
+    suspend fun getDetailStudentActivityInfo(
         @Path("id") id: UUID
-    ): InquiryDetailStudentActivityInfoResponse
+    ): GetDetailStudentActivityInfoResponse
 }

core/network/src/main/java/com/msg/network/datasource/activity/ActivityDataSource.kt

@@ -1,8 +1,8 @@
 package com.msg.network.datasource.activity
 
 import com.msg.model.remote.model.activity.StudentActivityModel
-import com.msg.model.remote.response.activity.InquiryDetailStudentActivityInfoResponse
-import com.msg.model.remote.response.activity.InquiryStudentActivityListResponse
+import com.msg.model.remote.response.activity.GetDetailStudentActivityInfoResponse
+import com.msg.model.remote.response.activity.GetStudentActivityListResponse
 import kotlinx.coroutines.flow.Flow
 import java.util.UUID
 
@@ -12,8 +12,8 @@ interface ActivityDataSource {
     suspend fun approveStudentActivityInfo(id: UUID): Flow<Unit>
     suspend fun rejectStudentActivityInfo(id: UUID): Flow<Unit>
     suspend fun deleteStudentActivityInfo(id: UUID): Flow<Unit>
-    suspend fun inquiryMyStudentActivityInfoList(page: Int, size: Int, sort: String): Flow<InquiryStudentActivityListResponse>
-    suspend fun inquiryStudentActivityInfoList(page: Int, size: Int, sort: String, id: UUID): Flow<InquiryStudentActivityListResponse>
-    suspend fun inquiryEntireStudentActivityInfoList(page: Int, size: Int, sort: String): Flow<InquiryStudentActivityListResponse>
-    suspend fun inquiryDetailStudentActivityInfo(id: UUID): Flow<InquiryDetailStudentActivityInfoResponse>
+    suspend fun getMyStudentActivityInfoList(page: Int, size: Int): Flow<GetStudentActivityListResponse>
+    suspend fun getStudentActivityInfoList(page: Int, size: Int, id: UUID): Flow<GetStudentActivityListResponse>
+    suspend fun getEntireStudentActivityInfoList(page: Int, size: Int): Flow<GetStudentActivityListResponse>
+    suspend fun getDetailStudentActivityInfo(id: UUID): Flow<GetDetailStudentActivityInfoResponse>
 }

core/network/src/main/java/com/msg/network/datasource/activity/ActivityDataSourceImpl.kt

@@ -1,8 +1,8 @@
 package com.msg.network.datasource.activity
 
 import com.msg.model.remote.model.activity.StudentActivityModel
-import com.msg.model.remote.response.activity.InquiryDetailStudentActivityInfoResponse
-import com.msg.model.remote.response.activity.InquiryStudentActivityListResponse
+import com.msg.model.remote.response.activity.GetDetailStudentActivityInfoResponse
+import com.msg.model.remote.response.activity.GetStudentActivityListResponse
 import com.msg.network.api.ActivityAPI
 import com.msg.network.util.BitgoeulApiHandler
 import kotlinx.coroutines.Dispatchers
@@ -55,47 +55,44 @@ class ActivityDataSourceImpl @Inject constructor(
         )
     }.flowOn(Dispatchers.IO)
 
-    override suspend fun inquiryMyStudentActivityInfoList(
+    override suspend fun getMyStudentActivityInfoList(
         page: Int,
         size: Int,
-        sort: String
-    ): Flow<InquiryStudentActivityListResponse> = flow {
+    ): Flow<GetStudentActivityListResponse> = flow {
         emit(
-            BitgoeulApiHandler<InquiryStudentActivityListResponse>()
-                .httpRequest { activityAPI.inquiryMyStudentActivityInfoList(page = page, size = size, sort = sort) }
+            BitgoeulApiHandler<GetStudentActivityListResponse>()
+                .httpRequest { activityAPI.getMyStudentActivityInfoList(page = page, size = size) }
                 .sendRequest()
         )
     }.flowOn(Dispatchers.IO)
 
-    override suspend fun inquiryStudentActivityInfoList(
+    override suspend fun getStudentActivityInfoList(
         page: Int,
         size: Int,
-        sort: String,
         id: UUID
-    ): Flow<InquiryStudentActivityListResponse> = flow {
+    ): Flow<GetStudentActivityListResponse> = flow {
         emit(
-            BitgoeulApiHandler<InquiryStudentActivityListResponse>()
-                .httpRequest { activityAPI.inquiryStudentActivityInfoList(page = page, size = size, sort = sort, id = id) }
+            BitgoeulApiHandler<GetStudentActivityListResponse>()
+                .httpRequest { activityAPI.getStudentActivityInfoList(page = page, size = size, id = id) }
                 .sendRequest()
         )
     }.flowOn(Dispatchers.IO)
 
-    override suspend fun inquiryEntireStudentActivityInfoList(
+    override suspend fun getEntireStudentActivityInfoList(
         page: Int,
         size: Int,
-        sort: String
-    ): Flow<InquiryStudentActivityListResponse> = flow {
+    ): Flow<GetStudentActivityListResponse> = flow {
         emit(
-            BitgoeulApiHandler<InquiryStudentActivityListResponse>()
-                .httpRequest { activityAPI.inquiryEntireStudentActivityInfoList(page = page, size = size, sort = sort) }
+            BitgoeulApiHandler<GetStudentActivityListResponse>()
+                .httpRequest { activityAPI.getEntireStudentActivityInfoList(page = page, size = size) }
                 .sendRequest()
         )
     }.flowOn(Dispatchers.IO)
 
-    override suspend fun inquiryDetailStudentActivityInfo(id: UUID): Flow<InquiryDetailStudentActivityInfoResponse> = flow {
+    override suspend fun getDetailStudentActivityInfo(id: UUID): Flow<GetDetailStudentActivityInfoResponse> = flow {
         emit(
-            BitgoeulApiHandler<InquiryDetailStudentActivityInfoResponse>()
-                .httpRequest { activityAPI.inquiryDetailStudentActivityInfo(id = id) }
+            BitgoeulApiHandler<GetDetailStudentActivityInfoResponse>()
+                .httpRequest { activityAPI.getDetailStudentActivityInfo(id = id) }
                 .sendRequest()
         )
     }.flowOn(Dispatchers.IO)

core/ui/src/main/java/com/msg/ui/StudentActivityCard.kt

@@ -21,14 +21,14 @@ import androidx.compose.ui.unit.dp
 import com.msg.design_system.theme.BitgoeulAndroidTheme
 import com.msg.model.remote.enumdatatype.ApproveStatus
 import Authority
-import com.msg.model.remote.model.activity.InquiryStudentActivityModel
+import com.msg.model.remote.model.activity.GetStudentActivityModel
 import com.msg.ui.util.toKoreanFormat
 import java.time.LocalDate
 import java.util.UUID
 
 @Composable
 fun StudentActivityCard(
-    data: InquiryStudentActivityModel,
+    data: GetStudentActivityModel,
     onClick: (UUID) -> Unit,
     role: Authority = Authority.ROLE_USER
 ) {
@@ -89,7 +89,7 @@ fun StudentActivityCard(
 @Composable
 fun StudentActivityCardPre() {
     StudentActivityCard(
-        data = InquiryStudentActivityModel(
+        data = GetStudentActivityModel(
             activityId = UUID.randomUUID(),
             title = "title",
             activityDate = LocalDate.now(),

core/ui/src/main/java/com/msg/ui/StudentActivityList.kt

@@ -8,12 +8,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.msg.design_system.theme.BitgoeulAndroidTheme
 import Authority
-import com.msg.model.remote.model.activity.InquiryStudentActivityModel
+import com.msg.model.remote.model.activity.GetStudentActivityModel
 import java.util.UUID
 
 @Composable
 fun StudentActivityList(
-    data: List<InquiryStudentActivityModel>,
+    data: List<GetStudentActivityModel>,
     onClick: (UUID) -> Unit,
     role: Authority
 ) {