일반 팀원 출첵 api 연결

Author: mkw8263

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

@@ -1,6 +1,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.LoginResponse
 import kotlinx.coroutines.Deferred
 import retrofit2.Response
@@ -19,4 +20,8 @@ interface ApiService {
 
     @POST("/attends/end")
     fun attendsEnd(): Deferred<Response<Attendance>>
+
+    @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/common/DDDDialog.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import com.ddd.attendance.check.R
 import com.ddd.attendance.check.vm.MainViewModel
+import com.ddd.attendance.check.vm.MainViewModel.Companion.MSG_ATTENDANCE_SUCCESS
 import kotlinx.android.synthetic.main.dialog_ddd.*
 
 
@@ -33,7 +34,7 @@ class DDDDialog(context: Context, private val data: Pair<UserType, String>) : Di
     private fun setDialogMarkImg(message: String) {
         val background = ContextCompat.getDrawable(
             context,
-            if (message == MainViewModel.MSG_ATTENDANCE_START) R.drawable.check_icon else R.drawable.exclamation
+            if (message == MainViewModel.MSG_ATTENDANCE_START || message == MSG_ATTENDANCE_SUCCESS) R.drawable.check_icon else R.drawable.exclamation
         )
         imgMark.background = background
     }

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

@@ -3,6 +3,7 @@ package com.ddd.attendance.check.data.repository
 import com.ddd.attendance.check.data.Repository
 import com.ddd.attendance.check.data.source.attendance.AttendanceRemoteDataSource
 import com.ddd.attendance.check.model.Attendance
+import com.ddd.attendance.check.model.AttendanceCheckResponse
 import retrofit2.Response
 import javax.inject.Inject
 
@@ -13,6 +14,10 @@ class AttendanceRepository @Inject constructor(private val attendanceRemoteDataS
     }
 
     suspend fun attendsEnd(): Response<Attendance> {
-        return attendanceRemoteDataSource.attendsEnd()
+        return attendanceRemoteDataSource.attendanceEnd()
+    }
+
+    suspend fun attendanceCheck(userId: String, number: String): Response<AttendanceCheckResponse> {
+        return attendanceRemoteDataSource.attendanceCheck(userId, number)
     }
 }

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

@@ -2,14 +2,19 @@ package com.ddd.attendance.check.data.source.attendance
 
 import com.ddd.attendance.check.api.ApiService
 import com.ddd.attendance.check.model.Attendance
+import com.ddd.attendance.check.model.AttendanceCheckResponse
 import retrofit2.Response
 
 class AttendanceRemoteDataSource(private val apiService: ApiService) {
     suspend fun attendanceStart(): Response<Attendance> {
         return apiService.attendsStart().await()
     }
 
-    suspend fun attendsEnd(): Response<Attendance> {
+    suspend fun attendanceEnd(): Response<Attendance> {
         return apiService.attendsEnd().await()
     }
+
+    suspend fun attendanceCheck(userId: String, number: String): Response<AttendanceCheckResponse> {
+        return apiService.attendsCheck(userId, number).await()
+    }
 }

app/src/main/java/com/ddd/attendance/check/model/AttendCheckResponse.kt

@@ -0,0 +1,7 @@
+package com.ddd.attendance.check.model
+
+data class AttendanceCheckResponse(
+    val status: String? = "",
+    val userId: Int? = 0,
+    val message: String? = ""
+)

app/src/main/java/com/ddd/attendance/check/vm/MainViewModel.kt

@@ -14,6 +14,7 @@ import com.ddd.attendance.check.model.Attendance
 import com.ddd.attendance.check.utill.SharedPreferences
 import com.ddd.attendance.check.utill.SingleLiveEvent
 import kotlinx.coroutines.*
+import org.json.JSONObject
 import java.io.IOException
 import javax.inject.Inject
 
@@ -100,7 +101,7 @@ class MainViewModel @Inject constructor(
         }
 
     }
-
+    // 관리자 출첵 시작
     private suspend fun attendanceStart() {
         val response = attendanceRepository.attendanceStart()
         if (response.isSuccessful) {
@@ -121,7 +122,7 @@ class MainViewModel @Inject constructor(
             job?.join()
         }
     }
-
+    // 관리자 출첵 종료
     private suspend fun attendanceEnd() {
         val response = attendanceRepository.attendsEnd()
         if (response.isSuccessful) {
@@ -131,13 +132,29 @@ class MainViewModel @Inject constructor(
         } else _showToastError.postValue(MSG_ALREADY_START)
     }
 
-    //일반 팀원 출첵 함수
-    private fun attendanceCheck() {
-
+    //일반 팀원 출첵
+    private suspend fun attendanceCheck() {
+        GlobalScope.launch {
+            try {
+                val response = attendanceRepository.attendanceCheck(
+                    userRepository.getUsers()[0].id.toString(),
+                    editNumberAttendance.get() ?: ""
+                )
+                if (response.isSuccessful) {
+                    showDDDDialog(MSG_ATTENDANCE_SUCCESS)
+                } else {
+                    JSONObject(response.errorBody()?.string()).run {
+                        showDDDDialog(optString(KEY_MSG_OBJ_JSON, ""))
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
     }
 
     private suspend fun Int.countDown() {
-        for (index in this downTo 1) {
+        for (index in this downTo 0) {
             _isAttendanceNumberCount.postValue(index)
             delay(COUNT_DELAY)
         }
@@ -148,9 +165,11 @@ class MainViewModel @Inject constructor(
     }
 
     companion object {
+        const val MSG_ATTENDANCE_SUCCESS = "출석체크가 완료되었습니다."
         const val MSG_ATTENDANCE_START = "출석체크가 시작되었습니다."
         const val MSG_ATTENDANCE_END = "출석체크가 종료되었습니다."
         const val MSG_ALREADY_START = "이미 출석 체크가 시작되었습니다.\n 잠시후 다시 시도 해주세요."
+        const val KEY_MSG_OBJ_JSON = "message"
         const val EMPTY_NUMBER = 0
         const val COUNT_DELAY: Long = 1000
     }