관리자, 팀원 일시 출석체크 관련 UI, 토큰 갱신 작업

Author: mkw8263

app/src/main/java/com/ddd/attendance/check/api/ApiService.kt

@@ -2,6 +2,7 @@ package com.ddd.attendance.check.api
 
 import com.ddd.attendance.check.model.Attendance
 import com.ddd.attendance.check.model.AttendanceCheckResponse
+import com.ddd.attendance.check.model.BaseResponse
 import com.ddd.attendance.check.model.LoginResponse
 import kotlinx.coroutines.Deferred
 import retrofit2.Response
@@ -15,6 +16,10 @@ interface ApiService {
     @POST("/auth/login")
     fun login(@Field("account") id: String, @Field("password") password: String): Deferred<Response<LoginResponse>>
 
+    @FormUrlEncoded
+    @POST("/auth/token")
+    fun refreshToken(@Field("refreshToken") refreshToken: String): Deferred<Response<BaseResponse>>
+
     @POST("/attends/start")
     fun attendsStart(): Deferred<Response<Attendance>>
 
@@ -24,4 +29,5 @@ interface ApiService {
     @FormUrlEncoded
     @POST("/attends/check")
     fun attendsCheck(@Field("userId") userId: String, @Field("number") number: String): Deferred<Response<AttendanceCheckResponse>>
+
 }

app/src/main/java/com/ddd/attendance/check/data/repository/UserRepository.kt

@@ -2,16 +2,30 @@ package com.ddd.attendance.check.data.repository
 
 import com.ddd.attendance.check.data.Repository
 import com.ddd.attendance.check.data.source.user.UserLocalDataSource
+import com.ddd.attendance.check.data.source.user.UserRemoteDataSource
 import com.ddd.attendance.check.db.entity.User
+import com.ddd.attendance.check.model.BaseResponse
+import retrofit2.Response
 import javax.inject.Inject
 
-class UserRepository @Inject constructor(private val userLocalDataSource: UserLocalDataSource) :
+class UserRepository @Inject constructor(
+    private val userLocalDataSource: UserLocalDataSource,
+    private val userRemoteDataSource: UserRemoteDataSource
+) :
     Repository {
     suspend fun saveUsers(user: User) {
         userLocalDataSource.saveUser(user)
     }
 
+    fun deleteUser(user: User) {
+        userLocalDataSource.deleteUser(user)
+    }
+
     fun getUsers(): List<User> {
         return userLocalDataSource.getUsers()
     }
+
+    suspend fun refreshToken(refreshToken: String): Response<BaseResponse> {
+        return userRemoteDataSource.refreshToken(refreshToken)
+    }
 }

app/src/main/java/com/ddd/attendance/check/data/source/user/UserLocalDataSource.kt

@@ -9,7 +9,9 @@ class UserLocalDataSource @Inject constructor(private val dddDataBase: DDDDataBa
     suspend fun saveUser(user: User) {
         dddDataBase.userDao().addUser(user)
     }
-
+    fun deleteUser(user: User){
+        dddDataBase.userDao().deleteUser(user)
+    }
     fun getUsers(): List<User> {
         return dddDataBase.userDao().getUsers()
     }

app/src/main/java/com/ddd/attendance/check/data/source/user/UserRemoteDataSource.kt

@@ -1,4 +1,13 @@
 package com.ddd.attendance.check.data.source.user
 
-class UserRemoteDataSource {
+import com.ddd.attendance.check.api.ApiService
+import com.ddd.attendance.check.model.BaseResponse
+import retrofit2.Response
+import javax.inject.Inject
+
+class UserRemoteDataSource @Inject constructor(private val apiService: ApiService) {
+
+    suspend fun refreshToken(refreshToken: String): Response<BaseResponse> {
+        return apiService.refreshToken(refreshToken).await()
+    }
 }

app/src/main/java/com/ddd/attendance/check/db/dao/UserDao.kt

@@ -1,9 +1,6 @@
 package com.ddd.attendance.check.db.dao
 
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
+import androidx.room.*
 import com.ddd.attendance.check.db.entity.User
 
 @Dao
@@ -12,5 +9,9 @@ interface UserDao {
     fun getUsers(): List<User>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun addUser(user: User)
+    suspend fun addUser(vararg user: User)
+
+
+    @Delete()
+    fun deleteUser(user: User)
 }

app/src/main/java/com/ddd/attendance/check/di/DDDComponent.kt

@@ -1,5 +1,6 @@
 import com.ddd.attendance.check.DDDApplication
 import com.ddd.attendance.check.di.module.*
+import com.ddd.attendance.check.di.module.SharedPreferencesModule
 import dagger.BindsInstance
 import dagger.Component
 import dagger.android.support.AndroidSupportInjectionModule
@@ -14,7 +15,8 @@ import javax.inject.Singleton
         ActivityBindingModule::class,
         AppModule::class,
         DataSource::class,
-        RepositoryModule::class]
+        RepositoryModule::class,
+        SharedPreferencesModule::class]
 )
 interface DDDComponent {
     @Component.Builder

app/src/main/java/com/ddd/attendance/check/di/module/RepositoryModule.kt

@@ -1,10 +1,11 @@
 package com.ddd.attendance.check.di.module
 
-import com.ddd.attendance.check.data.repository.LoginRepository
 import com.ddd.attendance.check.data.Repository
+import com.ddd.attendance.check.data.repository.LoginRepository
 import com.ddd.attendance.check.data.repository.UserRepository
 import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
 import com.ddd.attendance.check.data.source.user.UserLocalDataSource
+import com.ddd.attendance.check.data.source.user.UserRemoteDataSource
 import dagger.Module
 import dagger.Provides
 
@@ -16,7 +17,7 @@ class RepositoryModule {
     }
 
     @Provides
-    fun bindUserRepository(localDataSource: UserLocalDataSource): Repository {
-        return UserRepository(localDataSource)
+    fun bindUserRepository(localDataSource: UserLocalDataSource, remoteDataSource: UserRemoteDataSource): Repository {
+        return UserRepository(localDataSource, remoteDataSource)
     }
 }

app/src/main/java/com/ddd/attendance/check/di/module/SharedPreferencesModule.kt

@@ -0,0 +1,26 @@
+@file:Suppress("UNCHECKED_CAST")
+
+package com.ddd.attendance.check.di.module
+
+import android.content.Context.MODE_PRIVATE
+import android.content.SharedPreferences
+import com.ddd.attendance.check.DDDApplication
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class SharedPreferencesModule {
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(context: DDDApplication): SharedPreferences {
+        return context.getSharedPreferences(NAME_SHARED, MODE_PRIVATE)
+    }
+
+    companion object {
+        const val KEY_STATUS = "status"
+        const val NAME_SHARED = "ddd_admin_status"
+        const val KEY_NUMBER = "number"
+    }
+}

app/src/main/java/com/ddd/attendance/check/extension/ArchitectureComponentsExtension.kt

@@ -0,0 +1,9 @@
+package com.ddd.attendance.check.extension
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+
+fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
+    liveData.observe(this, Observer { it?.let { t -> action(t) } })
+}

app/src/main/java/com/ddd/attendance/check/extension/ContextExtension.kt

@@ -0,0 +1,8 @@
+package com.ddd.attendance.check.extension
+
+import android.content.Context
+import android.widget.Toast
+
+fun Context.showShortToast(msg: String) {
+    Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+}