Merge pull request #228 from mash-up-kr/develop

[v1.0.8] 배포
mash-up-kr · Sep 21, 2024 · 51fc787 · 51fc787
2 parents 3dd772a + 6b61b88
commit 51fc787
Show file tree

Hide file tree

Showing 13 changed files with 174 additions and 64 deletions.
diff --git a/.github/workflows/auto-assignee.yaml b/.github/workflows/auto-assignee.yaml
@@ -0,0 +1,21 @@
+name: Auto Assignees
+
+on:
+  pull_request:
+    types:
+      - opened
+
+jobs:
+  add-auto-assignees:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: add assignees
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/mash-up-kr/Dorabangs_Android/issues/${{ github.event.number }}/assignees \
+            -d '{"assignees": ["${{ github.actor }}"]}'
diff --git a/.github/workflows/common-setup.yaml b/.github/workflows/common-setup.yaml
@@ -14,7 +14,11 @@ jobs:
       - name: Putting Json data
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
-        run: echo "$GOOGLE_SERVICES_JSON" > /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/google-services.json
+          GOOGLE_SERVICES_JSON_DEBUG: ${{ secrets.GOOGLE_SERVICES_JSON_DEBUG }}
+        run: |
+          mkdir /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/release
+          echo "$GOOGLE_SERVICES_JSON" > /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/release/google-services.json
+          echo "$GOOGLE_SERVICES_JSON_DEBUG" > /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/google-services.json
 
       - name: Access SERVER_BASE_URL
         run: |
@@ -27,3 +31,4 @@ jobs:
           path: |
             /home/runner/work/Dorabangs_Android/Dorabangs_Android/local.properties
             /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/google-services.json
+            /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/release/google-services.json
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,6 +34,7 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix = ".debug"
             isDebuggable = true
             isMinifyEnabled = false
             buildConfigField("Boolean", "DEBUG_MODE", "true")

diff --git a/...otlin/com/mashup/dorabangs/data/datasource/remote/api/AIClassificationRemoteDataSource.kt b/...otlin/com/mashup/dorabangs/data/datasource/remote/api/AIClassificationRemoteDataSource.kt
@@ -2,7 +2,6 @@ package com.mashup.dorabangs.data.datasource.remote.api
 
 import com.mashup.dorabangs.data.model.classification.AIClassificationAIPostListResponseModel
 import com.mashup.dorabangs.domain.model.AIClassificationFolders
-import com.mashup.dorabangs.domain.model.AIClassificationPosts
 
 interface AIClassificationRemoteDataSource {
 
@@ -23,7 +22,7 @@ interface AIClassificationRemoteDataSource {
         page: Int? = null,
         limit: Int? = null,
         order: String? = null,
-    ): AIClassificationPosts
+    ): AIClassificationAIPostListResponseModel
 
     suspend fun deletePostFromAIClassification(
         postId: String,

diff --git a/.../com/mashup/dorabangs/data/datasource/remote/impl/AIClassificationRemoteDataSourceImpl.kt b/.../com/mashup/dorabangs/data/datasource/remote/impl/AIClassificationRemoteDataSourceImpl.kt
@@ -6,7 +6,6 @@ import com.mashup.dorabangs.data.model.classification.AIClassificationAIPostList
 import com.mashup.dorabangs.data.model.toDomain
 import com.mashup.dorabangs.data.network.service.AIClassificationService
 import com.mashup.dorabangs.domain.model.AIClassificationFolders
-import com.mashup.dorabangs.domain.model.AIClassificationPosts
 import javax.inject.Inject
 
 class AIClassificationRemoteDataSourceImpl @Inject constructor(
@@ -38,13 +37,13 @@ class AIClassificationRemoteDataSourceImpl @Inject constructor(
         page: Int?,
         limit: Int?,
         order: String?,
-    ): AIClassificationPosts =
+    ): AIClassificationAIPostListResponseModel =
         service.getAIClassificationPostsByFolder(
             folderId = folderId,
             page = page,
             limit = limit,
             order = order,
-        ).toDomain()
+        )
 
     override suspend fun deletePostFromAIClassification(postId: String) =
         service.deletePostFromAIClassification(

diff --git a/data/src/main/kotlin/com/mashup/dorabangs/data/network/service/AIClassificationService.kt b/data/src/main/kotlin/com/mashup/dorabangs/data/network/service/AIClassificationService.kt
@@ -1,7 +1,6 @@
 package com.mashup.dorabangs.data.network.service
 
 import com.mashup.dorabangs.data.model.AIClassificationFoldersResponseModel
-import com.mashup.dorabangs.data.model.AIClassificationPostsResponseModel
 import com.mashup.dorabangs.data.model.AiClassificationMoveSinglePostRequestModel
 import com.mashup.dorabangs.data.model.classification.AIClassificationAIPostListResponseModel
 import retrofit2.http.Body
@@ -40,7 +39,7 @@ interface AIClassificationService {
         @Query("page") page: Int? = null,
         @Query("limit") limit: Int? = null,
         @Query("order") order: String? = null,
-    ): AIClassificationPostsResponseModel
+    ): AIClassificationAIPostListResponseModel
 
     @DELETE("classification/posts/{postId}")
     suspend fun deletePostFromAIClassification(

diff --git a/data/src/main/kotlin/com/mashup/dorabangs/data/repository/AIClassificationRepositoryImpl.kt b/data/src/main/kotlin/com/mashup/dorabangs/data/repository/AIClassificationRepositoryImpl.kt
@@ -5,7 +5,6 @@ import com.mashup.dorabangs.data.datasource.remote.api.AIClassificationRemoteDat
 import com.mashup.dorabangs.data.model.classification.toPagingDomain
 import com.mashup.dorabangs.data.utils.doraPager
 import com.mashup.dorabangs.domain.model.AIClassificationFolders
-import com.mashup.dorabangs.domain.model.AIClassificationPosts
 import com.mashup.dorabangs.domain.model.DoraSampleResponse
 import com.mashup.dorabangs.domain.model.classification.AIClassificationFeedPost
 import com.mashup.dorabangs.domain.repository.AIClassificationRepository
@@ -44,16 +43,19 @@ class AIClassificationRepositoryImpl @Inject constructor(
 
     override suspend fun getAIClassificationPostsByFolder(
         folderId: String,
-        page: Int?,
         limit: Int?,
         order: String?,
-    ): AIClassificationPosts =
-        remoteDataSource.getAIClassificationPostsByFolder(
-            folderId = folderId,
-            page = page,
-            limit = limit,
-            order = order,
-        )
+    ): Flow<PagingData<AIClassificationFeedPost>> =
+        doraPager(
+            apiExecutor = { page ->
+                remoteDataSource.getAIClassificationPostsByFolder(
+                    folderId = folderId,
+                    page = page,
+                    limit = limit,
+                    order = order,
+                ).toPagingDomain()
+            },
+        ).flow
 
     override suspend fun deletePostFromAIClassification(postId: String): DoraSampleResponse {
         return kotlin.runCatching {

diff --git a/domain/src/main/kotlin/com/mashup/dorabangs/domain/repository/AIClassificationRepository.kt b/domain/src/main/kotlin/com/mashup/dorabangs/domain/repository/AIClassificationRepository.kt
@@ -2,7 +2,6 @@ package com.mashup.dorabangs.domain.repository
 
 import androidx.paging.PagingData
 import com.mashup.dorabangs.domain.model.AIClassificationFolders
-import com.mashup.dorabangs.domain.model.AIClassificationPosts
 import com.mashup.dorabangs.domain.model.DoraSampleResponse
 import com.mashup.dorabangs.domain.model.classification.AIClassificationFeedPost
 import kotlinx.coroutines.flow.Flow
@@ -22,10 +21,9 @@ interface AIClassificationRepository {
 
     suspend fun getAIClassificationPostsByFolder(
         folderId: String,
-        page: Int? = null,
         limit: Int? = null,
         order: String? = null,
-    ): AIClassificationPosts
+    ): Flow<PagingData<AIClassificationFeedPost>>
 
     suspend fun deletePostFromAIClassification(
         postId: String,

diff --git a/...shup/dorabangs/domain/usecase/aiclassification/GetAIClassificationPostsByFolderUseCase.kt b/...shup/dorabangs/domain/usecase/aiclassification/GetAIClassificationPostsByFolderUseCase.kt
@@ -10,13 +10,11 @@ class GetAIClassificationPostsByFolderUseCase @Inject constructor(
 
     suspend operator fun invoke(
         folderId: String,
-        page: Int? = null,
         limit: Int? = null,
         order: Sort? = null,
     ) =
         aiClassificationRepository.getAIClassificationPostsByFolder(
             folderId = folderId,
-            page = page,
             limit = limit,
             order = order?.query,
         )

diff --git a/...lassification/src/main/java/com/mashup/feature/classification/ClassificationListScreen.kt b/...lassification/src/main/java/com/mashup/feature/classification/ClassificationListScreen.kt
@@ -55,26 +55,22 @@ fun ClassificationListScreen(
             pagingList[idx]?.let { item ->
                 when (item) {
                     is FeedUiModel.DoraChipUiModel -> {
-                        if (state.selectedFolder == item.title || state.selectedFolder == "전체") {
-                            ClassificationFolderMove(
-                                selectedFolder = item.title,
-                                onClickAllItemMoveButton = { onClickAllItemMoveButton(item.folderId) },
-                                count = item.postCount,
-                            )
-                        }
+                        ClassificationFolderMove(
+                            selectedFolder = item.title,
+                            onClickAllItemMoveButton = { onClickAllItemMoveButton(item.folderId) },
+                            count = item.postCount,
+                        )
                     }
 
                     is FeedUiModel.FeedCardUiModel -> {
-                        if (state.selectedFolder == item.category || state.selectedFolder == "전체") {
-                            ClassificationCardItem(
-                                idx = idx,
-                                lastIndex = pagingList.itemCount - 1,
-                                cardItem = item,
-                                onClickDeleteButton = onClickDeleteButton,
-                                onClickMoveButton = onClickMoveButton,
-                                onClickCardItem = onClickCardItem,
-                            )
-                        }
+                        ClassificationCardItem(
+                            idx = idx,
+                            lastIndex = pagingList.itemCount - 1,
+                            cardItem = item,
+                            onClickDeleteButton = onClickDeleteButton,
+                            onClickMoveButton = onClickMoveButton,
+                            onClickCardItem = onClickCardItem,
+                        )
                     }
                 }
             }

diff --git a/...ure/classification/src/main/java/com/mashup/feature/classification/ClassificationState.kt b/...ure/classification/src/main/java/com/mashup/feature/classification/ClassificationState.kt
@@ -4,7 +4,6 @@ import com.mashup.dorabangs.core.designsystem.component.chips.FeedUiModel
 
 data class ClassificationState(
     val chipState: ChipState = ChipState(),
-    val selectedFolder: String = "전체",
     val isLoading: Boolean = false,
 )