From f5ea2871e470a2649ff94af20e6f68217a83f0cc Mon Sep 17 00:00:00 2001 From: "Hector A. Narvaez" Date: Wed, 7 Jun 2023 14:35:16 -0500 Subject: [PATCH] Refactor: Rename GetFilesListWithParentIdUseCase into GetFilesListUseCase --- .../nongms/data/GoogleStorageApiService.kt | 2 +- .../repository/NonGmsFileRepositoryImpl.kt | 4 ++-- .../source/NonGmsFileRemoteDataSourceImpl.kt | 4 ++-- .../android/storage/api/OmhStorageClient.kt | 4 ++-- .../data/source/OmhFileRemoteDataSource.kt | 2 +- .../api/domain/repository/FileRepository.kt | 2 +- .../api/domain/usecase/GetFilesListUseCase.kt | 22 +++++++++++++++++++ .../GetFilesListWithParentIdUseCase.kt | 22 ------------------- .../file_viewer/FileViewerViewModel.kt | 8 +++---- 9 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListUseCase.kt delete mode 100644 storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListWithParentIdUseCase.kt diff --git a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleStorageApiService.kt b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleStorageApiService.kt index 4aa30f68..425c0bc6 100644 --- a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleStorageApiService.kt +++ b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleStorageApiService.kt @@ -30,7 +30,7 @@ internal interface GoogleStorageApiService { } @GET(FILES_PARTICLE) - fun getFilesListWithParentId( + fun getFilesList( @Query(QUERY_Q) query: String, @Query(QUERY_FIELDS) fields: String = FIELDS_VALUE ): Call diff --git a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/repository/NonGmsFileRepositoryImpl.kt b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/repository/NonGmsFileRepositoryImpl.kt index 095b6189..1b33c438 100644 --- a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/repository/NonGmsFileRepositoryImpl.kt +++ b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/repository/NonGmsFileRepositoryImpl.kt @@ -7,8 +7,8 @@ internal class NonGmsFileRepositoryImpl( private val dataSource: OmhFileRemoteDataSource ) : FileRepository { - override fun getFilesListWithParentId(parentId: String) = - dataSource.getFilesListWithParentId(parentId) + override fun getFilesList(parentId: String) = + dataSource.getFilesList(parentId) override fun createFile(name: String, mimeType: String, parentId: String?) = dataSource.createFile(name, mimeType, parentId) diff --git a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt index 9582415c..3a87329a 100644 --- a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt +++ b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt @@ -11,10 +11,10 @@ import com.omh.android.storage.api.drive.nongms.data.source.mapper.toFileList internal class NonGmsFileRemoteDataSourceImpl(private val retrofitImpl: GoogleRetrofitImpl) : OmhFileRemoteDataSource { - override fun getFilesListWithParentId(parentId: String): List { + override fun getFilesList(parentId: String): List { val response = retrofitImpl .getGoogleStorageApiService() - .getFilesListWithParentId( + .getFilesList( query = GoogleStorageApiService.getQueryValue(parentId) ) .execute() diff --git a/storage-api/src/main/java/com/omh/android/storage/api/OmhStorageClient.kt b/storage-api/src/main/java/com/omh/android/storage/api/OmhStorageClient.kt index 022f3231..f899f460 100644 --- a/storage-api/src/main/java/com/omh/android/storage/api/OmhStorageClient.kt +++ b/storage-api/src/main/java/com/omh/android/storage/api/OmhStorageClient.kt @@ -4,7 +4,7 @@ import com.omh.android.auth.api.OmhAuthClient import com.omh.android.storage.api.domain.repository.FileRepository import com.omh.android.storage.api.domain.usecase.CreateFileUseCase import com.omh.android.storage.api.domain.usecase.DeleteFileUseCase -import com.omh.android.storage.api.domain.usecase.GetFilesListWithParentIdUseCase +import com.omh.android.storage.api.domain.usecase.GetFilesListUseCase abstract class OmhStorageClient protected constructor( protected val authClient: OmhAuthClient @@ -23,7 +23,7 @@ abstract class OmhStorageClient protected constructor( * and will not return an use case */ @SuppressWarnings("ForbiddenComment") - fun listFiles() = GetFilesListWithParentIdUseCase(getRepository()) + fun listFiles() = GetFilesListUseCase(getRepository()) fun createFile() = CreateFileUseCase(getRepository()) diff --git a/storage-api/src/main/java/com/omh/android/storage/api/data/source/OmhFileRemoteDataSource.kt b/storage-api/src/main/java/com/omh/android/storage/api/data/source/OmhFileRemoteDataSource.kt index e05b2040..c8dbd866 100644 --- a/storage-api/src/main/java/com/omh/android/storage/api/data/source/OmhFileRemoteDataSource.kt +++ b/storage-api/src/main/java/com/omh/android/storage/api/data/source/OmhFileRemoteDataSource.kt @@ -4,7 +4,7 @@ import com.omh.android.storage.api.domain.model.OmhFile interface OmhFileRemoteDataSource { - fun getFilesListWithParentId(parentId: String = "root"): List + fun getFilesList(parentId: String = "root"): List fun createFile(name: String, mimeType: String, parentId: String?): OmhFile? diff --git a/storage-api/src/main/java/com/omh/android/storage/api/domain/repository/FileRepository.kt b/storage-api/src/main/java/com/omh/android/storage/api/domain/repository/FileRepository.kt index a25670a2..b3588c4d 100644 --- a/storage-api/src/main/java/com/omh/android/storage/api/domain/repository/FileRepository.kt +++ b/storage-api/src/main/java/com/omh/android/storage/api/domain/repository/FileRepository.kt @@ -4,7 +4,7 @@ import com.omh.android.storage.api.domain.model.OmhFile interface FileRepository { - fun getFilesListWithParentId(parentId: String = "root"): List + fun getFilesList(parentId: String = "root"): List fun createFile(name: String, mimeType: String, parentId: String?): OmhFile? diff --git a/storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListUseCase.kt b/storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListUseCase.kt new file mode 100644 index 00000000..ddddad00 --- /dev/null +++ b/storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListUseCase.kt @@ -0,0 +1,22 @@ +package com.omh.android.storage.api.domain.usecase + +import com.omh.android.storage.api.domain.model.OmhFile +import com.omh.android.storage.api.domain.repository.FileRepository +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Dispatchers + +class GetFilesListUseCase( + private val repository: FileRepository, + dispatcher: CoroutineDispatcher = Dispatchers.Default +) : OmhSuspendUseCase(dispatcher) { + + override suspend fun execute( + parameters: GetFilesListUseCaseParams + ) = GetFilesListUseCaseResult( + repository.getFilesList(parameters.parentId) + ) +} + +data class GetFilesListUseCaseParams(val parentId: String = "root") + +data class GetFilesListUseCaseResult(val files: List) diff --git a/storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListWithParentIdUseCase.kt b/storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListWithParentIdUseCase.kt deleted file mode 100644 index c9941bef..00000000 --- a/storage-api/src/main/java/com/omh/android/storage/api/domain/usecase/GetFilesListWithParentIdUseCase.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.omh.android.storage.api.domain.usecase - -import com.omh.android.storage.api.domain.model.OmhFile -import com.omh.android.storage.api.domain.repository.FileRepository -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers - -class GetFilesListWithParentIdUseCase( - private val repository: FileRepository, - dispatcher: CoroutineDispatcher = Dispatchers.Default -) : OmhSuspendUseCase(dispatcher) { - - override suspend fun execute( - parameters: GetFilesListWithParentIdUseCaseParams - ) = GetFilesListWithParentIdUseCaseResult( - repository.getFilesListWithParentId(parameters.parentId) - ) -} - -data class GetFilesListWithParentIdUseCaseParams(val parentId: String = "root") - -data class GetFilesListWithParentIdUseCaseResult(val files: List) diff --git a/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt b/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt index d9a91fd9..0c0c68f5 100644 --- a/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt +++ b/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt @@ -4,8 +4,8 @@ import com.omh.android.storage.api.OmhStorageClient import com.omh.android.storage.api.domain.model.OmhFileType import com.omh.android.storage.api.domain.usecase.CreateFileUseCase import com.omh.android.storage.api.domain.usecase.CreateFileUseCaseParams -import com.omh.android.storage.api.domain.usecase.GetFilesListWithParentIdUseCase -import com.omh.android.storage.api.domain.usecase.GetFilesListWithParentIdUseCaseParams +import com.omh.android.storage.api.domain.usecase.GetFilesListUseCase +import com.omh.android.storage.api.domain.usecase.GetFilesListUseCaseParams import com.omh.android.storage.api.domain.usecase.OmhResult import com.omh.android.storage.sample.domain.model.FileType import com.omh.android.storage.sample.presentation.BaseViewModel @@ -54,10 +54,10 @@ class FileViewerViewModel @Inject constructor( setState(FileViewerViewState.Loading) val parentId = parentIdStack.peek() - val listFilesUseCase: GetFilesListWithParentIdUseCase = omhStorageClient.listFiles() + val listFilesUseCase: GetFilesListUseCase = omhStorageClient.listFiles() when ( - val result = listFilesUseCase(GetFilesListWithParentIdUseCaseParams(parentId)) + val result = listFilesUseCase(GetFilesListUseCaseParams(parentId)) ) { is OmhResult.OmhSuccess -> { setState(FileViewerViewState.Content(result.data.files))