Api Issue fixes and code refactoring

app/build.gradle.kts

@@ -139,4 +139,6 @@ dependencies {
 
     //Accompanist
     implementation(libs.accompanist)
+
+    implementation (libs.logging.interceptor)
 }

app/src/main/java/io/codecrow/mage/data/ResponseHandlings.kt

@@ -1,7 +1,7 @@
 package io.codecrow.mage.data
 
 import com.google.gson.Gson
-import io.codecrow.mage.model.response.ErrorResponse
+import io.codecrow.mage.remote.model.response.ErrorResponse
 import retrofit2.Response
 import java.io.IOException
 

app/src/main/java/io/codecrow/mage/data/datasource/ChannelRemote.kt

@@ -1,10 +1,11 @@
 package io.codecrow.mage.data.datasource
 
-import io.codecrow.mage.data.DataException
-import io.codecrow.mage.data.Either
-import io.codecrow.mage.model.Channel
+import io.codecrow.mage.remote.model.Channel
+import io.codecrow.mage.remote.utils.Resource
+import kotlinx.coroutines.flow.Flow
 
 interface ChannelRemote {
+    fun getAllChannels(searchQuery: String, skip: Int, limit: Int): Flow<Resource<ArrayList<Channel>>>
 
-    suspend fun getChannels(searchQuery: String, skip: Int, limit: Int): Either<DataException, List<Channel>>
+    fun getChannelByID(channelId: String) : Flow<Resource<Channel>>
 }

app/src/main/java/io/codecrow/mage/data/datasource/ChannelRemoteImpl.kt

@@ -1,21 +1,39 @@
 package io.codecrow.mage.data.datasource
 
-import io.codecrow.mage.data.DataException
-import io.codecrow.mage.data.Either
 import io.codecrow.mage.data.service.ChannelApi
-import io.codecrow.mage.data.handle
-import io.codecrow.mage.model.Channel
+import io.codecrow.mage.remote.mapper.ChannelMapper
+import io.codecrow.mage.remote.model.Channel
+import io.codecrow.mage.remote.utils.Resource
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
 class ChannelRemoteImpl @Inject constructor(
-    private val api: ChannelApi
+    private val channelApi: ChannelApi,
+    private val channelMapper: ChannelMapper
 ): ChannelRemote {
 
-    override suspend fun getChannels(searchQuery: String, skip: Int, limit: Int): Either<DataException, List<Channel>> {
-        return handle({
-            api.getChannels(searchQuery, skip, limit)
-        }) {
-            Either.Right(it ?: emptyList())
+    override fun getAllChannels(
+        searchQuery: String,
+        skip: Int,
+        limit: Int
+    ): Flow<Resource<ArrayList<Channel>>> {
+        return flow {
+            emit(Resource.loading())
+            emit(Resource.success(data = channelMapper.mapAllChannels(channelApi.getChannels(searchQuery, skip, limit))))
+        }.catch { e ->
+            emit(Resource.error(e))
         }
     }
+
+    override fun getChannelByID(channelId: String): Flow<Resource<Channel>> {
+        return flow {
+            emit(Resource.loading())
+            emit(Resource.success(data = channelMapper.map(channelApi.getChannel(channelId))))
+        }.catch { e ->
+            emit(Resource.error(e))
+        }
+    }
+
 }

app/src/main/java/io/codecrow/mage/data/di/ApiModule.kt

@@ -6,6 +6,9 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import io.codecrow.mage.data.service.ChannelApi
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Singleton
@@ -14,19 +17,14 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 object ApiModule {
 
-    @Singleton
     @Provides
-    fun providesGsonBuilder(): Gson =
-        GsonBuilder()
-            .excludeFieldsWithoutExposeAnnotation()
-            .create()
-
     @Singleton
-    @Provides
-    fun providesRetrofit(gson: Gson): Retrofit =
+    fun providesRetrofit(): ChannelApi =
         Retrofit.Builder()
             .baseUrl("https://dev.api.mage.stream/")
-            .addConverterFactory(GsonConverterFactory.create(gson))
+            .client(OkHttpClient.Builder().addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY)).build())
+            .addConverterFactory(GsonConverterFactory.create())
             .build()
+            .create(ChannelApi::class.java)
 
 }

app/src/main/java/io/codecrow/mage/data/service/ChannelApi.kt

@@ -1,6 +1,7 @@
 package io.codecrow.mage.data.service
 
-import io.codecrow.mage.model.Channel
+import io.codecrow.mage.remote.model.Channel
+import io.codecrow.mage.remote.model.channel_response.ChannelResponseItem
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query
@@ -16,7 +17,7 @@ interface ChannelApi {
     suspend fun deleteChannel(@Query("channelId") channelId: String): List<Channel>
 
     @GET("channel")
-    suspend fun getChannel(@Query("channelId") channelId: String): Channel
+    suspend fun getChannel(@Query("channelId") channelId: String): ChannelResponseItem
 
     @GET("channels/friend")
     suspend fun getFriendChannel(@Query("title") title: String): Channel
@@ -25,7 +26,7 @@ interface ChannelApi {
     suspend fun getMyChannels(@Query("searchQuery") searchQuery: String, @Query("techStack") techStack: String, @Query("skip") skip: String, @Query("limit") limit: String): List<Channel>
 
     @GET("channels")
-    suspend fun getChannels(@Query("searchQuery") searchQuery: String, @Query("skip") skip: Int, @Query("limit") limit: Int): Response<List<Channel>>
+    suspend fun getChannels(@Query("searchQuery") searchQuery: String, @Query("skip") skip: Int, @Query("limit") limit: Int): ArrayList<ChannelResponseItem>
 
     @GET("channels/user")
     suspend fun getChannelsByUserId(@Query("searchQuery") searchQuery: String, @Query("skip") skip: String, @Query("limit") limit: String): List<Channel>

app/src/main/java/io/codecrow/mage/model/Channel.kt

@@ -1,6 +1,7 @@
 package io.codecrow.mage.model
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import io.codecrow.mage.remote.model.UserDetails
 
 data class Channel(
     @SerializedName("_id")

app/src/main/java/io/codecrow/mage/remote/mapper/ChannelMapper.kt

@@ -0,0 +1,32 @@
+package io.codecrow.mage.remote.mapper
+
+import android.util.Log
+import com.google.gson.GsonBuilder
+import io.codecrow.mage.remote.model.Channel
+import io.codecrow.mage.remote.model.channel_response.ChannelResponseItem
+import io.codecrow.mage.remote.utils.Mapper
+import javax.inject.Inject
+
+class ChannelMapper @Inject
+constructor() :
+    Mapper<ChannelResponseItem, Channel> {
+
+    override suspend fun map(input: ChannelResponseItem): Channel {
+        return Channel(
+            id = input.id.orEmpty(),
+            title = input.title.orEmpty(),
+            avatar = input.userDetails?.avatar.orEmpty(),
+            createdByUsername = input.userDetails?.username.orEmpty(),
+            memberCount = input.memberCount.toString()
+        )
+    }
+
+    suspend fun mapAllChannels(botItems: ArrayList<ChannelResponseItem>): ArrayList<Channel> {
+        val allBots = ArrayList<Channel>()
+        Log.i("__TAG", GsonBuilder().setPrettyPrinting().create().toJson(botItems))
+        botItems.forEachIndexed { index, channelResponseItem ->
+            allBots.add(map(channelResponseItem))
+        }
+        return allBots
+    }
+}

app/src/main/java/io/codecrow/mage/remote/model/Channel.kt

@@ -0,0 +1,11 @@
+package io.codecrow.mage.remote.model
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+data class Channel(
+    var id : String,
+    var title: String,
+    var createdByUsername: String,
+    var avatar: String,
+    var memberCount : String
+)

app/src/main/java/io/codecrow/mage/model/UserDetails.kt → app/src/main/java/io/codecrow/mage/remote/model/UserDetails.kt

@@ -1,4 +1,4 @@
-package io.codecrow.mage.model
+package io.codecrow.mage.remote.model
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/io/codecrow/mage/remote/model/channel_response/ChannelResponse.kt

@@ -0,0 +1,98 @@
+package io.codecrow.mage.remote.model.channel_response
+
+import com.google.gson.annotations.SerializedName
+
+
+data class ChannelResponseItem(
+
+	@field:SerializedName("mods")
+	val mods: List<Any?>? = null,
+
+	@field:SerializedName("thumbnail")
+	val thumbnail: String? = null,
+
+	@field:SerializedName("isAiChatEnabled")
+	val isAiChatEnabled: Boolean? = null,
+
+	@field:SerializedName("memberCount")
+	val memberCount: Int? = null,
+
+	@field:SerializedName("description")
+	val description: String? = null,
+
+	@field:SerializedName("channelType")
+	val channelType: String? = null,
+
+	@field:SerializedName("bans")
+	val bans: List<Any?>? = null,
+
+	@field:SerializedName("title")
+	val title: String? = null,
+
+	@field:SerializedName("userDetails")
+	val userDetails: UserDetails? = null,
+
+	@field:SerializedName("tags")
+	val tags: List<String?>? = null,
+
+	@field:SerializedName("createdAt")
+	val createdAt: Long? = null,
+
+	@field:SerializedName("isLive")
+	val isLive: Boolean? = null,
+
+	@field:SerializedName("guests")
+	val guests: List<Any?>? = null,
+
+	@field:SerializedName("_id")
+	val id: String? = null,
+
+	@field:SerializedName("category")
+	val category: List<String?>? = null,
+
+	@field:SerializedName("user")
+	val user: String? = null,
+
+	@field:SerializedName("updatedAt")
+	val updatedAt: Long? = null,
+
+	@field:SerializedName("planDetails")
+	val planDetails: PlanDetails? = null
+)
+
+
+data class PlanDetails(
+
+	@field:SerializedName("lastPaymentDate")
+	val lastPaymentDate: Long? = null,
+
+	@field:SerializedName("_id")
+	val id: String? = null,
+
+	@field:SerializedName("planTier")
+	val planTier: Int? = null,
+
+	@field:SerializedName("user")
+	val user: String? = null,
+
+	@field:SerializedName("createdt")
+	val createdt: Long? = null,
+
+	@field:SerializedName("updatedAt")
+	val updatedAt: Long? = null
+)
+
+data class UserDetails(
+
+	@field:SerializedName("displayName")
+	val displayName: String? = null,
+
+	@field:SerializedName("_id")
+	val id: String? = null,
+
+	@field:SerializedName("avatar")
+	val avatar: String? = null,
+
+	@field:SerializedName("username")
+	val username: String? = null
+)

app/src/main/java/io/codecrow/mage/model/response/ErrorResponse.kt → app/src/main/java/io/codecrow/mage/remote/model/response/ErrorResponse.kt

@@ -1,4 +1,4 @@
-package io.codecrow.mage.model.response
+package io.codecrow.mage.remote.model.response
 
 data class ErrorResponse(
     val message: String?

app/src/main/java/io/codecrow/mage/remote/utils/EntityMapper.kt

@@ -0,0 +1,13 @@
+package io.codecrow.mage.remote.utils
+
+interface EntityMapper <Entity, DomainModel>{
+
+    fun mapFromEntity(entity: Entity): DomainModel
+
+    fun mapToEntity(domainModel: DomainModel): Entity
+}
+
+
+interface Mapper<T, U> {
+    suspend fun map(input: T): U
+}

app/src/main/java/io/codecrow/mage/remote/utils/Resource.kt

@@ -0,0 +1,29 @@
+package io.codecrow.mage.remote.utils
+
+enum class DataStatus {
+    SUCCESS,
+    ERROR,
+    LOADING,
+    DEFAULT
+}
+
+
+data class Resource<out T>(val status: DataStatus, val data: T?, val message: String?, val error: Throwable? = null) {
+    companion object {
+        fun <T> success(data: T?): Resource<T> {
+            return Resource(DataStatus.SUCCESS, data, null)
+        }
+
+        fun <T> error(error: Throwable): Resource<T> {
+            return Resource(DataStatus.ERROR, null, null, error)
+        }
+
+        fun <T> loading(): Resource<T> {
+            return Resource(DataStatus.LOADING, null, null)
+        }
+
+        fun <T> default(): Resource<T> {
+            return Resource(DataStatus.DEFAULT, null, null)
+        }
+    }
+}

app/src/main/java/io/codecrow/mage/ui/Navigation.kt

@@ -42,11 +42,11 @@ fun MainNavigation() {
         composable("channel/{channelId}") { backStackEntry ->
             val channelId = backStackEntry.arguments?.getString("channelId") ?: ""
             val viewModel = hiltViewModel<ChannelViewModel>()
-            viewModel.setChannelId(channelId)
             ChannelScreen(
                 navController = navController,
                 modifier = Modifier.padding(16.dp),
-                viewModel = viewModel
+                viewModel = viewModel,
+                channelID = channelId
             )
         }
     }