[FEAT/#91] 캘린더뷰 / 스크랩 목록 서버통신

app/src/main/java/com/terning/point/di/DataSourceModule.kt

@@ -1,11 +1,11 @@
 package com.terning.point.di
 
-import com.terning.data.datasource.MockDataSource
-import com.terning.data.datasource.ScrapDataSource
-import com.terning.data.datasourceimpl.MockDataSourceImpl
-import com.terning.data.datasourceimpl.ScrapDataSourceImpl
-import com.terning.data.repositoryimpl.ScrapRepositoryImpl
-import com.terning.domain.repository.ScrapRepository
+import com.terning.data.datasource.AuthDataSource
+import com.terning.data.datasource.SearchDataSource
+import com.terning.data.datasourceimpl.AuthDataSourceImpl
+import com.terning.data.datasourceimpl.SearchDataSourceImpl
+import com.terning.data.datasource.CalendarDataSource
+import com.terning.data.datasourceimpl.CalendarDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -18,9 +18,14 @@ abstract class DataSourceModule {
 
     @Binds
     @Singleton
-    abstract fun bindScrapRepository(scrapDataSourceImpl: ScrapDataSourceImpl): ScrapDataSource
+    abstract fun bindCalendarRepository(calendarDataSourceImpl: CalendarDataSourceImpl): CalendarDataSource
 
     @Binds
     @Singleton
-    abstract fun bindMockDataSource(mockDataSourceImpl: MockDataSourceImpl): MockDataSource
+    abstract fun bindAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindSearchViewsDataSource(searchViewsDataSourceImpl: SearchDataSourceImpl):
+            SearchDataSource
 }

app/src/main/java/com/terning/point/di/DataStoreModule.kt

@@ -0,0 +1,27 @@
+package com.terning.point.di
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.terning.data.local.TerningDataStore
+import com.terning.data.local.TerningDataStoreImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataStoreModule {
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences =
+        context.getSharedPreferences(context.packageName, Context.MODE_PRIVATE)
+
+    @Provides
+    @Singleton
+    fun provideTerningDataStore(dataStoreImpl: TerningDataStoreImpl): TerningDataStore =
+        dataStoreImpl
+}

app/src/main/java/com/terning/point/di/RepositoryModule.kt

@@ -1,9 +1,13 @@
 package com.terning.point.di
 
-import com.terning.data.repositoryimpl.MockRepositoryImpl
-import com.terning.data.repositoryimpl.ScrapRepositoryImpl
-import com.terning.domain.repository.MockRepository
-import com.terning.domain.repository.ScrapRepository
+import com.terning.data.repositoryimpl.AuthRepositoryImpl
+import com.terning.data.repositoryimpl.CalendarRepositoryImpl
+import com.terning.data.repositoryimpl.SearchViewsRepositoryImpl
+import com.terning.data.repositoryimpl.TokenRepositoryImpl
+import com.terning.domain.repository.AuthRepository
+import com.terning.domain.repository.CalendarRepository
+import com.terning.domain.repository.SearchRepository
+import com.terning.domain.repository.TokenRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -16,9 +20,17 @@ abstract class RepositoryModule {
 
     @Binds
     @Singleton
-    abstract fun scrapRepository(scrapRepositoryImpl: ScrapRepositoryImpl): ScrapRepository
+    abstract fun calendarRepository(calendarRepositoryImpl: CalendarRepositoryImpl): CalendarRepository
 
     @Binds
     @Singleton
-    abstract fun bindMockRepository(mockRepositoryImpl: MockRepositoryImpl): MockRepository
+    abstract fun bindAuthRepository(authRepositoryImpl: AuthRepositoryImpl): AuthRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindTokenRepository(tokenRepositoryImpl: TokenRepositoryImpl): TokenRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindSearchViewsRepository(searchViewsRepositoryImpl: SearchViewsRepositoryImpl): SearchRepository
 }

app/src/main/java/com/terning/point/di/RetrofitModule.kt

@@ -2,8 +2,8 @@ package com.terning.point.di
 
 import com.terning.core.extension.isJsonArray
 import com.terning.core.extension.isJsonObject
-import com.terning.point.BuildConfig
-import com.terning.point.di.qualifier.OPEN
+import com.terning.point.BuildConfig.BASE_URL
+import com.terning.point.di.qualifier.JWT
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -65,12 +65,12 @@ object RetrofitModule {
 
     @Provides
     @Singleton
-    @OPEN
-    fun provideOpenRetrofit(
+    @JWT
+    fun provideJWTRetrofit(
         client: OkHttpClient,
         factory: Converter.Factory
     ): Retrofit = Retrofit.Builder()
-        .baseUrl(BuildConfig.BASE_URL)
+        .baseUrl(BASE_URL)
         .addConverterFactory(factory)
         .client(client)
         .build()

app/src/main/java/com/terning/point/di/ServiceModule.kt

@@ -1,7 +1,9 @@
 package com.terning.point.di
 
-import com.terning.data.service.MockService
-import com.terning.point.di.qualifier.OPEN
+import com.terning.data.service.AuthService
+import com.terning.data.service.CalendarService
+import com.terning.data.service.SearchService
+import com.terning.point.di.qualifier.JWT
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -15,7 +17,17 @@ object ServiceModule {
 
     @Provides
     @Singleton
-    fun provideMockService(@OPEN retrofit: Retrofit): MockService =
-        retrofit.create(MockService::class.java)
+    fun provideAuthService(@JWT retrofit: Retrofit): AuthService =
+        retrofit.create(AuthService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideSearchService(@JWT retrofit: Retrofit): SearchService =
+        retrofit.create(SearchService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideCalendarService(@JWT retrofit: Retrofit): CalendarService =
+        retrofit.create(CalendarService::class.java)
 
 }

app/src/main/java/com/terning/point/di/qualifier/RetrofitQualifier.kt

@@ -5,4 +5,4 @@ import javax.inject.Qualifier
 
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
-annotation class OPEN
+annotation class JWT

core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt

@@ -68,9 +68,13 @@ fun TerningBasicTextField(
         keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
         keyboardActions = KeyboardActions(
             onDone = {
-                keyboardController?.hide()
-                focusManager.clearFocus()
-                onDoneAction?.invoke()
+                if (value.isNotBlank()) {
+                    keyboardController?.hide()
+                    focusManager.clearFocus()
+                    if (onDoneAction != null) {
+                        onDoneAction()
+                    }
+                }
             }
         ),
 

core/src/main/java/com/terning/core/extension/LocalDateExt.kt

@@ -1,6 +1,7 @@
 package com.terning.core.extension
 
 import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import java.time.format.TextStyle
 import java.util.Locale
 
@@ -10,6 +11,11 @@ fun LocalDate.getStringAsTitle(): String =
 fun LocalDate.getDateStringInKorean(): String =
     "${monthValue}월 ${dayOfMonth}일 ${dayOfWeek.getDisplayName(TextStyle.FULL, Locale.KOREAN)}"
 
+fun LocalDate.getDateAsMapString(): String {
+    val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+    return format(formatter)
+}
+
 fun LocalDate.getWeekIndexContainingSelectedDate(inDays: Int): Int = (inDays + dayOfMonth - 1) / 7
 
 fun LocalDate.isToday(): Boolean = this == LocalDate.now()

core/src/main/java/com/terning/core/extension/Map.kt

@@ -0,0 +1,3 @@
+package com.terning.core.extension
+
+fun<T> List<T>?.isListNotEmpty():Boolean = this.orEmpty().isNotEmpty()

data/src/main/java/com/terning/data/datasource/AuthDataSource.kt

@@ -0,0 +1,12 @@
+package com.terning.data.datasource
+
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.request.SignInRequestDto
+import com.terning.data.dto.response.SignInResponseDto
+
+interface AuthDataSource {
+    suspend fun postSignIn(
+        authorization: String,
+        platform: SignInRequestDto
+    ): BaseResponse<SignInResponseDto>
+}

data/src/main/java/com/terning/data/datasource/CalendarDataSource.kt

@@ -0,0 +1,15 @@
+package com.terning.data.datasource
+
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.request.CalendarDayListRequestDto
+import com.terning.data.dto.request.CalendarMonthListRequestDto
+import com.terning.data.dto.request.CalendarMonthRequestDto
+import com.terning.data.dto.response.CalendarDayListResponseDto
+import com.terning.data.dto.response.CalendarMonthListResponseDto
+import com.terning.data.dto.response.CalendarMonthResponseDto
+
+interface CalendarDataSource {
+    suspend fun getCalendarMonth(request: CalendarMonthRequestDto): BaseResponse<List<CalendarMonthResponseDto>>
+    suspend fun getCalendarMonthList(request: CalendarMonthListRequestDto): BaseResponse<List<CalendarMonthListResponseDto>>
+    suspend fun getCalendarDayList(request: CalendarDayListRequestDto): BaseResponse<List<CalendarDayListResponseDto>>
+}

data/src/main/java/com/terning/data/datasource/SearchDataSource.kt

@@ -0,0 +1,8 @@
+package com.terning.data.datasource
+
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.response.SearchViewsResponseDto
+
+interface SearchDataSource {
+    suspend fun getSearchViews(): BaseResponse<SearchViewsResponseDto>
+}

data/src/main/java/com/terning/data/datasourceimpl/AuthDataSourceImpl.kt

@@ -0,0 +1,17 @@
+package com.terning.data.datasourceimpl
+
+import com.terning.data.datasource.AuthDataSource
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.request.SignInRequestDto
+import com.terning.data.dto.response.SignInResponseDto
+import com.terning.data.service.AuthService
+import javax.inject.Inject
+
+class AuthDataSourceImpl @Inject constructor(
+    private val authService: AuthService
+) : AuthDataSource {
+    override suspend fun postSignIn(
+        authorization: String,
+        platform: SignInRequestDto
+    ): BaseResponse<SignInResponseDto> = authService.postSignIn(authorization, platform)
+}

data/src/main/java/com/terning/data/datasourceimpl/CalendarDataSourceImpl.kt

@@ -0,0 +1,25 @@
+package com.terning.data.datasourceimpl
+
+import com.terning.data.datasource.CalendarDataSource
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.request.CalendarDayListRequestDto
+import com.terning.data.dto.request.CalendarMonthListRequestDto
+import com.terning.data.dto.request.CalendarMonthRequestDto
+import com.terning.data.dto.response.CalendarDayListResponseDto
+import com.terning.data.dto.response.CalendarMonthListResponseDto
+import com.terning.data.dto.response.CalendarMonthResponseDto
+import com.terning.data.service.CalendarService
+import javax.inject.Inject
+
+class CalendarDataSourceImpl @Inject constructor(
+    private val calendarService: CalendarService
+) : CalendarDataSource {
+    override suspend fun getCalendarMonth(request: CalendarMonthRequestDto): BaseResponse<List<CalendarMonthResponseDto>> =
+        CalendarList.getCalendarScrapMonth(request)
+
+    override suspend fun getCalendarMonthList(request: CalendarMonthListRequestDto): BaseResponse<List<CalendarMonthListResponseDto>> =
+        CalendarList.getCalendarScrapMonthList(request)
+
+    override suspend fun getCalendarDayList(request: CalendarDayListRequestDto): BaseResponse<List<CalendarDayListResponseDto>> =
+        CalendarList.getCalendarScrapDayList(request)
+}