Update

Author: ShiftHackZ

data/src/main/java/com/shifthackz/joyreactor/data/datasource/local/PostsLocalDataSource.kt

@@ -39,8 +39,8 @@ internal class PostsLocalDataSource(
         contentDao.upsertList(posts.map(Post::toContentEntities).flatten())
     }
 
-    override suspend fun getPost(id: String): Post {
-        return postDao.queryById(id).let(FullPostDto::toDomain)
+    override suspend fun getPost(id: String): Result<Post> = runCatching {
+        postDao.queryById(id).let(FullPostDto::toDomain)
     }
 
     private suspend fun saveAuthors(authors: List<Author>) {

data/src/main/java/com/shifthackz/joyreactor/data/datasource/remote/CommentsRemoteDataSource.kt

@@ -8,7 +8,7 @@ class CommentsRemoteDataSource(
     private val commentsParser: CommentsParser,
 ) : CommentsDataSource.Remote {
 
-    override suspend fun fetchComments(postId: String): List<Comment> {
+    override suspend fun fetchComments(postId: String): Result<List<Comment>> {
         return commentsParser.fetchComments(postId)
     }
 }

data/src/main/java/com/shifthackz/joyreactor/data/datasource/remote/PostsRemoteDataSource.kt

@@ -9,7 +9,7 @@ internal class PostsRemoteDataSource(
     private val postsParser: PostsParser,
 ) : PostsDataSource.Remote {
 
-    override suspend fun fetchPage(url: String): PagePayload<Post> {
+    override suspend fun fetchPage(url: String): Result<PagePayload<Post>> {
         return postsParser.fetchPage(url)
     }
 }

data/src/main/java/com/shifthackz/joyreactor/data/mappers/PostMappers.kt

@@ -6,12 +6,16 @@ import com.shifthackz.joyreactor.storage.db.dto.FullPostDto
 import com.shifthackz.joyreactor.storage.db.entity.ContentEntity
 import com.shifthackz.joyreactor.storage.db.entity.PostEntity
 import com.shifthackz.joyreactor.storage.db.entity.TagEntity
+import java.util.Date
 
 fun Post.toEntity(): PostEntity = with(this) {
     PostEntity(
         id = id,
         rating = rating,
         authorName = author.name,
+        estimatedCommentsCount = estimatedCommentsCount,
+        date = date.time,
+        url = url,
     )
 }
 
@@ -37,5 +41,8 @@ fun FullPostDto.toDomain(): Post = with(this) {
         tags = tags.map(TagEntity::toDomain),
         rating = post.rating,
         comments = emptyList(),
+        estimatedCommentsCount = post.estimatedCommentsCount,
+        date = Date(post.date),
+        url = post.url,
     )
 }

data/src/main/java/com/shifthackz/joyreactor/data/repository/CommentsRepositoryImpl.kt

@@ -8,7 +8,7 @@ internal class CommentsRepositoryImpl(
     private val commendsRds: CommentsDataSource.Remote,
 ) : CommentsRepository {
 
-    override suspend fun fetchComments(postId: String): List<Comment> {
+    override suspend fun fetchComments(postId: String): Result<List<Comment>> {
         return commendsRds.fetchComments(postId)
     }
 }

data/src/main/java/com/shifthackz/joyreactor/data/repository/PostsRepositoryImpl.kt

@@ -11,13 +11,14 @@ class PostsRepositoryImpl(
     private val postsLds: PostsDataSource.Local,
 ) : PostsRepository {
 
-    override suspend fun fetchPage(url: String): PagePayload<Post> = coroutineScope {
-        val page = postsRds.fetchPage(url)
-        postsLds.savePosts(page.data)
-        return@coroutineScope page
+    override suspend fun fetchPage(url: String): Result<PagePayload<Post>> = coroutineScope {
+        return@coroutineScope postsRds.fetchPage(url).getOrNull()?.let {
+            postsLds.savePosts(it.data)
+            Result.success(it)
+        } ?: Result.failure(IllegalStateException())
     }
 
-    override suspend fun getPost(id: String): Post {
+    override suspend fun getPost(id: String): Result<Post> {
         return postsLds.getPost(id)
     }
 }

domain/src/main/java/com/shifthackz/joyreactor/domain/datasource/CommentsDataSource.kt

@@ -5,6 +5,6 @@ import com.shifthackz.joyreactor.entity.Comment
 sealed interface CommentsDataSource {
 
     interface Remote {
-        suspend fun fetchComments(postId: String): List<Comment>
+        suspend fun fetchComments(postId: String): Result<List<Comment>>
     }
 }

domain/src/main/java/com/shifthackz/joyreactor/domain/datasource/PostsDataSource.kt

@@ -6,11 +6,11 @@ import com.shifthackz.joyreactor.entity.Post
 sealed interface PostsDataSource {
 
     interface Remote : PostsDataSource {
-        suspend fun fetchPage(url: String): PagePayload<Post>
+        suspend fun fetchPage(url: String): Result<PagePayload<Post>>
     }
 
     interface Local : PostsDataSource {
         suspend fun savePosts(posts: List<Post>)
-        suspend fun getPost(id: String): Post
+        suspend fun getPost(id: String): Result<Post>
     }
 }

domain/src/main/java/com/shifthackz/joyreactor/domain/repository/CommentsRepository.kt

@@ -3,5 +3,5 @@ package com.shifthackz.joyreactor.domain.repository
 import com.shifthackz.joyreactor.entity.Comment
 
 interface CommentsRepository {
-    suspend fun fetchComments(postId: String): List<Comment>
+    suspend fun fetchComments(postId: String): Result<List<Comment>>
 }

domain/src/main/java/com/shifthackz/joyreactor/domain/repository/PostsRepository.kt

@@ -4,6 +4,6 @@ import com.shifthackz.joyreactor.entity.PagePayload
 import com.shifthackz.joyreactor.entity.Post
 
 interface PostsRepository {
-    suspend fun fetchPage(url: String): PagePayload<Post>
-    suspend fun getPost(id: String): Post
+    suspend fun fetchPage(url: String): Result<PagePayload<Post>>
+    suspend fun getPost(id: String): Result<Post>
 }