🚀 :: Release/1.6.2-17

app/build.gradle.kts

@@ -8,8 +8,8 @@ android {
     namespace = "khs.onmi.aos"
 
     defaultConfig {
-        versionCode = 16
-        versionName = "1.6.1"
+        versionCode = 17
+        versionName = "1.6.2"
     }
 
     packaging {

data/src/main/java/com/onmi/data/datasource/TimeTableDataSource.kt

@@ -1,14 +1,16 @@
 package com.onmi.data.datasource
 
+import com.onmi.domain.model.school.SchoolType
+
 interface TimeTableDataSource {
 
     suspend fun getTimeTable(
         schoolCode: String,
-        schoolType: String,
+        schoolType: SchoolType,
         educationCode: String,
         grade: Int,
         `class`: Int,
-        department: String,
+        department: String?,
         date: String,
-    ): List<String>
+    ): List<String>?
 }

data/src/main/java/com/onmi/data/datasourceimpl/TimeTableDataSourceImpl.kt

@@ -6,6 +6,7 @@ import com.onmi.data.dto.timetable.response.GetMiddleSchoolTimeTableResponse
 import com.onmi.data.dto.timetable.response.GetSpecialSchoolTimeTableResponse
 import com.onmi.data.datasource.TimeTableDataSource
 import com.onmi.data.utils.bodyOrThrow
+import com.onmi.domain.model.school.SchoolType
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import io.ktor.client.request.parameter
@@ -18,58 +19,33 @@ class TimeTableDataSourceImpl @Inject constructor(
 
     override suspend fun getTimeTable(
         schoolCode: String,
-        schoolType: String,
+        schoolType: SchoolType,
         educationCode: String,
         grade: Int,
         `class`: Int,
-        department: String,
+        department: String?,
         date: String,
-    ): List<String> {
-        return fetchTimeTable(
-            schoolType, educationCode, schoolCode, grade, `class`, date, department
-        ) ?: fetchTimeTable(
-            schoolType, educationCode, schoolCode, grade, `class`, date
-        ) ?: emptyList()
-    }
-
-
-    private suspend fun fetchTimeTable(
-        schoolType: String,
-        educationCode: String,
-        schoolCode: String,
-        grade: Int,
-        `class`: Int,
-        date: String,
-        department: String? = null,
     ): List<String>? {
         val response = httpClient.get {
-            url("/hub/${schoolType}Timetable")
+            url("/hub/${schoolType.key}Timetable")
             parameter("ATPT_OFCDC_SC_CODE", educationCode)
             parameter("SD_SCHUL_CODE", schoolCode)
-            parameter("DDDEP_NM", department)
+            if (department != null) parameter("DDDEP_NM", department)
             parameter("GRADE", grade)
             parameter("CLASS_NM", `class`)
             parameter("ALL_TI_YMD", date)
         }
 
         return when (schoolType) {
-            "els" -> response.bodyOrThrow<GetElementarySchoolTimTableResponse>().timetable?.getOrNull(1)?.row
-                ?.distinctBy { it.period }
-                ?.map { it.subject }
+            SchoolType.Elementary -> response.bodyOrThrow<GetElementarySchoolTimTableResponse>().timetable
 
-            "mis" -> response.bodyOrThrow<GetMiddleSchoolTimeTableResponse>().timetable?.getOrNull(1)?.row
-                ?.distinctBy { it.period }
-                ?.map { it.subject }
+            SchoolType.Middle -> response.bodyOrThrow<GetMiddleSchoolTimeTableResponse>().timetable
 
-            "his" -> response.bodyOrThrow<GetHighSchoolTimeTableResponse>().timetable?.getOrNull(1)?.row
-                ?.distinctBy { it.period }
-                ?.map { it.subject }
+            SchoolType.High -> response.bodyOrThrow<GetHighSchoolTimeTableResponse>().timetable
 
-            "sps" -> response.bodyOrThrow<GetSpecialSchoolTimeTableResponse>().timetable?.getOrNull(1)?.row
-                ?.distinctBy { it.period }
-                ?.map { it.subject }
-
-            else -> emptyList()
-        }
+            SchoolType.Special -> response.bodyOrThrow<GetSpecialSchoolTimeTableResponse>().timetable
+        }?.getOrNull(1)?.row
+            ?.distinctBy { it.period }
+            ?.map { it.subject }
     }
 }

data/src/main/java/com/onmi/data/network/KtorClient.kt

@@ -7,7 +7,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.cio.CIO
+import io.ktor.client.engine.android.Android
 import io.ktor.client.plugins.DefaultRequest
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.logging.LogLevel
@@ -27,7 +27,7 @@ object KtorClient {
     @Singleton
     @Provides
     fun provideKtorHttpClient(): HttpClient {
-        val client = HttpClient(CIO) {
+        val client = HttpClient(Android) {
             install(Logging) {
                 level = LogLevel.ALL
                 logger = object : Logger {

data/src/main/java/com/onmi/data/repository/TimeTableRepositoryImpl.kt

@@ -1,6 +1,7 @@
 package com.onmi.data.repository
 
 import com.onmi.data.datasource.TimeTableDataSource
+import com.onmi.domain.model.school.SchoolType
 import com.onmi.domain.repository.TimeTableRepository
 import javax.inject.Inject
 
@@ -10,13 +11,13 @@ class TimeTableRepositoryImpl @Inject constructor(
 
     override suspend fun getTimeTable(
         schoolCode: String,
-        schoolType: String,
+        schoolType: SchoolType,
         educationCode: String,
         grade: Int,
         `class`: Int,
-        department: String,
+        department: String?,
         date: String,
-    ): List<String> {
+    ): List<String>? {
         return service.getTimeTable(
             schoolCode = schoolCode,
             schoolType = schoolType,

domain/src/main/java/com/onmi/domain/model/school/SchoolType.kt

@@ -0,0 +1,20 @@
+package com.onmi.domain.model.school
+
+enum class SchoolType(val key: String) {
+    Elementary("els"),
+    Middle("mis"),
+    High("his"),
+    Special("sps");
+
+    companion object {
+        fun convertSchoolTypeToKey(type: String): SchoolType {
+            return when (type) {
+                "초등학교" -> Elementary
+                "중학교" -> Middle
+                "고등학교" -> High
+                "특수학교" -> Special
+                else -> throw IllegalArgumentException("알 수 없는 학교 타입입니다: $type")
+            }
+        }
+    }
+}

domain/src/main/java/com/onmi/domain/repository/TimeTableRepository.kt

@@ -1,14 +1,16 @@
 package com.onmi.domain.repository
 
+import com.onmi.domain.model.school.SchoolType
+
 interface TimeTableRepository {
 
     suspend fun getTimeTable(
         schoolCode: String,
-        schoolType: String,
+        schoolType: SchoolType,
         educationCode: String,
         grade: Int,
         `class`: Int,
-        department: String,
+        department: String?,
         date: String,
-    ): List<String>
+    ): List<String>?
 }

domain/src/main/java/com/onmi/domain/usecase/timetable/GetTimeTableUseCase.kt

@@ -2,6 +2,8 @@ package com.onmi.domain.usecase.timetable
 
 import com.onmi.domain.exception.NeisException
 import com.onmi.domain.exception.NeisResult
+import com.onmi.domain.model.school.SchoolType
+import com.onmi.domain.model.user.UserInfoModel
 import com.onmi.domain.repository.TimeTableRepository
 import com.onmi.domain.usecase.user.GetUserInfoFlowUseCase
 import com.onmi.domain.util.DateUtils
@@ -42,16 +44,27 @@ class GetTimeTableUseCase @Inject constructor(
 ) {
     suspend operator fun invoke(targetDate: String) = runCatching {
         val userInfo = getUserInfoFlowUseCase().first()
-
-        repository.getTimeTable(
-            schoolCode = userInfo.schoolCode,
-            schoolType = convertSchoolTypeToKey(userInfo.schoolType),
-            educationCode = userInfo.educationCode,
-            grade = userInfo.grade,
-            `class` = userInfo.classroom,
-            department = userInfo.department,
-            date = targetDate
-        )
+        val department = userInfo.department.takeIf { it.isNotBlank() }
+        val schoolType = SchoolType.convertSchoolTypeToKey(userInfo.schoolType)
+
+        try {
+            request(
+                userInfo = userInfo,
+                schoolType = schoolType,
+                targetDate = targetDate,
+                department = department
+            )
+        } catch (e: NeisException) {
+            // 학과 정보가 있고, DATA_NOT_FOUND 에러인 경우에만 학과 정보 제외하고 재시도
+            if (department != null && e.result == NeisResult.DATA_NOT_FOUND) {
+                request(
+                    userInfo = userInfo,
+                    schoolType = schoolType,
+                    targetDate = targetDate,
+                    department = null
+                )
+            } else throw e
+        }
     }.fold(
         onSuccess = { result ->
             TimeTableState.Success(result)
@@ -77,13 +90,20 @@ class GetTimeTableUseCase @Inject constructor(
         }
     )
 
-    private fun convertSchoolTypeToKey(type: String): String {
-        return when (type) {
-            "초등학교" -> "els"
-            "중학교" -> "mis"
-            "고등학교" -> "his"
-            "특수학교" -> "sps"
-            else -> throw RuntimeException("알 수 없는 학교 타입입니다.")
-        }
+    private suspend fun request(
+        userInfo: UserInfoModel,
+        schoolType: SchoolType,
+        targetDate: String,
+        department: String?,
+    ): List<String> {
+        return repository.getTimeTable(
+            schoolCode = userInfo.schoolCode,
+            schoolType = schoolType,
+            educationCode = userInfo.educationCode,
+            grade = userInfo.grade,
+            `class` = userInfo.classroom,
+            department = department,
+            date = targetDate
+        ) ?: throw NeisException(NeisResult.DATA_NOT_FOUND)
     }
 }

gradle/libs.versions.toml

@@ -54,7 +54,7 @@ orbit-compose = { group = "org.orbit-mvi", name = "orbit-compose", version.ref =
 
 # ktor
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }
 ktor-client-logging-jvm = { group = "io.ktor", name = "ktor-client-logging-jvm", version.ref = "ktor" }
 ktor-client-serialization = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
@@ -109,7 +109,7 @@ orbit = [
 ]
 ktor = [
     "ktor-client-core",
-    "ktor-client-cio",
+    "ktor-client-android",
     "ktor-client-logging-jvm",
     "ktor-client-serialization",
     "ktor-client-content-negotiation"