Tags search and other improvements

Author: ShiftHackZ

app/src/main/AndroidManifest.xml

@@ -24,5 +24,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
     </application>
 </manifest>

app/src/main/res/xml/file_provider_paths.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path
+        name="folder_images"
+        path="images/" />
+
+    <cache-path
+        name="folder_logs"
+        path="logs/" />
+
+    <external-path name="media" path="." />
+    <external-path name="external_files" path="."/>
+    <external-path name="external" path="."/>
+</paths>

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

@@ -0,0 +1,24 @@
+package com.shifthackz.joyreactor.data.datasource.local
+
+import com.shifthackz.joyreactor.data.mappers.toDomain
+import com.shifthackz.joyreactor.data.mappers.toEntity
+import com.shifthackz.joyreactor.domain.datasource.TagsDataSource
+import com.shifthackz.joyreactor.entity.Tag
+import com.shifthackz.joyreactor.storage.db.dao.TagDao
+import com.shifthackz.joyreactor.storage.db.entity.TagEntity
+
+internal class TagsLocalDataSource(
+    private val tagDao: TagDao,
+) : TagsDataSource.Local {
+
+    override suspend fun saveTags(tags: List<Tag>) {
+        return tagDao.upsertList(tags.map(Tag::toEntity))
+    }
+
+    override suspend fun searchTags(query: String): Result<List<Tag>> {
+        return tagDao
+            .search(query)
+            .map(TagEntity::toDomain)
+            .let(Result.Companion::success)
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.shifthackz.joyreactor.data.datasource.remote
+
+import com.shifthackz.joyreactor.domain.datasource.TagsDataSource
+import com.shifthackz.joyreactor.entity.PagePayload
+import com.shifthackz.joyreactor.entity.Tag
+import com.shifthackz.joyreactor.network.ApiImpl
+import com.shifthackz.joyreactor.network.parser.TagsParser
+
+internal class TagsRemoteDataSource(
+    private val tagsParser: TagsParser,
+    private val api: ApiImpl,
+) : TagsDataSource.Remote {
+
+    override suspend fun fetchPage(url: String): Result<PagePayload<Tag>> {
+        return tagsParser.fetchTags(url)
+    }
+
+    override suspend fun searchTags(query: String): Result<List<Tag>> {
+        return api.searchTag(query).let {
+            Result.success(it.map {
+                Tag(it, "https://joyreactor.cc/tag/$it", "")
+            })
+        } ?: Result.success(emptyList())
+    }
+}

data/src/main/java/com/shifthackz/joyreactor/data/di/Modules.kt

@@ -1,18 +1,23 @@
 package com.shifthackz.joyreactor.data.di
 
 import com.shifthackz.joyreactor.data.datasource.local.PostsLocalDataSource
+import com.shifthackz.joyreactor.data.datasource.local.TagsLocalDataSource
 import com.shifthackz.joyreactor.data.datasource.remote.CommentsRemoteDataSource
 import com.shifthackz.joyreactor.data.datasource.remote.PostsRemoteDataSource
 import com.shifthackz.joyreactor.data.datasource.remote.SectionsRemoteDataSource
+import com.shifthackz.joyreactor.data.datasource.remote.TagsRemoteDataSource
 import com.shifthackz.joyreactor.data.repository.CommentsRepositoryImpl
 import com.shifthackz.joyreactor.data.repository.PostsRepositoryImpl
 import com.shifthackz.joyreactor.data.repository.SectionsRepositoryImpl
+import com.shifthackz.joyreactor.data.repository.TagsRepositoryImpl
 import com.shifthackz.joyreactor.domain.datasource.CommentsDataSource
 import com.shifthackz.joyreactor.domain.datasource.PostsDataSource
 import com.shifthackz.joyreactor.domain.datasource.SectionsDataSource
+import com.shifthackz.joyreactor.domain.datasource.TagsDataSource
 import com.shifthackz.joyreactor.domain.repository.CommentsRepository
 import com.shifthackz.joyreactor.domain.repository.PostsRepository
 import com.shifthackz.joyreactor.domain.repository.SectionsRepository
+import com.shifthackz.joyreactor.domain.repository.TagsRepository
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -21,16 +26,19 @@ internal val remoteDataSourceModule = module {
     factoryOf(::PostsRemoteDataSource) bind PostsDataSource.Remote::class
     factoryOf(::CommentsRemoteDataSource) bind CommentsDataSource.Remote::class
     factoryOf(::SectionsRemoteDataSource) bind SectionsDataSource.Remote::class
+    factoryOf(::TagsRemoteDataSource) bind TagsDataSource.Remote::class
 }
 
 internal val localDataSourceModule = module {
     factoryOf(::PostsLocalDataSource) bind PostsDataSource.Local::class
+    factoryOf(::TagsLocalDataSource) bind TagsDataSource.Local::class
 }
 
 internal val repositoryModule = module {
     factoryOf(::PostsRepositoryImpl) bind PostsRepository::class
     factoryOf(::CommentsRepositoryImpl) bind CommentsRepository::class
     factoryOf(::SectionsRepositoryImpl) bind SectionsRepository::class
+    factoryOf(::TagsRepositoryImpl) bind TagsRepository::class
 }
 
 val dataModule = (remoteDataSourceModule + localDataSourceModule + repositoryModule).toTypedArray()

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

@@ -7,12 +7,14 @@ fun Tag.toEntity(): TagEntity = with(this) {
     TagEntity(
         name = name,
         url = url,
+        imageUrl = imageUrl,
     )
 }
 
 fun TagEntity.toDomain(): Tag = with(this) {
     Tag(
         name = name,
         url = url,
+        imageUrl = imageUrl,
     )
 }

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

@@ -12,10 +12,13 @@ class PostsRepositoryImpl(
 ) : PostsRepository {
 
     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())
+        postsRds.fetchPage(url).fold(
+            onSuccess = {
+                postsLds.savePosts(it.data)
+                Result.success(it)
+            },
+            onFailure = { Result.failure(it) },
+        )
     }
 
     override suspend fun getPost(id: String): Result<Post> {

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

@@ -0,0 +1,29 @@
+package com.shifthackz.joyreactor.data.repository
+
+import com.shifthackz.joyreactor.domain.datasource.TagsDataSource
+import com.shifthackz.joyreactor.domain.repository.TagsRepository
+import com.shifthackz.joyreactor.entity.PagePayload
+import com.shifthackz.joyreactor.entity.Tag
+import kotlinx.coroutines.coroutineScope
+
+internal class TagsRepositoryImpl(
+    private val tagsRds: TagsDataSource.Remote,
+    private val tagsLds: TagsDataSource.Local,
+) : TagsRepository {
+
+    override suspend fun fetchPage(url: String): Result<PagePayload<Tag>> = coroutineScope {
+        tagsRds.fetchPage(url).fold(
+            onSuccess = {
+                tagsLds.saveTags(it.data)
+                Result.success(it)
+            },
+            onFailure = Result.Companion::failure,
+        )
+    }
+
+    override suspend fun search(query: String): Result<List<Tag>> = coroutineScope {
+        val remoteTags = tagsRds.searchTags(query).getOrThrow()
+        val localTags = tagsLds.searchTags(query).getOrThrow()
+        Result.success(listOf(remoteTags, localTags).flatten())
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.shifthackz.joyreactor.domain.datasource
+
+import com.shifthackz.joyreactor.entity.PagePayload
+import com.shifthackz.joyreactor.entity.Tag
+
+sealed interface TagsDataSource {
+
+    interface Remote : TagsDataSource {
+        suspend fun fetchPage(url: String): Result<PagePayload<Tag>>
+        suspend fun searchTags(query: String): Result<List<Tag>>
+    }
+
+    interface Local : TagsDataSource {
+        suspend fun saveTags(tags: List<Tag>)
+        suspend fun searchTags(query: String): Result<List<Tag>>
+    }
+}

domain/src/main/java/com/shifthackz/joyreactor/domain/di/Modules.kt

@@ -8,6 +8,10 @@ import com.shifthackz.joyreactor.domain.usecase.post.GetFullPostUseCase
 import com.shifthackz.joyreactor.domain.usecase.post.GetFullPostUseCaseImpl
 import com.shifthackz.joyreactor.domain.usecase.sections.FetchSectionsUseCase
 import com.shifthackz.joyreactor.domain.usecase.sections.FetchSectionsUseCaseImpl
+import com.shifthackz.joyreactor.domain.usecase.tags.FetchTagsUseCase
+import com.shifthackz.joyreactor.domain.usecase.tags.FetchTagsUseCaseImpl
+import com.shifthackz.joyreactor.domain.usecase.tags.SearchTagsUseCase
+import com.shifthackz.joyreactor.domain.usecase.tags.SearchTagsUseCaseImpl
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -17,4 +21,6 @@ val domainModule = module {
     factoryOf(::GetFullPostUseCaseImpl) bind GetFullPostUseCase::class
     factoryOf(::FetchPostCommentsUseCaseImpl) bind FetchPostCommentsUseCase::class
     factoryOf(::FetchSectionsUseCaseImpl) bind FetchSectionsUseCase::class
+    factoryOf(::FetchTagsUseCaseImpl) bind FetchTagsUseCase::class
+    factoryOf(::SearchTagsUseCaseImpl) bind SearchTagsUseCase::class
 }