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

[Feature] 카카오 로그인 토큰 네트워크 연결 #152

Merged
merged 5 commits into from
Jan 29, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
[del] #151 mock data
Jokwanhee committed Jan 29, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 57fe0b322131fefe664903da8915e2dab86e1018
8 changes: 2 additions & 6 deletions app/src/main/java/com/jjbaksa/jjbaksa/di/DataSourceModule.kt
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ package com.jjbaksa.jjbaksa.di
import android.content.Context
import com.jjbaksa.data.api.AuthApi
import com.jjbaksa.data.api.NoAuthApi
import com.jjbaksa.data.api.TestNoAuthApi
import com.jjbaksa.data.database.UserDao
import com.jjbaksa.data.datasource.local.HomeLocalDataSource
import com.jjbaksa.data.datasource.local.UserLocalDataSource
@@ -60,7 +59,6 @@ object DataSourceModule {
fun provideRemoteSearchDataSource(
authApi: AuthApi,
noAuthApi: NoAuthApi,
testNoAuthApi: TestNoAuthApi
): SearchRemoteDataSource {
return SearchRemoteDataSource(authApi, noAuthApi)
}
@@ -85,19 +83,17 @@ object DataSourceModule {
fun provideRemoteShopDataSource(
authApi: AuthApi,
noAuthApi: NoAuthApi,
testNoAuthApi: TestNoAuthApi
): ShopRemoteDataSource {
return ShopRemoteDataSource(authApi, noAuthApi, testNoAuthApi)
return ShopRemoteDataSource(authApi, noAuthApi)
}

@Provides
@Singleton
fun provideRemoteScrapDataSource(
authApi: AuthApi,
noAuthApi: NoAuthApi,
testNoAuthApi: TestNoAuthApi
): ScrapRemoteDataSource {
return ScrapRemoteDataSource(authApi, noAuthApi, testNoAuthApi)
return ScrapRemoteDataSource(authApi, noAuthApi)
}

@Provides
36 changes: 0 additions & 36 deletions app/src/main/java/com/jjbaksa/jjbaksa/di/NetworkModule.kt
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ import com.jjbaksa.data.BASE_URL
import com.jjbaksa.data.api.AuthApi
import com.jjbaksa.data.api.NoAuthApi
import com.jjbaksa.data.api.RefreshApi
import com.jjbaksa.data.api.TestNoAuthApi
import com.jjbaksa.data.database.PreferenceKeys
import com.jjbaksa.data.database.userDataStore
import com.jjbaksa.jjbaksa.JjbaksaApp
@@ -40,10 +39,6 @@ annotation class AUTH
@Retention(AnnotationRetention.BINARY)
annotation class NOAUTH

@Qualifier
@Retention(AnnotationRetention.BINARY)
annotation class TEST

@Qualifier
@Retention(AnnotationRetention.BINARY)
annotation class REFRESH
@@ -189,35 +184,4 @@ object NetworkModule {
fun provideAuthApi(@AUTH retrofit: Retrofit): AuthApi {
return retrofit.create(AuthApi::class.java)
}

/**
* MOCK TEST
*/
@TEST
@Provides
@Singleton
fun testProvideNoAuthOkHttpClient(): OkHttpClient {
return OkHttpClient.Builder().apply {
connectTimeout(10, TimeUnit.SECONDS)
readTimeout(30, TimeUnit.SECONDS)
writeTimeout(15, TimeUnit.SECONDS)
addInterceptor(httpLoggingInterceptor)
}.build()
}
@TEST
@Provides
@Singleton
fun testProvideNoAuthRetrofit(@TEST okHttpClient: OkHttpClient): Retrofit {
return Retrofit.Builder()
.client(okHttpClient)
.baseUrl("https://run.mocky.io/")
.addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(GsonConverterFactory.create())
.build()
}
@Provides
@Singleton
fun testProvideNoAuthApi(@TEST retrofit: Retrofit): TestNoAuthApi {
return retrofit.create(TestNoAuthApi::class.java)
}
}
19 changes: 0 additions & 19 deletions data/src/main/java/com/jjbaksa/data/api/TestNoAuthApi.kt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ package com.jjbaksa.data.datasource.remote

import com.jjbaksa.data.api.AuthApi
import com.jjbaksa.data.api.NoAuthApi
import com.jjbaksa.data.api.TestNoAuthApi
import com.jjbaksa.data.datasource.ScrapDataSource
import com.jjbaksa.data.model.scrap.AddShopScrapBodyReq
import com.jjbaksa.data.model.scrap.AddShopScrapResp
@@ -13,8 +12,7 @@ import javax.inject.Inject

class ScrapRemoteDataSource @Inject constructor(
private val authApi: AuthApi,
private val noAuthApi: NoAuthApi,
private val testNoAuthApi: TestNoAuthApi
private val noAuthApi: NoAuthApi
) : ScrapDataSource {
override suspend fun getShopScrap(scrapId: Int): Response<ShopScrapResp> {
return authApi.getShopScrap(scrapId)
@@ -28,7 +26,6 @@ class ScrapRemoteDataSource @Inject constructor(
}

override suspend fun getScraps(user: Int?, cursor: Int?, size: Int): Response<ScrapsResp> {
// return testNoAuthApi.getScraps()
return authApi.getScraps(user, cursor, size)
}

Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ package com.jjbaksa.data.datasource.remote

import com.jjbaksa.data.api.AuthApi
import com.jjbaksa.data.api.NoAuthApi
import com.jjbaksa.data.api.TestNoAuthApi
import com.jjbaksa.data.datasource.ShopDataSource
import com.jjbaksa.data.model.shop.ShopsMapsResp
import com.jjbaksa.data.model.pin.ShopDetailResp
@@ -13,20 +12,17 @@ import javax.inject.Inject
class ShopRemoteDataSource @Inject constructor(
private val authApi: AuthApi,
private val noAuthApi: NoAuthApi,
private val testNoAuthApi: TestNoAuthApi
) : ShopDataSource {
override suspend fun getShopsMaps(
optionsFriend: Int,
optionsNearby: Int,
optionsScrap: Int,
location: LocationBody
): Response<List<ShopsMapsResp>> {
// return testNoAuthApi.getMapShop()
return authApi.getShopsMaps(optionsFriend, optionsNearby, optionsScrap, location)
}

override suspend fun getShopDetail(placeId: String): Response<ShopDetailResp> {
// return testNoAuthApi.getShopDetail()
return authApi.getShopDetail(placeId)
}
}