From f6c6d103f641f9b9391b0426bae163a71777289b Mon Sep 17 00:00:00 2001 From: erik-everardo Date: Fri, 5 Jan 2024 23:54:20 -0600 Subject: [PATCH] cambios por api web: deja de enviar lastId al obtener comentarios cuando sea la primera pagina --- .../com/isolaatti/posting/comments/data/remote/CommentsApi.kt | 2 +- .../posting/comments/data/repository/CommentsRepositoryImpl.kt | 2 +- .../com/isolaatti/posting/comments/domain/CommentsRepository.kt | 2 +- .../isolaatti/posting/comments/domain/use_case/GetComments.kt | 2 +- .../posting/comments/presentation/CommentsViewModel.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/isolaatti/posting/comments/data/remote/CommentsApi.kt b/app/src/main/java/com/isolaatti/posting/comments/data/remote/CommentsApi.kt index c055644..b34ea34 100644 --- a/app/src/main/java/com/isolaatti/posting/comments/data/remote/CommentsApi.kt +++ b/app/src/main/java/com/isolaatti/posting/comments/data/remote/CommentsApi.kt @@ -13,7 +13,7 @@ interface CommentsApi { fun postComment(@Path("postId") postId: Long, @Body commentToPost: CommentToPostDto): Call @GET("Fetch/Post/{postId}/Comments") - fun getCommentsOfPosts(@Path("postId") postId: Long, @Query("lastId") lastId: Long, @Query("take") count: Int): Call + fun getCommentsOfPosts(@Path("postId") postId: Long, @Query("lastId") lastId: Long?, @Query("take") count: Int): Call @GET("Fetch/Comments/{commentId}") fun getComment(@Path("commentId") commentId: Long): Call diff --git a/app/src/main/java/com/isolaatti/posting/comments/data/repository/CommentsRepositoryImpl.kt b/app/src/main/java/com/isolaatti/posting/comments/data/repository/CommentsRepositoryImpl.kt index 3fb0563..5ad657b 100644 --- a/app/src/main/java/com/isolaatti/posting/comments/data/repository/CommentsRepositoryImpl.kt +++ b/app/src/main/java/com/isolaatti/posting/comments/data/repository/CommentsRepositoryImpl.kt @@ -14,7 +14,7 @@ import javax.inject.Inject class CommentsRepositoryImpl @Inject constructor(private val commentsApi: CommentsApi) : CommentsRepository { - override fun getComments(postId: Long, lastId: Long): Flow>> = flow { + override fun getComments(postId: Long, lastId: Long?): Flow>> = flow { try { emit(Resource.Loading()) val response = commentsApi.getCommentsOfPosts(postId, lastId, 15).awaitResponse() diff --git a/app/src/main/java/com/isolaatti/posting/comments/domain/CommentsRepository.kt b/app/src/main/java/com/isolaatti/posting/comments/domain/CommentsRepository.kt index 137f6df..39fb1de 100644 --- a/app/src/main/java/com/isolaatti/posting/comments/domain/CommentsRepository.kt +++ b/app/src/main/java/com/isolaatti/posting/comments/domain/CommentsRepository.kt @@ -6,7 +6,7 @@ import com.isolaatti.utils.Resource import kotlinx.coroutines.flow.Flow interface CommentsRepository { - fun getComments(postId: Long, lastId: Long): Flow>> + fun getComments(postId: Long, lastId: Long?): Flow>> fun getComment(commentId: Long): Flow> fun postComment(content: String, audioId: String?, postId: Long): Flow> fun editComment(commentId: Long, content: String, audioId: String?): Flow> diff --git a/app/src/main/java/com/isolaatti/posting/comments/domain/use_case/GetComments.kt b/app/src/main/java/com/isolaatti/posting/comments/domain/use_case/GetComments.kt index 3f79552..b3f053d 100644 --- a/app/src/main/java/com/isolaatti/posting/comments/domain/use_case/GetComments.kt +++ b/app/src/main/java/com/isolaatti/posting/comments/domain/use_case/GetComments.kt @@ -8,5 +8,5 @@ import javax.inject.Inject class GetComments @Inject constructor(private val commentsRepository: CommentsRepository) { operator fun invoke(postId: Long, lastId: Long? = null): Flow>> = - commentsRepository.getComments(postId, lastId ?: 0) + commentsRepository.getComments(postId, lastId) } \ No newline at end of file diff --git a/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsViewModel.kt b/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsViewModel.kt index 8b56619..20442eb 100644 --- a/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsViewModel.kt +++ b/app/src/main/java/com/isolaatti/posting/comments/presentation/CommentsViewModel.kt @@ -59,7 +59,7 @@ class CommentsViewModel @Inject constructor( getContent() } - private var lastId: Long = 0L + private var lastId: Long? = null fun getContent(refresh: Boolean = false) { viewModelScope.launch {