Configure data layer

settings.gradle.kts

@@ -19,4 +19,5 @@ rootProject.name = "omh-storage"
 include(":storage-api")
 include(":storage-api-drive-gms")
 include(":storage-api-drive-nongms")
-// include(":storage-sample")
+// Sample app is currently broken. Removed temporally
+//include(":storage-sample")

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleRetrofitImpl.kt

@@ -1,26 +1,75 @@
 package com.omh.android.storage.api.drive.nongms.data
 
 import com.omh.android.storage.api.drive.nongms.BuildConfig
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
 
-internal object GoogleRetrofitImpl {
+internal class GoogleRetrofitImpl(private val bearerToken: String) {
 
-    private val okHttpClient = OkHttpClient.Builder()
-        .addInterceptor(
-            HttpLoggingInterceptor().apply {
-                if (BuildConfig.DEBUG) setLevel(HttpLoggingInterceptor.Level.BODY)
+    companion object {
+        private const val HEADER_AUTHORIZATION_NAME = "Authorization"
+
+        private var instance: GoogleRetrofitImpl? = null
+
+        internal fun getInstance(bearerToken: String): GoogleRetrofitImpl {
+            if (instance == null) {
+                instance = GoogleRetrofitImpl(bearerToken)
+            }
+
+            return instance!!
+        }
+    }
+
+    private var apiService: GoogleStorageApiService? = null
+
+    fun getGoogleStorageApiService(): GoogleStorageApiService {
+        if (apiService != null) {
+            return apiService!!
+        }
+
+        val retrofit = Retrofit.Builder()
+            .client(createOkHttpClient())
+            .addConverterFactory(createConverterFactory())
+            .baseUrl(BuildConfig.G_STORAGE_URL)
+            .build()
+
+        apiService = retrofit.create(GoogleStorageApiService::class.java)
+        return apiService!!
+    }
+
+    private fun createOkHttpClient(): OkHttpClient {
+        val loggingInterceptor = setupLoggingInterceptor()
+
+        return OkHttpClient.Builder()
+            .addInterceptor(loggingInterceptor)
+            .addInterceptor { chain ->
+                val request = setupRequestInterceptor(chain)
+                chain.proceed(request)
+            }
+            .build()
+    }
+
+    private fun setupLoggingInterceptor() = HttpLoggingInterceptor().apply {
+        setLevel(
+            if (BuildConfig.DEBUG) {
+                HttpLoggingInterceptor.Level.BODY
+            } else {
+                HttpLoggingInterceptor.Level.NONE
             }
         )
-        .build()
+    }
 
-    private val retrofitClient = Retrofit.Builder()
-        .client(okHttpClient)
-        .baseUrl(BuildConfig.G_STORAGE_URL)
-        .addConverterFactory(JacksonConverterFactory.create())
+    private fun setupRequestInterceptor(chain: Interceptor.Chain) = chain
+        .request()
+        .newBuilder()
+        .addHeader(
+            HEADER_AUTHORIZATION_NAME,
+            bearerToken
+        )
         .build()
 
-    val googleStorageREST: GoogleStorageREST = retrofitClient.create(GoogleStorageREST::class.java)
+    private fun createConverterFactory() = JacksonConverterFactory.create()
 }

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleStorageApiService.kt

@@ -0,0 +1,25 @@
+package com.omh.android.storage.api.drive.nongms.data
+
+import com.omh.android.storage.api.drive.nongms.data.source.response.FileListRemoteResponse
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+internal interface GoogleStorageApiService {
+
+    companion object {
+        private const val GET_ALL_FILES_AND_FOLDERS_LIST_PARTICLE = "files"
+
+        private const val QUERY_Q = "q"
+        private const val QUERY_FIELDS = "fields"
+
+        private const val Q_VALUE = "'root' in parents and trashed = false"
+        private const val FIELDS_VALUE = "files(id, name, mimeType, modifiedTime)"
+    }
+
+    @GET(GET_ALL_FILES_AND_FOLDERS_LIST_PARTICLE)
+    fun getRootFilesList(
+        @Query(QUERY_Q) query: String = Q_VALUE,
+        @Query(QUERY_FIELDS) fields: String = FIELDS_VALUE
+    ): Call<FileListRemoteResponse>
+}

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/FileRemoteDataSource.kt

@@ -0,0 +1,23 @@
+package com.omh.android.storage.api.drive.nongms.data.source
+
+import com.omh.android.storage.api.data.source.remote.FileRemoteDataSource
+import com.omh.android.storage.api.domain.model.File
+import com.omh.android.storage.api.drive.nongms.data.GoogleRetrofitImpl
+import com.omh.android.storage.api.drive.nongms.data.source.mapper.toFileList
+
+internal class FileRemoteDataSource : FileRemoteDataSource {
+
+    override fun getRootFilesList(): List<File> {
+        val response = GoogleRetrofitImpl
+            .getInstance("")
+            .getGoogleStorageApiService()
+            .getRootFilesList()
+            .execute()
+
+        return if (response.isSuccessful) {
+            response.body()?.toFileList().orEmpty()
+        } else {
+            emptyList()
+        }
+    }
+}

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/mapper/DataMappers.kt

@@ -0,0 +1,22 @@
+package com.omh.android.storage.api.drive.nongms.data.source.mapper
+
+import com.omh.android.storage.api.domain.model.File
+import com.omh.android.storage.api.drive.nongms.data.source.response.FileListRemoteResponse
+import com.omh.android.storage.api.drive.nongms.data.source.response.FileRemoteResponse
+
+@SuppressWarnings("ComplexCondition")
+internal fun FileRemoteResponse.toFile(): File? {
+    if (mimeType == null || id == null || name == null || modifiedTime == null) {
+        return null
+    }
+
+    return File(
+        mimeType,
+        id,
+        name,
+        modifiedTime
+    )
+}
+
+internal fun FileListRemoteResponse.toFileList(): List<File> =
+    files?.mapNotNull { remoteFileModel -> remoteFileModel?.toFile() }.orEmpty()

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/response/FileListRemoteResponse.kt

@@ -0,0 +1,9 @@
+package com.omh.android.storage.api.drive.nongms.data.source.response
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+internal data class FileListRemoteResponse(
+    @JsonProperty("files") val files: List<FileRemoteResponse?>?
+)

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/response/FileRemoteResponse.kt

@@ -0,0 +1,12 @@
+package com.omh.android.storage.api.drive.nongms.data.source.response
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+internal data class FileRemoteResponse(
+    @JsonProperty("mimeType")val mimeType: String?,
+    @JsonProperty("id")val id: String?,
+    @JsonProperty("name")val name: String?,
+    @JsonProperty("modifiedTime")val modifiedTime: String?
+)

storage-api/src/main/java/com/omh/android/storage/api/data/mapper/FileTypeMapper.kt

@@ -0,0 +1,17 @@
+package com.omh.android.storage.api.data.mapper
+
+import com.omh.android.storage.api.domain.model.FileType
+
+internal object FileTypeMapper {
+
+    private val MAP_FILE_TYPES: Map<String, FileType> =
+        FileType.values().associateBy { fileType -> fileType.mimeType }
+
+    fun getFileTypeWithMime(mimeType: String): FileType {
+        return if (MAP_FILE_TYPES.containsKey(mimeType)) {
+            MAP_FILE_TYPES[mimeType] ?: FileType.OTHER
+        } else {
+            FileType.OTHER
+        }
+    }
+}

storage-api/src/main/java/com/omh/android/storage/api/data/repository/FilesFoldersDataRepository.kt

@@ -1,13 +1,11 @@
 package com.omh.android.storage.api.data.repository
 
-import com.omh.android.storage.api.data.datasource.network.FilesFoldersNetworkDataSource
-import com.omh.android.storage.api.data.mapper.fromFilesFoldersRemoteListToDomain
+import com.omh.android.storage.api.data.source.remote.FileRemoteDataSource
 import com.omh.android.storage.api.domain.abstraction.FilesFoldersRepository
 
 class FilesFoldersDataRepository(
-    private val networkDataSource: FilesFoldersNetworkDataSource
+    private val networkDataSource: FileRemoteDataSource
 ) : FilesFoldersRepository {
-    override fun getAll() = fromFilesFoldersRemoteListToDomain(
-        networkDataSource.getAll()
-    )
+
+    override fun getRootFilesList() = networkDataSource.getRootFilesList()
 }

storage-api/src/main/java/com/omh/android/storage/api/data/datasource/network/FileNetworkDataSource.kt → storage-api/src/main/java/com/omh/android/storage/api/data/source/remote/FileNetworkDataSource.kt

@@ -1,4 +1,4 @@
-package com.omh.android.storage.api.data.datasource.network
+package com.omh.android.storage.api.data.source.remote
 
 interface FileNetworkDataSource {
     fun create()

storage-api/src/main/java/com/omh/android/storage/api/data/source/remote/FileRemoteDataSource.kt

@@ -0,0 +1,8 @@
+package com.omh.android.storage.api.data.source.remote
+
+import com.omh.android.storage.api.domain.model.File
+
+interface FileRemoteDataSource {
+
+    fun getRootFilesList(): List<File>
+}