Merge pull request #33 from SSU-Plector/feat/#32-dev-project-api-view

[Feat/#32 dev project api view]: 프로젝트, 개발자 API 붙이기, 데이터 핸들링
SSU-Plector · May 26, 2024 · 324cf41 · 324cf41
2 parents d1931ac + 05ed178
commit 324cf41
Show file tree

Hide file tree

Showing 52 changed files with 775 additions and 710 deletions.
diff --git a/core/common/src/main/java/com/zucchini/view/ViewExt.kt b/core/common/src/main/java/com/zucchini/view/ViewExt.kt
@@ -1,7 +1,12 @@
 package com.zucchini.view
 
+import android.app.Activity
+import android.content.Context
 import android.graphics.Rect
 import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 
@@ -36,3 +41,38 @@ class HorizontalSpaceItemDecoration(private val horizontalSpaceHeight: Int) :
         }
     }
 }
+
+fun Context.showShortToast(message: String) {
+    Toast.makeText(
+        this,
+        message,
+        Toast.LENGTH_SHORT,
+    ).show()
+}
+
+fun Fragment.hideKeyboard() {
+    view?.let { activity?.hideKeyboard(it) }
+}
+
+fun Activity.hideKeyboard() {
+    hideKeyboard(currentFocus ?: View(this))
+}
+
+fun Context.hideKeyboard(view: View) {
+    val inputMethodManager = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+    inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
+}
+
+inline fun View.setOnSingleClickListener(
+    delay: Long = 1000L,
+    crossinline block: (View) -> Unit,
+) {
+    var previousClickedTime = 0L
+    setOnClickListener { view ->
+        val clickedTime = System.currentTimeMillis()
+        if (clickedTime - previousClickedTime >= delay) {
+            block(view)
+            previousClickedTime = clickedTime
+        }
+    }
+}
diff --git a/core/network/src/main/java/com/sample/network/reponse/DevelopersDetailResponse.kt b/core/network/src/main/java/com/sample/network/reponse/DevelopersDetailResponse.kt
@@ -8,51 +8,51 @@ data class DevelopersDetailResponse(
     @SerialName("id")
     val id: Int,
     @SerialName("name")
-    val name: String,
+    val name: String?,
     @SerialName("shortIntro")
-    val shortIntro: String,
+    val shortIntro: String?,
     @SerialName("university")
-    val university: String,
+    val university: String?,
     @SerialName("major")
-    val major: String,
+    val major: String?,
     @SerialName("studentNumber")
-    val studentNumber: String,
+    val studentNumber: String?,
     @SerialName("email")
-    val email: String,
+    val email: String?,
     @SerialName("hits")
-    val hits: Int,
+    val hits: Int?,
     @SerialName("kakaoId")
-    val kakaoId: String,
+    val kakaoId: String?,
     @SerialName("githubLink")
-    val githubLink: String,
+    val githubLink: String?,
+    @SerialName("imageLink")
+    val imageLink: String?,
     @SerialName("projectList")
-    val projectsListInDevelopersDetail: List<ProjectsListInDevelopersDetail>,
+    val projectsListInDevelopersDetail: List<ProjectsListInDevelopersDetail>?,
     @SerialName("languageList")
-    val languageList: List<String>,
+    val languageList: List<String?>?,
     @SerialName("devToolList")
-    val devToolList: List<String>,
+    val devToolList: List<String?>?,
     @SerialName("techStackList")
-    val techStackList: List<String>,
+    val techStackList: List<String?>?,
     @SerialName("part1")
     val part1: String?,
     @SerialName("part2")
     val part2: String?,
     @SerialName("developer")
-    val developer: Boolean,
+    val developer: Boolean?,
 ) {
     @Serializable
     data class ProjectsListInDevelopersDetail(
         @SerialName("id")
         val id: Int,
         @SerialName("name")
-        val name: String,
+        val name: String?,
         @SerialName("imageLink")
-        val imageLink: String,
+        val imageLink: String?,
         @SerialName("shortIntro")
-        val shortIntro: String,
+        val shortIntro: String?,
         @SerialName("category")
-        val category: String,
-        @SerialName("hits")
-        val hits: Int,
+        val category: String?,
     )
 }
diff --git a/core/network/src/main/java/com/sample/network/reponse/DevelopersListResponse.kt b/core/network/src/main/java/com/sample/network/reponse/DevelopersListResponse.kt
@@ -19,15 +19,17 @@ data class DevelopersListResponse(
         @SerialName("id")
         val id: Int,
         @SerialName("name")
-        val name: String,
+        val name: String?,
         @SerialName("part1")
         val part1: String?,
         @SerialName("part2")
         val part2: String?,
         @SerialName("githubLink")
-        val githubLink: String,
+        val githubLink: String?,
         @SerialName("hits")
-        val hits: Int,
+        val hits: Int = 0,
+        @SerialName("imageLink")
+        val imageLink: String?,
     )
 }
 
diff --git a/core/network/src/main/java/com/sample/network/reponse/ProjectsDetailResponse.kt b/core/network/src/main/java/com/sample/network/reponse/ProjectsDetailResponse.kt
@@ -10,31 +10,31 @@ data class ProjectsDetailResponse(
     @SerialName("name")
     val name: String,
     @SerialName("imageLink")
-    val imageLink: String,
+    val imageLink: String?,
     @SerialName("developerList")
-    val developerList: List<DeveloperListInProjectDetail>,
+    val developerList: List<DeveloperListInProjectDetail>? = emptyList(),
     @SerialName("shortIntro")
-    val shortIntro: String,
+    val shortIntro: String?,
     @SerialName("longIntro")
-    val longIntro: String,
+    val longIntro: String?,
     @SerialName("category")
     val category: String,
     @SerialName("hits")
     val hits: Int,
     @SerialName("githubLink")
-    val githubLink: String,
+    val githubLink: String?,
     @SerialName("infoPageLink")
-    val infoPageLink: String,
+    val infoPageLink: String?,
     @SerialName("webLink")
-    val webLink: String,
+    val webLink: String?,
     @SerialName("appLink")
-    val appLink: String,
+    val appLink: String?,
     @SerialName("languageList")
-    val languageList: List<String>,
+    val languageList: List<String?>?,
     @SerialName("devToolList")
-    val devToolList: List<String>,
+    val devToolList: List<String?>?,
     @SerialName("techStackList")
-    val techStackList: List<String>,
+    val techStackList: List<String?>?,
 ) {
     @Serializable
     data class DeveloperListInProjectDetail(
@@ -43,6 +43,6 @@ data class ProjectsDetailResponse(
         @SerialName("name")
         val name: String,
         @SerialName("partList")
-        val partList: List<String>,
+        val partList: List<String?>,
     )
 }
diff --git a/core/network/src/main/java/com/sample/network/reponse/ProjectsListResponse.kt b/core/network/src/main/java/com/sample/network/reponse/ProjectsListResponse.kt
@@ -21,7 +21,7 @@ data class ProjectsListResponse(
         @SerialName("name")
         val name: String,
         @SerialName("imagePath")
-        val imagePath: String,
+        val imagePath: String?,
         @SerialName("shortIntro")
         val shortIntro: String,
         @SerialName("category")

diff --git a/core/network/src/main/java/com/sample/network/service/ProjectsService.kt b/core/network/src/main/java/com/sample/network/service/ProjectsService.kt
@@ -10,10 +10,10 @@ import retrofit2.http.Query
 interface ProjectsService {
     @GET("api/projects/list")
     suspend fun getProjectsListData(
-        @Query("searchString") searchString: String? = "",
-        @Query("category") category: String,
+        @Query("searchString") searchString: String?,
+        @Query("category") category: String?,
         @Query("sortType") sortType: String,
-        @Query("page") page: Int = 0,
+        @Query("page") page: Int,
     ): BaseResponse<ProjectsListResponse>
 
     @GET("api/projects/{projectId}")

diff --git a/data/src/main/java/com/zucchini/data/DevelopersRepositoryImpl.kt b/data/src/main/java/com/zucchini/data/DevelopersRepositoryImpl.kt
@@ -11,12 +11,12 @@ import javax.inject.Inject
 class DevelopersRepositoryImpl @Inject constructor(
     private val developersService: DevelopersService,
 ) : DevelopersRepository {
-    override suspend fun getDevelopersListData(): Result<DevelopersListModel> {
+    override suspend fun getDevelopersListData(page: Int, part: String?): Result<DevelopersListModel> {
         return runCatching {
             developersService.getDevelopersListData(
                 sortType = null,
-                part = null,
-                page = 0,
+                part = part,
+                page = page,
             ).data.toDevelopersListModel()
         }
     }

diff --git a/data/src/main/java/com/zucchini/data/ProjectsRepositoryImpl.kt b/data/src/main/java/com/zucchini/data/ProjectsRepositoryImpl.kt
@@ -11,13 +11,13 @@ import javax.inject.Inject
 class ProjectsRepositoryImpl @Inject constructor(
     private val projectsService: ProjectsService,
 ) : ProjectsRepository {
-    override suspend fun getProjectsListData(): Result<ProjectsListModel> {
+    override suspend fun getProjectsListData(searchString: String?, category: String?, sortType: String, page: Int): Result<ProjectsListModel> {
         return runCatching {
             projectsService.getProjectsListData(
-                searchString = "",
-                category = "SERVICE",
-                sortType = "recent",
-                page = 0,
+                searchString = searchString,
+                category = category,
+                sortType = sortType,
+                page = page,
             ).data.toProjectsListModel()
         }
     }

diff --git a/data/src/main/java/com/zucchini/mapper/DevelopersDetail.kt b/data/src/main/java/com/zucchini/mapper/DevelopersDetail.kt
@@ -1,18 +1,17 @@
 package com.zucchini.mapper
 
 import com.sample.network.reponse.DevelopersDetailResponse
-import com.zucchini.domain.model.DeveloperInfoInDetailModel
 import com.zucchini.domain.model.DevelopersDetailModel
+import com.zucchini.domain.model.ProjectInfoInDevDetailModel
 
 internal fun DevelopersDetailResponse.toDevelopersDetailModel(): DevelopersDetailModel {
-    val projectsListInDevelopersDetail = projectsListInDevelopersDetail.map { developerInfo ->
-        DeveloperInfoInDetailModel(
+    val projectsListInDevelopersDetail = projectsListInDevelopersDetail?.map { developerInfo ->
+        ProjectInfoInDevDetailModel(
             id = developerInfo.id,
             name = developerInfo.name,
             imageLink = developerInfo.imageLink,
             shortIntro = developerInfo.shortIntro,
             category = developerInfo.category,
-            hits = developerInfo.hits,
         )
     }
 
@@ -27,6 +26,7 @@ internal fun DevelopersDetailResponse.toDevelopersDetailModel(): DevelopersDetai
         hits = hits,
         kakaoId = kakaoId,
         githubLink = githubLink,
+        imageLink = imageLink,
         projectList = projectsListInDevelopersDetail,
         languageList = languageList,
         devToolList = devToolList,

diff --git a/data/src/main/java/com/zucchini/mapper/DevelopersList.kt b/data/src/main/java/com/zucchini/mapper/DevelopersList.kt
@@ -13,6 +13,7 @@ internal fun DevelopersListResponse.toDevelopersListModel(): DevelopersListModel
             part2 = dto.part2,
             githubLink = dto.githubLink,
             hits = dto.hits,
+            imageLink = dto.imageLink,
         )
     }
 

diff --git a/data/src/main/java/com/zucchini/mapper/ProjectsDetail.kt b/data/src/main/java/com/zucchini/mapper/ProjectsDetail.kt
@@ -1,15 +1,11 @@
 package com.zucchini.mapper
 
-import com.sample.network.reponse.DevelopersDetailResponse
 import com.sample.network.reponse.ProjectsDetailResponse
-import com.zucchini.domain.model.DeveloperInfoInDetailModel
-import com.zucchini.domain.model.DeveloperListInProjectDetail
-import com.zucchini.domain.model.DevelopersDetailModel
 import com.zucchini.domain.model.ProjectsDetailModel
 
 internal fun ProjectsDetailResponse.toProjectsDetailModel(): ProjectsDetailModel {
-    val developerListInProjectDetail = developerList.map { developerList ->
-        DeveloperListInProjectDetail(
+    val developerListInProjectDetail = developerList?.map { developerList ->
+        ProjectsDetailModel.DeveloperListInProjectDetail(
             id = developerList.id,
             name = developerList.name,
             partList = developerList.partList,
@@ -20,7 +16,7 @@ internal fun ProjectsDetailResponse.toProjectsDetailModel(): ProjectsDetailModel
         id = id,
         name = name,
         imageLink = imageLink,
-        developerList = developerListInProjectDetail,
+        developerList = developerListInProjectDetail ?: emptyList(),
         shortIntro = shortIntro,
         longIntro = longIntro,
         category = category,

diff --git a/domain/src/main/java/com/zucchini/domain/model/DevDetailProjectInfo.kt b/domain/src/main/java/com/zucchini/domain/model/DevDetailProjectInfo.kt
diff --git a/domain/src/main/java/com/zucchini/domain/model/DeveloperInfo.kt b/domain/src/main/java/com/zucchini/domain/model/DeveloperInfo.kt
diff --git a/domain/src/main/java/com/zucchini/domain/model/DevelopersDetailModel.kt b/domain/src/main/java/com/zucchini/domain/model/DevelopersDetailModel.kt
@@ -2,29 +2,29 @@ package com.zucchini.domain.model
 
 data class DevelopersDetailModel(
     val id: Int,
-    val name: String,
-    val shortIntro: String,
-    val university: String,
-    val major: String,
-    val studentNumber: String,
-    val email: String,
-    val hits: Int,
-    val kakaoId: String,
-    val githubLink: String,
-    val projectList: List<DeveloperInfoInDetailModel>,
-    val languageList: List<String>,
-    val devToolList: List<String>,
-    val techStackList: List<String>,
+    val name: String?,
+    val shortIntro: String?,
+    val university: String?,
+    val major: String?,
+    val studentNumber: String?,
+    val email: String?,
+    val hits: Int?,
+    val kakaoId: String?,
+    val githubLink: String?,
+    val imageLink: String?,
+    val projectList: List<ProjectInfoInDevDetailModel>?,
+    val languageList: List<String?>?,
+    val devToolList: List<String?>?,
+    val techStackList: List<String?>?,
     val part1: String?,
     val part2: String?,
-    val developer: Boolean,
+    val developer: Boolean?,
 )
 
-data class DeveloperInfoInDetailModel(
+data class ProjectInfoInDevDetailModel(
     val id: Int,
-    val name: String,
-    val imageLink: String,
-    val shortIntro: String,
-    val category: String,
-    val hits: Int,
+    val name: String?,
+    val imageLink: String?,
+    val shortIntro: String?,
+    val category: String?,
 )