Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GMS - Update files #62

Merged
merged 1 commit into from
Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ internal class GmsFileRepositoryImpl(
override fun downloadFile(fileId: String, mimeType: String?) =
dataSource.downloadFile(fileId, mimeType)

override fun open() = Unit
override fun updateFile(localFileToUpload: File, fileId: String) =
dataSource.updateFile(localFileToUpload, fileId)

override fun update() = Unit
override fun open() = Unit
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,20 @@ internal class GmsFileRemoteDataSourceImpl(private val apiService: GoogleDriveAp

return outputStream
}

override fun updateFile(localFileToUpload: File, fileId: String): OmhFile? {
val localMimeType = getStringMimeTypeFromLocalFile(localFileToUpload)

val file = GoogleApiFile().apply {
id = fileId
name = localFileToUpload.name
mimeType = localMimeType
}

val mediaContent = FileContent(localMimeType, localFileToUpload)

val response: GoogleApiFile = apiService.uploadFile(file, mediaContent).execute()

return response.toOmhFile()
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.omh.android.storage.api.drive.nongms.data.repository

import com.omh.android.storage.api.data.source.OmhFileRemoteDataSource
import com.omh.android.storage.api.domain.model.OmhFile
import com.omh.android.storage.api.domain.repository.OmhFileRepository
import java.io.File

Expand All @@ -22,7 +23,8 @@ internal class NonGmsFileRepositoryImpl(
override fun downloadFile(fileId: String, mimeType: String?) =
dataSource.downloadFile(fileId, mimeType)

override fun open() = Unit
override fun updateFile(localFileToUpload: File, fileId: String): OmhFile? =
dataSource.updateFile(localFileToUpload, fileId)

override fun update() = Unit
override fun open() = Unit
}
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,6 @@ internal class NonGmsFileRemoteDataSourceImpl(private val retrofitImpl: GoogleRe
throw (OmhStorageException.DownloadException(DOWNLOAD_GOOGLE_WORKSPACE_ERROR, errorBody))
}
}

override fun updateFile(localFileToUpload: File, fileId: String): OmhFile? = null
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ 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.GetFilesListUseCaseResult
import com.omh.android.storage.api.domain.usecase.OmhResult
import com.omh.android.storage.api.domain.usecase.UpdateFileUseCase
import com.omh.android.storage.api.domain.usecase.UpdateFileUseCaseParams
import com.omh.android.storage.api.domain.usecase.UpdateFileUseCaseResult
import com.omh.android.storage.api.domain.usecase.UploadFileUseCase
import com.omh.android.storage.api.domain.usecase.UploadFileUseCaseParams
import com.omh.android.storage.api.domain.usecase.UploadFileUseCaseResult
Expand Down Expand Up @@ -75,7 +78,6 @@ abstract class OmhStorageClient protected constructor(
result
}
}

fun downloadFile(fileId: String, mimeType: String?): OmhTask<DownloadFileUseCaseResult> {
val downloadFileUseCase = DownloadFileUseCase(getRepository())
return OmhStorageTaskImpl {
Expand All @@ -84,4 +86,16 @@ abstract class OmhStorageClient protected constructor(
result
}
}

fun updateFile(
localFileToUpload: File,
fileId: String
): OmhTask<UpdateFileUseCaseResult> {
val uploadFileUseCase = UpdateFileUseCase(getRepository())
return OmhStorageTaskImpl {
val parameters = UpdateFileUseCaseParams(localFileToUpload, fileId)
val result: OmhResult<UpdateFileUseCaseResult> = uploadFileUseCase(parameters)
result
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ interface OmhFileRemoteDataSource {
fun uploadFile(localFileToUpload: File, parentId: String?): OmhFile?

fun downloadFile(fileId: String, mimeType: String?): ByteArrayOutputStream

fun updateFile(localFileToUpload: File, fileId: String): OmhFile?
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface OmhFileRepository {

fun downloadFile(fileId: String, mimeType: String?): ByteArrayOutputStream

fun open()
fun updateFile(localFileToUpload: File, fileId: String): OmhFile?

fun update()
fun open()
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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.OmhFileRepository
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import java.io.File

class UpdateFileUseCase(
private val repository: OmhFileRepository,
dispatcher: CoroutineDispatcher = Dispatchers.Default
) : OmhSuspendUseCase<UpdateFileUseCaseParams, UpdateFileUseCaseResult>(dispatcher) {

override suspend fun execute(parameters: UpdateFileUseCaseParams): UpdateFileUseCaseResult {
return UpdateFileUseCaseResult(
repository.updateFile(parameters.localFileToUpload, parameters.fileId)
)
}
}

data class UpdateFileUseCaseParams(val localFileToUpload: File, val fileId: String)

data class UpdateFileUseCaseResult(val file: OmhFile?)