[Feature] #32 포킷 상세 및 포킷 추가/수정화면 API 연결

app/src/main/java/pokitmons/pokit/navigation/RootNavHost.kt

@@ -3,6 +3,7 @@ package pokitmons.pokit.navigation
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
@@ -62,7 +63,13 @@ fun RootNavHost(
  val viewModel: AddPokitViewModel = hiltViewModel()
  AddPokitScreenContainer(
  viewModel = viewModel,
- onBackPressed = navHostController::popBackStack
+ onBackPressed = navHostController::popBackStack,
+ onBackWithModifySuccess = { modifiedPokitId ->
+ navHostController.popBackStack()
+ navHostController.currentBackStackEntry
+ ?.savedStateHandle
+ ?.set("modified_pokit_id", modifiedPokitId)
+ }
  )
  }
 
@@ -71,6 +78,11 @@ fun RootNavHost(
  arguments = PokitDetail.arguments
  ) {
  val viewModel: PokitDetailViewModel = hiltViewModel()
+ LaunchedEffect(it) {
+ val pokitId = navHostController.currentBackStackEntry?.savedStateHandle?.get<Int>("modified_pokit_id") ?: return@LaunchedEffect
+ viewModel.getPokit(pokitId)
+ }
+
  PokitDetailScreenContainer(
  viewModel = viewModel,
  onBackPressed = navHostController::popBackStack,

core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/linkcard/LinkCard.kt

@@ -107,7 +107,9 @@ fun<T> LinkCard(
 
  Text(
  text = sub,
- style = PokitTheme.typography.detail2.copy(color = PokitTheme.colors.textTertiary)
+ style = PokitTheme.typography.detail2.copy(color = PokitTheme.colors.textTertiary),
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
  )
  }
 

core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/linkcard/Preview.kt

@@ -27,7 +27,7 @@ fun LinkCardPreview() {
  ) {
  LinkCard(
  title = "타이틀\n컴포스는 왜 이런가",
- sub = "2024.06.25. youtube.com",
+ sub = "2024.06.25. youtube.comyoutube.comyoutube.comyoutube",
  badgeText = "텍스트",
  painter = painterResource(id = R.drawable.icon_24_link),
  notRead = true,

data/build.gradle.kts

@@ -67,4 +67,8 @@ dependencies {
  implementation(libs.logging.interceptor)
 
  implementation(project(":domain"))
+
+ // mockk
+ testImplementation(libs.mockk)
+ androidTestImplementation(libs.mockk.android)
 }

data/src/main/java/pokitmons/pokit/data/api/LinkApi.kt

@@ -0,0 +1,22 @@
+package pokitmons.pokit.data.api
+
+import pokitmons.pokit.data.model.link.response.GetLinksResponse
+import pokitmons.pokit.domain.model.link.LinksSort
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface LinkApi {
+ @GET("content/{categoryId}")
+ suspend fun getLinks(
+ @Path("categoryId") categoryId: Int = 0,
+ @Query("page") page: Int = 0,
+ @Query("size") size: Int = 10,
+ @Query("sort") sort: List<String> = listOf(LinksSort.RECENT.value),
+ @Query("isRead") isRead: Boolean = false,
+ @Query("favorites") favorites: Boolean = false,
+ @Query("startDate") startDate: String? = null,
+ @Query("endDate") endDate: String? = null,
+ @Query("categoryIds") categoryIds: List<Int>? = null,
+ ): GetLinksResponse
+}

data/src/main/java/pokitmons/pokit/data/api/PokitApi.kt

@@ -0,0 +1,55 @@
+package pokitmons.pokit.data.api
+
+import pokitmons.pokit.data.model.pokit.request.CreatePokitRequest
+import pokitmons.pokit.data.model.pokit.request.ModifyPokitRequest
+import pokitmons.pokit.data.model.pokit.response.CreatePokitResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitCountResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitImagesResponseItem
+import pokitmons.pokit.data.model.pokit.response.GetPokitResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitsResponse
+import pokitmons.pokit.data.model.pokit.response.ModifyPokitResponse
+import pokitmons.pokit.domain.model.pokit.PokitsSort
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface PokitApi {
+ @GET("category")
+ suspend fun getPokits(
+ @Query("filterUncategorized") filterUncategorized: Boolean = true,
+ @Query("size") size: Int = 10,
+ @Query("page") page: Int = 0,
+ @Query("sort") sort: String = PokitsSort.RECENT.value,
+ ): GetPokitsResponse
+
+ @POST("category")
+ suspend fun createPokit(
+ @Body createPokitRequest: CreatePokitRequest,
+ ): CreatePokitResponse
+
+ @PATCH("category/{categoryId}")
+ suspend fun modifyPokit(
+ @Path("categoryId") categoryId: Int,
+ @Body modifyPokitRequest: ModifyPokitRequest,
+ ): ModifyPokitResponse
+
+ @GET("category/images")
+ suspend fun getPokitImages(): List<GetPokitImagesResponseItem>
+
+ @GET("category/{categoryId}")
+ suspend fun getPokit(
+ @Path("categoryId") categoryId: Int,
+ ): GetPokitResponse
+
+ @PUT("category/{categoryId}")
+ suspend fun deletePokit(
+ @Path("categoryId") categoryId: Int,
+ )
+
+ @GET("category/count")
+ suspend fun getPokitCount(): GetPokitCountResponse
+}

data/src/main/java/pokitmons/pokit/data/datasource/remote/link/LinkDataSource.kt

@@ -0,0 +1,18 @@
+package pokitmons.pokit.data.datasource.remote.link
+
+import pokitmons.pokit.data.model.link.response.GetLinksResponse
+import pokitmons.pokit.domain.model.link.LinksSort
+
+interface LinkDataSource {
+ suspend fun getLinks(
+ categoryId: Int = 0,
+ page: Int = 0,
+ size: Int = 10,
+ sort: List<String> = listOf(LinksSort.RECENT.value),
+ isRead: Boolean = false,
+ favorites: Boolean = false,
+ startDate: String? = null,
+ endDate: String? = null,
+ categoryIds: List<Int>? = null,
+ ): GetLinksResponse
+}

data/src/main/java/pokitmons/pokit/data/datasource/remote/link/RemoteLinkDataSource.kt

@@ -0,0 +1,33 @@
+package pokitmons.pokit.data.datasource.remote.link
+
+import pokitmons.pokit.data.api.LinkApi
+import pokitmons.pokit.data.model.link.response.GetLinksResponse
+import javax.inject.Inject
+
+class RemoteLinkDataSource @Inject constructor(
+ private val linkApi: LinkApi,
+) : LinkDataSource {
+ override suspend fun getLinks(
+ categoryId: Int,
+ page: Int,
+ size: Int,
+ sort: List<String>,
+ isRead: Boolean,
+ favorites: Boolean,
+ startDate: String?,
+ endDate: String?,
+ categoryIds: List<Int>?,
+ ): GetLinksResponse {
+ return linkApi.getLinks(
+ categoryId = categoryId,
+ page = page,
+ size = size,
+ sort = sort,
+ isRead = isRead,
+ favorites = favorites,
+ startDate = startDate,
+ endDate = endDate,
+ categoryIds = categoryIds
+ )
+ }
+}

data/src/main/java/pokitmons/pokit/data/datasource/remote/pokit/PokitDataSource.kt

@@ -0,0 +1,21 @@
+package pokitmons.pokit.data.datasource.remote.pokit
+
+import pokitmons.pokit.data.model.pokit.request.CreatePokitRequest
+import pokitmons.pokit.data.model.pokit.request.GetPokitsRequest
+import pokitmons.pokit.data.model.pokit.request.ModifyPokitRequest
+import pokitmons.pokit.data.model.pokit.response.CreatePokitResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitCountResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitImagesResponseItem
+import pokitmons.pokit.data.model.pokit.response.GetPokitResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitsResponse
+import pokitmons.pokit.data.model.pokit.response.ModifyPokitResponse
+
+interface PokitDataSource {
+ suspend fun getPokits(getPokitsRequest: GetPokitsRequest): GetPokitsResponse
+ suspend fun createPokit(createPokitRequest: CreatePokitRequest): CreatePokitResponse
+ suspend fun modifyPokit(pokitId: Int, modifyPokitRequest: ModifyPokitRequest): ModifyPokitResponse
+ suspend fun getPokitImages(): List<GetPokitImagesResponseItem>
+ suspend fun getPokit(pokitId: Int): GetPokitResponse
+ suspend fun deletePokit(pokitId: Int)
+ suspend fun getPokitCount(): GetPokitCountResponse
+}

data/src/main/java/pokitmons/pokit/data/datasource/remote/pokit/RemotePokitDataSource.kt

@@ -0,0 +1,50 @@
+package pokitmons.pokit.data.datasource.remote.pokit
+
+import pokitmons.pokit.data.api.PokitApi
+import pokitmons.pokit.data.model.pokit.request.CreatePokitRequest
+import pokitmons.pokit.data.model.pokit.request.GetPokitsRequest
+import pokitmons.pokit.data.model.pokit.request.ModifyPokitRequest
+import pokitmons.pokit.data.model.pokit.response.CreatePokitResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitCountResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitImagesResponseItem
+import pokitmons.pokit.data.model.pokit.response.GetPokitResponse
+import pokitmons.pokit.data.model.pokit.response.GetPokitsResponse
+import pokitmons.pokit.data.model.pokit.response.ModifyPokitResponse
+import javax.inject.Inject
+
+class RemotePokitDataSource @Inject constructor(
+ private val pokitApi: PokitApi,
+) : PokitDataSource {
+ override suspend fun getPokits(getPokitsRequest: GetPokitsRequest): GetPokitsResponse {
+ return pokitApi.getPokits(
+ filterUncategorized = getPokitsRequest.filterUncategoriezd,
+ size = getPokitsRequest.size,
+ page = getPokitsRequest.page,
+ sort = getPokitsRequest.sort.value
+ )
+ }
+
+ override suspend fun createPokit(createPokitRequest: CreatePokitRequest): CreatePokitResponse {
+ return pokitApi.createPokit(createPokitRequest = createPokitRequest)
+ }
+
+ override suspend fun modifyPokit(pokitId: Int, modifyPokitRequest: ModifyPokitRequest): ModifyPokitResponse {
+ return pokitApi.modifyPokit(categoryId = pokitId, modifyPokitRequest = modifyPokitRequest)
+ }
+
+ override suspend fun getPokitImages(): List<GetPokitImagesResponseItem> {
+ return pokitApi.getPokitImages()
+ }
+
+ override suspend fun getPokit(pokitId: Int): GetPokitResponse {
+ return pokitApi.getPokit(pokitId)
+ }
+
+ override suspend fun deletePokit(pokitId: Int) {
+ return pokitApi.deletePokit(pokitId)
+ }
+
+ override suspend fun getPokitCount(): GetPokitCountResponse {
+ return pokitApi.getPokitCount()
+ }
+}

data/src/main/java/pokitmons/pokit/data/di/link/LinkModule.kt

@@ -0,0 +1,23 @@
+package pokitmons.pokit.data.di.link
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import pokitmons.pokit.data.datasource.remote.link.LinkDataSource
+import pokitmons.pokit.data.datasource.remote.link.RemoteLinkDataSource
+import pokitmons.pokit.data.repository.link.LinkRepositoryImpl
+import pokitmons.pokit.domain.repository.link.LinkRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class LinkModule {
+ @Binds
+ @Singleton
+ abstract fun bindLinkRepository(linkRepositoryImpl: LinkRepositoryImpl): LinkRepository
+
+ @Binds
+ @Singleton
+ abstract fun bindLinkDataSource(linkDataSourceImpl: RemoteLinkDataSource): LinkDataSource
+}

data/src/main/java/pokitmons/pokit/data/di/network/NetworkModule.kt

@@ -10,6 +10,8 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import pokitmons.pokit.data.api.AuthApi
+import pokitmons.pokit.data.api.LinkApi
+import pokitmons.pokit.data.api.PokitApi
 import pokitmons.pokit.data.api.SettingApi
 import retrofit2.Retrofit
 import java.util.concurrent.TimeUnit
@@ -69,6 +71,16 @@ object NetworkModule {
  return retrofit.create(AuthApi::class.java)
  }
 
+ @Provides
+ fun providePokitService(retrofit: Retrofit): PokitApi {
+ return retrofit.create(PokitApi::class.java)
+ }
+
+ @Provides
+ fun provideLinkService(retrofit: Retrofit): LinkApi {
+ return retrofit.create(LinkApi::class.java)
+ }
+
  @Provides
  fun provideSettingService(retrofit: Retrofit): SettingApi {
  return retrofit.create(SettingApi::class.java)

data/src/main/java/pokitmons/pokit/data/di/pokit/PokitModule.kt

@@ -0,0 +1,23 @@
+package pokitmons.pokit.data.di.pokit
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import pokitmons.pokit.data.datasource.remote.pokit.PokitDataSource
+import pokitmons.pokit.data.datasource.remote.pokit.RemotePokitDataSource
+import pokitmons.pokit.data.repository.pokit.PokitRepositoryImpl
+import pokitmons.pokit.domain.repository.pokit.PokitRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class PokitModule {
+ @Binds
+ @Singleton
+ abstract fun bindPokitRepository(pokitRepositoryImpl: PokitRepositoryImpl): PokitRepository
+
+ @Binds
+ @Singleton
+ abstract fun bindPokitDataSource(pokitDataSourceImpl: RemotePokitDataSource): PokitDataSource
+}

data/src/main/java/pokitmons/pokit/data/mapper/link/LinkMapper.kt

@@ -0,0 +1,24 @@
+package pokitmons.pokit.data.mapper.link
+
+import pokitmons.pokit.data.model.link.response.GetLinksResponse
+import pokitmons.pokit.domain.model.link.Link
+
+object LinkMapper {
+ fun mapperToLinks(linksResponse: GetLinksResponse): List<Link> {
+ return linksResponse.data.map { data ->
+ Link(
+ id = data.contentId,
+ categoryId = data.category.categoryId,
+ categoryName = data.category.categoryName,
+ data = data.data,
+ domain = data.domain,
+ title = data.title,
+ memo = data.memo,
+ alertYn = data.alertYn,
+ createdAt = data.createdAt,
+ isRead = data.isRead,
+ thumbnail = data.thumbNail
+ )
+ }
+ }
+}