Merge pull request #230 from School-of-Company/feature/229-training-l…

…ist-training-teacher-list-qr-code-scan

🔀 :: (#229) - 연수 프로그램 리스트, 프로그램별 교원연수 리스트 출석부 불러오기 및 연수 QR인식 기능을 구현하였습니다.

app/src/main/AndroidManifest.xml

@@ -6,6 +6,15 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+
+    <uses-feature android:name="android.hardware.camera" />
+
     <application
         android:name=".ExpoApplication"
         android:allowBackup="true"

app/src/main/java/com/school_of_company/expo_android/navigation/ExpoNavHost.kt

@@ -21,10 +21,12 @@ import com.school_of_company.home.navigation.homeDetailParticipantManagementScre
 import com.school_of_company.home.navigation.homeDetailProgramParticipantScreen
 import com.school_of_company.home.navigation.homeDetailProgramScreen
 import com.school_of_company.home.navigation.homeSendMessageScreen
+import com.school_of_company.home.navigation.navigateQrScanner
 import com.school_of_company.home.navigation.navigateToHomeDetailParticipantManagement
 import com.school_of_company.home.navigation.navigateToHomeDetailProgram
 import com.school_of_company.home.navigation.navigateToHomeDetailProgramParticipant
 import com.school_of_company.home.navigation.navigateToHomeSendMessage
+import com.school_of_company.home.navigation.qrScannerScreen
 import com.school_of_company.navigation.navigateToSignIn
 import com.school_of_company.navigation.sigInRoute
 import com.school_of_company.navigation.signInScreen
@@ -133,7 +135,9 @@ fun ExpoNavHost(
             onModifyClick = { id ->
                 navController.navigateToExpoModify(id)
             },
-            onProgramClick = navController::navigateToHomeDetailProgram
+            onProgramClick = { id ->
+                navController.navigateToHomeDetailProgram(id)
+            }
         )
 
         homeSendMessageScreen(
@@ -142,11 +146,14 @@ fun ExpoNavHost(
 
         homeDetailProgramScreen(
             onBackClick = navController::popBackStack,
-            navigateToProgramDetail = navController::navigateToHomeDetailProgramParticipant
+            navigateToProgramDetail = { id ->
+                navController.navigateToHomeDetailProgramParticipant(id)
+            }
         )
 
         homeDetailProgramParticipantScreen(
-            onBackClick = navController::popBackStack
+            onBackClick = navController::popBackStack,
+            navigateToQrScanner = navController::navigateQrScanner
         )
 
         homeDetailParticipantManagementScreen(
@@ -161,5 +168,10 @@ fun ExpoNavHost(
         expoCreateScreen(
             onErrorToast = makeErrorToast
         )
+
+        qrScannerScreen(
+            onBackClick = navController::popBackStack,
+            onPermissionBlock = navController::popBackStack
+        )
     }
 }

app/src/main/java/com/school_of_company/expo_android/ui/ExpoApp.kt

@@ -69,8 +69,7 @@ fun ExpoApp(
             }
         ) { paddingValues ->
             // 네비게이션 호스트
-            Box(modifier = Modifier.padding(paddingValues =
-            paddingValues)) {
+            Box(modifier = Modifier.padding(paddingValues = paddingValues)) {
                 ExpoNavHost(appState = appState)
             }
         }

core/data/src/main/java/com/school_of_company/data/di/RepositoryModule.kt

@@ -1,5 +1,7 @@
 package com.school_of_company.data.di
 
+import com.school_of_company.data.repository.attendance.AttendanceRepository
+import com.school_of_company.data.repository.attendance.AttendanceRepositoryImpl
 import com.school_of_company.data.repository.auth.AuthRepository
 import com.school_of_company.data.repository.auth.AuthRepositoryImpl
 import com.school_of_company.data.repository.expo.ExpoRepository
@@ -50,4 +52,9 @@ abstract class RepositoryModule {
     abstract fun bindStandardRepository(
         standardRepositoryImpl: StandardRepositoryImpl
     ) : StandardRepository
+
+    @Binds
+    abstract fun bindAttendanceRepository(
+        attendanceRepositoryImpl: AttendanceRepositoryImpl
+    ) : AttendanceRepository
 }

core/data/src/main/java/com/school_of_company/data/repository/attendance/AttendanceRepository.kt

@@ -0,0 +1,8 @@
+package com.school_of_company.data.repository.attendance
+
+import com.school_of_company.model.param.attendance.TrainingQrCodeRequestParam
+import kotlinx.coroutines.flow.Flow
+
+interface AttendanceRepository {
+    fun trainingQrCode(trainingId: Long, body: TrainingQrCodeRequestParam) : Flow<Unit>
+}

core/data/src/main/java/com/school_of_company/data/repository/attendance/AttendanceRepositoryImpl.kt

@@ -0,0 +1,21 @@
+package com.school_of_company.data.repository.attendance
+
+import com.school_of_company.model.param.attendance.TrainingQrCodeRequestParam
+import com.school_of_company.network.datasource.attendance.AttendanceDataSource
+import com.school_of_company.network.mapper.attendance.request.toDto
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class AttendanceRepositoryImpl @Inject constructor(
+    private val dataSource: AttendanceDataSource
+) : AttendanceRepository {
+    override fun trainingQrCode(
+        trainingId: Long,
+        body: TrainingQrCodeRequestParam
+    ): Flow<Unit> {
+        return dataSource.trainingQrCode(
+            trainingId = trainingId,
+            body = body.toDto()
+        )
+    }
+}

core/domain/src/main/java/com/school_of_company/domain/usecase/attendance/TrainingQrCodeRequestUseCase.kt

@@ -0,0 +1,19 @@
+package com.school_of_company.domain.usecase.attendance
+
+import com.school_of_company.data.repository.attendance.AttendanceRepository
+import com.school_of_company.model.param.attendance.TrainingQrCodeRequestParam
+import javax.inject.Inject
+
+class TrainingQrCodeRequestUseCase @Inject constructor(
+    private val repository: AttendanceRepository
+) {
+    operator fun invoke(
+        trainingId: Long,
+        body: TrainingQrCodeRequestParam
+    ) = runCatching {
+        repository.trainingQrCode(
+            trainingId = trainingId,
+            body = body
+        )
+    }
+}

core/model/src/main/java/com/school_of_company/model/entity/training/TeacherTrainingProgramResponseEntity.kt

@@ -1,11 +1,12 @@
 package com.school_of_company.model.entity.training
 
 data class TeacherTrainingProgramResponseEntity(
+    val id: Long,
     val name: String,
     val organization: String,
     val position: String,
     val programName: String,
     val status: Boolean,
-    val entryTime: String,
-    val leaveTime: String
+    val entryTime: String?,
+    val leaveTime: String?
 )

core/model/src/main/java/com/school_of_company/model/param/attendance/TrainingQrCodeRequestParam.kt

@@ -0,0 +1,5 @@
+package com.school_of_company.model.param.attendance
+
+data class TrainingQrCodeRequestParam (
+    val traineeId: Long
+)

core/network/src/main/java/com/school_of_company/network/api/AttendanceAPI.kt

@@ -0,0 +1,15 @@
+package com.school_of_company.network.api
+
+import com.school_of_company.network.dto.attendance.request.TrainingQrCodeRequest
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface AttendanceAPI {
+
+    @GET("/attendance/training/{trainingPro_id}")
+    suspend fun trainingQrCode(
+        @Path("trainingPro_id") trainingId: Long,
+        @Body body: TrainingQrCodeRequest
+    )
+}

core/network/src/main/java/com/school_of_company/network/datasource/attendance/AttendanceDataSource.kt

@@ -0,0 +1,8 @@
+package com.school_of_company.network.datasource.attendance
+
+import com.school_of_company.network.dto.attendance.request.TrainingQrCodeRequest
+import kotlinx.coroutines.flow.Flow
+
+interface AttendanceDataSource {
+    fun trainingQrCode(trainingId: Long, body: TrainingQrCodeRequest) : Flow<Unit>
+}

core/network/src/main/java/com/school_of_company/network/datasource/attendance/AttendanceDataSourceImpl.kt

@@ -0,0 +1,20 @@
+package com.school_of_company.network.datasource.attendance
+
+import com.school_of_company.network.api.AttendanceAPI
+import com.school_of_company.network.dto.attendance.request.TrainingQrCodeRequest
+import com.school_of_company.network.util.performApiRequest
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class AttendanceDataSourceImpl @Inject constructor(
+    private val service: AttendanceAPI
+) : AttendanceDataSource {
+    override fun trainingQrCode(
+        trainingId: Long,
+        body: TrainingQrCodeRequest
+    ): Flow<Unit> =
+        performApiRequest { service.trainingQrCode(
+            body = body,
+            trainingId = trainingId
+        ) }
+}

core/network/src/main/java/com/school_of_company/network/di/NetworkModule.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.Log
 import com.readystatesoftware.chuck.ChuckInterceptor
 import com.school_of_company.network.BuildConfig
+import com.school_of_company.network.api.AttendanceAPI
 import com.school_of_company.network.api.AuthAPI
 import com.school_of_company.network.api.ExpoAPI
 import com.school_of_company.network.api.ImageAPI
@@ -114,4 +115,7 @@ object NetworkModule {
     fun provideStandardAPI(retrofit: Retrofit) : StandardAPI =
         retrofit.create(StandardAPI::class.java)
 
+    @Provides
+    fun provideAttendanceAPI(retrofit: Retrofit) : AttendanceAPI =
+        retrofit.create(AttendanceAPI::class.java)
 }

core/network/src/main/java/com/school_of_company/network/di/RemoteDataSourceModule.kt

@@ -1,5 +1,7 @@
 package com.school_of_company.network.di
 
+import com.school_of_company.network.datasource.attendance.AttendanceDataSource
+import com.school_of_company.network.datasource.attendance.AttendanceDataSourceImpl
 import com.school_of_company.network.datasource.auth.AuthDataSource
 import com.school_of_company.network.datasource.auth.AuthDataSourceImpl
 import com.school_of_company.network.datasource.expo.ExpoDataSource
@@ -50,4 +52,9 @@ abstract class RemoteDataSourceModule {
     abstract fun bindStandardRemoteDataSource(
         standardDataSourceImpl: StandardDataSourceImpl
     ) : StandardDataSource
+
+    @Binds
+    abstract fun bindAttendanceRemoteDataSource(
+        attendanceDataSourceImpl: AttendanceDataSourceImpl
+    ) : AttendanceDataSource
 }

core/network/src/main/java/com/school_of_company/network/dto/attendance/request/TrainingQrCodeRequest.kt

@@ -0,0 +1,9 @@
+package com.school_of_company.network.dto.attendance.request
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class TrainingQrCodeRequest(
+    @Json(name = "traineeId") val traineeId: Long
+)

core/network/src/main/java/com/school_of_company/network/dto/training/response/TeacherTrainingProgramResponse.kt

@@ -5,11 +5,12 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class TeacherTrainingProgramResponse(
+    @Json(name = "id") val id: Long,
     @Json(name = "name") val name: String,
     @Json(name = "organization") val organization: String,
     @Json(name = "position") val position: String,
     @Json(name = "programName") val programName: String,
     @Json(name = "status") val status: Boolean,
-    @Json(name = "entryTime") val entryTime: String,
-    @Json(name = "leaveTime") val leaveTime: String
+    @Json(name = "entryTime") val entryTime: String?,
+    @Json(name = "leaveTime") val leaveTime: String?
 )

core/network/src/main/java/com/school_of_company/network/mapper/attendance/request/TrainingQrCodeRequestMapper.kt

@@ -0,0 +1,7 @@
+package com.school_of_company.network.mapper.attendance.request
+
+import com.school_of_company.model.param.attendance.TrainingQrCodeRequestParam
+import com.school_of_company.network.dto.attendance.request.TrainingQrCodeRequest
+
+fun TrainingQrCodeRequestParam.toDto(): TrainingQrCodeRequest =
+    TrainingQrCodeRequest(traineeId = traineeId)

core/network/src/main/java/com/school_of_company/network/mapper/training/response/TeacherTrainingProgramResponseMapper.kt

@@ -5,6 +5,7 @@ import com.school_of_company.network.dto.training.response.TeacherTrainingProgra
 
 fun TeacherTrainingProgramResponse.toEntity(): TeacherTrainingProgramResponseEntity =
     TeacherTrainingProgramResponseEntity(
+        id = this.id,
         name = this.name,
         organization = this.organization,
         position = this.position,

feature/expo/src/main/java/com/school_of_company/expo/navigation/ExpoNavigation.kt

@@ -58,7 +58,7 @@ fun NavGraphBuilder.expoDetailScreen(
     onCheckClick: () -> Unit,
     onQrGenerateClick: () -> Unit,
     onModifyClick: (String) -> Unit,
-    onProgramClick: () -> Unit
+    onProgramClick: (String) -> Unit
 ) {
     composable(route = "$expoDetailRoute/{id}") { backStackEntry ->
         val id = backStackEntry.arguments?.getString("id") ?: ""

feature/expo/src/main/java/com/school_of_company/expo/view/ExpoCreateScreen.kt

@@ -135,8 +135,8 @@ internal fun ExpoCreateRoute(
                         description = viewModel.introduce_title.value,
                         location = viewModel.location.value,
                         coverImage = (imageUpLoadUiState as ImageUpLoadUiState.Success).data.imageURL,
-                        x = 35.14308f,
-                        y = 126.80043f
+                        x = 37.511734f,
+                        y = 127.05905f
                     )
                 )
             }

feature/expo/src/main/java/com/school_of_company/expo/view/ExpoDetailScreen.kt

@@ -58,7 +58,7 @@ internal fun ExpoDetailRoute(
     onCheckClick: () -> Unit,
     onQrGenerateClick: () -> Unit,
     onModifyClick: (String) -> Unit,
-    onProgramClick: () -> Unit,
+    onProgramClick: (String) -> Unit,
     viewModel: ExpoViewModel = hiltViewModel()
 ) {
     val getExpoInformationUiState by viewModel.getExpoInformationUiState.collectAsStateWithLifecycle()
@@ -92,7 +92,7 @@ internal fun ExpoDetailScreen(
     onCheckClick: () -> Unit,
     onQrGenerateClick: () -> Unit,
     onModifyClick: (String) -> Unit,
-    onProgramClick: () -> Unit
+    onProgramClick: (String) -> Unit
 ) {
     val (openDialog, isOpenDialog) = rememberSaveable { mutableStateOf(false) }
     val (openQrDialog, isOpenQrDialog) = rememberSaveable { mutableStateOf(false) }
@@ -296,7 +296,7 @@ internal fun ExpoDetailScreen(
 
                             ExpoEnableDetailButton(
                                 text = "프로그램",
-                                onClick = onProgramClick,
+                                onClick = { onProgramClick(id) },
                                 modifier = Modifier
                                     .fillMaxWidth()
                                     .border(

feature/expo/src/main/java/com/school_of_company/expo/view/component/ExpoBottomSheet.kt

@@ -96,6 +96,7 @@ private fun HomeBottomSheetOptions(
                 indication = ripple(color = rippleColor),
                 interactionSource = remember { MutableInteractionSource() }
             )
+            .padding(horizontal = 12.dp)
     ) {
         Text(
             text = text,

feature/expo/src/main/java/com/school_of_company/expo/viewmodel/ExpoViewModel.kt

@@ -33,6 +33,7 @@ import com.school_of_company.model.model.expo.ExpoRequestAndResponseModel
 import com.school_of_company.model.model.standard.StandardRequestModel
 import com.school_of_company.model.model.training.TrainingDtoModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow

feature/home/build.gradle.kts

@@ -13,4 +13,18 @@ dependencies {
 
     implementation(libs.mlkit)
     implementation(libs.zxing.core)
+
+    implementation(libs.swiperefresh)
+
+    implementation(libs.camera.core)
+    implementation(libs.camera.view)
+    implementation(libs.camera.camera2)
+    implementation(libs.camera.lifecycle)
+    implementation(libs.camera.extensions)
+
+    implementation(libs.accompanist.permission)
+
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.play.services)
+
 }