Add service package

MarkNjunge · MarkNjunge · commit 25709da9a427 · 2020-04-13T23:56:52.000+03:00
diff --git a/app/src/main/java/com/marknkamau/justjava/data/network/FirebaseService.kt b/app/src/main/java/com/marknkamau/justjava/data/network/FirebaseService.kt
@@ -1,7 +1,7 @@
 package com.marknkamau.justjava.data.network
 
 import com.google.firebase.iid.FirebaseInstanceId
-import com.marknjunge.core.data.network.FirebaseService
+import com.marknjunge.core.data.network.service.FirebaseService
 import kotlinx.coroutines.tasks.await
 
 class AppFirebaseService : FirebaseService {
diff --git a/app/src/main/java/com/marknkamau/justjava/data/network/GoogleSignInClientStub.kt b/app/src/main/java/com/marknkamau/justjava/data/network/GoogleSignInClientStub.kt
@@ -1,10 +1,10 @@
 package com.marknkamau.justjava.data.network
 
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
-import com.marknjunge.core.data.network.GoogleSignInClientStub
+import com.marknjunge.core.data.network.GoogleSignInService
 import kotlinx.coroutines.tasks.await
 
-class GoogleSignInClientStubImpl(private val googleSignInClient: GoogleSignInClient) : GoogleSignInClientStub {
+class GoogleSignInServiceImpl(private val googleSignInClient: GoogleSignInClient) : GoogleSignInService {
     override suspend fun signOut() {
         googleSignInClient.signOut().await()
     }
diff --git a/app/src/main/java/com/marknkamau/justjava/di/Modules.kt b/app/src/main/java/com/marknkamau/justjava/di/Modules.kt
@@ -5,14 +5,14 @@ import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.marknjunge.core.data.local.PreferencesRepository
-import com.marknjunge.core.data.network.FirebaseService
-import com.marknjunge.core.data.network.GoogleSignInClientStub
+import com.marknjunge.core.data.network.service.FirebaseService
+import com.marknjunge.core.data.network.GoogleSignInService
 import com.marknkamau.justjava.BuildConfig
 import com.marknkamau.justjava.data.db.AppDatabase
 import com.marknkamau.justjava.data.db.DbRepository
 import com.marknkamau.justjava.data.db.DbRepositoryImpl
 import com.marknkamau.justjava.data.network.AppFirebaseService
-import com.marknkamau.justjava.data.network.GoogleSignInClientStubImpl
+import com.marknkamau.justjava.data.network.GoogleSignInServiceImpl
 import com.marknkamau.justjava.data.preferences.PreferencesRepositoryImpl
 import com.marknkamau.justjava.ui.addressBook.AddressBookViewModel
 import com.marknkamau.justjava.ui.cart.CartViewModel
@@ -45,7 +45,7 @@ val appModule = module {
         GoogleSignIn.getClient(androidContext(), gso)
     }
 
-    single<GoogleSignInClientStub> { GoogleSignInClientStubImpl(get()) }
+    single<GoogleSignInService> { GoogleSignInServiceImpl(get()) }
 
     single<FirebaseService> { AppFirebaseService() }
 }
diff --git a/app/src/test/java/com/marknkamau/justjava/ui/login/SignInViewModelTest.kt b/app/src/test/java/com/marknkamau/justjava/ui/login/SignInViewModelTest.kt
@@ -4,7 +4,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
-import com.marknjunge.core.data.network.FirebaseService
+import com.marknjunge.core.data.network.service.FirebaseService
 import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
 import io.mockk.MockKAnnotations
diff --git a/app/src/test/java/com/marknkamau/justjava/ui/signup/SignUpViewModelTest.kt b/app/src/test/java/com/marknkamau/justjava/ui/signup/SignUpViewModelTest.kt
@@ -4,7 +4,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
-import com.marknjunge.core.data.network.FirebaseService
+import com.marknjunge.core.data.network.service.FirebaseService
 import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
 import io.mockk.MockKAnnotations
diff --git a/core/src/main/java/com/marknjunge/core/data/network/GoogleSignInService.kt b/core/src/main/java/com/marknjunge/core/data/network/GoogleSignInService.kt
@@ -1,5 +1,5 @@
 package com.marknjunge.core.data.network
 
-interface GoogleSignInClientStub {
+interface GoogleSignInService {
     suspend fun signOut()
 }
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/ApiService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/ApiService.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 import com.marknjunge.core.data.model.Product
 import retrofit2.http.GET
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/AuthService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/AuthService.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 import com.marknjunge.core.data.model.*
 import com.marknjunge.core.data.model.SignInGoogleDto
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/CartService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/CartService.kt
@@ -1,12 +1,12 @@
-package com.marknjunge.core.data.network
-
-import com.marknjunge.core.data.model.VerifyOrderDto
-import com.marknjunge.core.data.model.VerifyOrderResponse
-import retrofit2.http.Body
-import retrofit2.http.Header
-import retrofit2.http.POST
-
-internal interface CartService {
-    @POST("orders/verify")
-    suspend fun verifyCart(@Header("session-id") sessionId: String, @Body body: VerifyOrderDto): List<VerifyOrderResponse>
+package com.marknjunge.core.data.network.service
+
+import com.marknjunge.core.data.model.VerifyOrderDto
+import com.marknjunge.core.data.model.VerifyOrderResponse
+import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+internal interface CartService {
+    @POST("orders/verify")
+    suspend fun verifyCart(@Header("session-id") sessionId: String, @Body body: VerifyOrderDto): List<VerifyOrderResponse>
 }
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/FirebaseService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/FirebaseService.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 interface FirebaseService {
     suspend fun getFcmToken(): String
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/NetworkProvider.kt b/core/src/main/java/com/marknjunge/core/data/network/service/NetworkProvider.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 import android.content.Context
 import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/OrdersService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/OrdersService.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 import com.marknjunge.core.data.model.*
 import retrofit2.http.*
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/PaymentsService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/PaymentsService.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 import com.marknjunge.core.data.model.InitiateCardPaymentDto
 import com.marknjunge.core.data.model.RequestMpesaDto
diff --git a/core/src/main/java/com/marknjunge/core/data/network/service/UsersService.kt b/core/src/main/java/com/marknjunge/core/data/network/service/UsersService.kt
@@ -1,4 +1,4 @@
-package com.marknjunge.core.data.network
+package com.marknjunge.core.data.network.service
 
 import com.marknjunge.core.data.model.*
 import com.marknjunge.core.data.model.SaveAddressDto
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/AuthRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/AuthRepository.kt
@@ -2,8 +2,8 @@ package com.marknjunge.core.data.repository
 
 import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.*
-import com.marknjunge.core.data.network.AuthService
-import com.marknjunge.core.data.network.GoogleSignInClientStub
+import com.marknjunge.core.data.network.service.AuthService
+import com.marknjunge.core.data.network.GoogleSignInService
 import com.marknjunge.core.utils.call
 
 interface AuthRepository {
@@ -25,7 +25,7 @@ interface AuthRepository {
 internal class ApiAuthRepository(
     private val authService: AuthService,
     private val preferencesRepository: PreferencesRepository,
-    private val googleSignInClient: GoogleSignInClientStub
+    private val googleSignInClient: GoogleSignInService
 ) : AuthRepository {
     override suspend fun signInWithGoogle(idToken: String): Resource<User> {
         return call {
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/CartRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/CartRepository.kt
@@ -4,7 +4,7 @@ import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.VerifyOrderDto
 import com.marknjunge.core.data.model.VerifyOrderResponse
-import com.marknjunge.core.data.network.CartService
+import com.marknjunge.core.data.network.service.CartService
 import com.marknjunge.core.utils.call
 
 interface CartRepository {
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/OrdersRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/OrdersRepository.kt
@@ -2,7 +2,7 @@ package com.marknjunge.core.data.repository
 
 import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.*
-import com.marknjunge.core.data.network.OrdersService
+import com.marknjunge.core.data.network.service.OrdersService
 import com.marknjunge.core.utils.call
 
 interface OrdersRepository {
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/PaymentRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/PaymentRepository.kt
@@ -5,7 +5,7 @@ import com.marknjunge.core.data.model.ApiResponse
 import com.marknjunge.core.data.model.InitiateCardPaymentDto
 import com.marknjunge.core.data.model.RequestMpesaDto
 import com.marknjunge.core.data.model.Resource
-import com.marknjunge.core.data.network.PaymentsService
+import com.marknjunge.core.data.network.service.PaymentsService
 import com.marknjunge.core.utils.call
 
 interface PaymentsRepository {
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/ProductsRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/ProductsRepository.kt
@@ -2,7 +2,7 @@ package com.marknjunge.core.data.repository
 
 import com.marknjunge.core.data.model.Product
 import com.marknjunge.core.data.model.Resource
-import com.marknjunge.core.data.network.ApiService
+import com.marknjunge.core.data.network.service.ApiService
 import com.marknjunge.core.utils.call
 
 interface ProductsRepository {
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/UsersRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/UsersRepository.kt
@@ -2,9 +2,9 @@ package com.marknjunge.core.data.repository
 
 import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.*
-import com.marknjunge.core.data.network.FirebaseService
-import com.marknjunge.core.data.network.GoogleSignInClientStub
-import com.marknjunge.core.data.network.UsersService
+import com.marknjunge.core.data.network.service.FirebaseService
+import com.marknjunge.core.data.network.GoogleSignInService
+import com.marknjunge.core.data.network.service.UsersService
 import com.marknjunge.core.utils.call
 import com.marknjunge.core.utils.parseException
 import kotlinx.coroutines.flow.Flow
@@ -27,7 +27,7 @@ interface UsersRepository {
 internal class ApiUsersRepository(
     private val usersService: UsersService,
     private val preferencesRepository: PreferencesRepository,
-    private val googleSignInClient: GoogleSignInClientStub,
+    private val googleSignInClient: GoogleSignInService,
     private val firebaseService: FirebaseService
 ) : UsersRepository {
     override suspend fun getCurrentUser(): Flow<Resource<User>> = flow {
diff --git a/core/src/main/java/com/marknjunge/core/di/modules.kt b/core/src/main/java/com/marknjunge/core/di/modules.kt
@@ -1,6 +1,6 @@
 package com.marknjunge.core.di
 
-import com.marknjunge.core.data.network.NetworkProvider
+import com.marknjunge.core.data.network.service.NetworkProvider
 import com.marknjunge.core.data.repository.*
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
diff --git a/core/src/test/java/com/marknjunge/core/data/repository/ApiAuthRepositoryTest.kt b/core/src/test/java/com/marknjunge/core/data/repository/ApiAuthRepositoryTest.kt
@@ -4,7 +4,7 @@ import com.marknjunge.core.SampleData
 import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.SignInResponse
-import com.marknjunge.core.data.network.AuthService
+import com.marknjunge.core.data.network.service.AuthService
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.coVerify
diff --git a/core/src/test/java/com/marknjunge/core/data/repository/ApiCartRepositoryTest.kt b/core/src/test/java/com/marknjunge/core/data/repository/ApiCartRepositoryTest.kt
@@ -2,7 +2,7 @@ package com.marknjunge.core.data.repository
 
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.VerifyOrderDto
-import com.marknjunge.core.data.network.CartService
+import com.marknjunge.core.data.network.service.CartService
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.coVerify
diff --git a/core/src/test/java/com/marknjunge/core/data/repository/ApiProductsRepositoryTest.kt b/core/src/test/java/com/marknjunge/core/data/repository/ApiProductsRepositoryTest.kt
@@ -2,7 +2,7 @@ package com.marknjunge.core.data.repository
 
 import com.marknjunge.core.SampleData
 import com.marknjunge.core.data.model.Resource
-import com.marknjunge.core.data.network.ApiService
+import com.marknjunge.core.data.network.service.ApiService
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.coVerify
diff --git a/core/src/test/java/com/marknjunge/core/data/repository/ApiUsersRepositoryTest.kt b/core/src/test/java/com/marknjunge/core/data/repository/ApiUsersRepositoryTest.kt
@@ -3,7 +3,7 @@ package com.marknjunge.core.data.repository
 import com.marknjunge.core.SampleData
 import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.Resource
-import com.marknjunge.core.data.network.UsersService
+import com.marknjunge.core.data.network.service.UsersService
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.runBlocking

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package com.marknjunge.core.data.network`
`2`	`2`
`3`		`-interface GoogleSignInClientStub {`
	`3`	`+interface GoogleSignInService {`
`4`	`4`	`suspend fun signOut()`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.marknjunge.core.data.network`
	`1`	`+package com.marknjunge.core.data.network.service`
`2`	`2`
`3`	`3`	`import com.marknjunge.core.data.model.Product`
`4`	`4`	`import retrofit2.http.GET`