Merge branch 'develop' of https://github.com/finocd2la/TSUDesk into feature/schedule

# Conflicts: # feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleApi.kt # feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/domain/model/ScheduleEntity.kt
2026-02-12 18:27:51 +03:00
parent 7c865b4e0f 4b79a2de8f
commit 3aef1d5eae
16 changed files with 196 additions and 96 deletions
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/datasource/ScheduleRemoteDataSource.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/datasource/ScheduleRemoteDataSource.kt
@@ -1,19 +1,9 @@
 package ru.fincode.tsudesk.feature.schedule.data.datasource

 import ru.fincode.tsudesk.core.network.model.NetworkResult
-import ru.fincode.tsudesk.core.network.safeApiCall
-import ru.fincode.tsudesk.feature.schedule.data.remote.ScheduleApi
-import ru.fincode.tsudesk.feature.schedule.data.remote.model.LessonDto.ScheduleSearchField.GROUP_P
-import ru.fincode.tsudesk.feature.schedule.data.remote.model.LessonDto.ScheduleSearchField.PREP
 import ru.fincode.tsudesk.feature.schedule.data.remote.model.ScheduleDto
-import javax.inject.Inject

-class ScheduleRemoteDataSource @Inject constructor(
-    private val api: ScheduleApi
-) {
-    suspend fun loadScheduleByGroup(number: String): NetworkResult<ScheduleDto> =
-        safeApiCall { api.getSchedule(GROUP_P, number) }
-
-    suspend fun loadScheduleByTeacher(name: String): NetworkResult<ScheduleDto> =
-        safeApiCall { api.getSchedule(PREP, name) }
+interface ScheduleRemoteDataSource {
+    suspend fun loadScheduleByGroup(number: String): NetworkResult<ScheduleDto>
+    suspend fun loadScheduleByTeacher(name: String): NetworkResult<ScheduleDto>
 }
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/datasource/ScheduleRemoteDataSourceImpl.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/datasource/ScheduleRemoteDataSourceImpl.kt
@@ -1,21 +0,0 @@
-package ru.fincode.tsudesk.feature.schedule.data.datasource
-
-import ru.fincode.tsudesk.core.network.model.NetworkResult
-import ru.fincode.tsudesk.core.network.model.map
-import ru.fincode.tsudesk.feature.schedule.data.mapper.ScheduleDtoToDomainMapper
-import ru.fincode.tsudesk.feature.schedule.domain.model.ScheduleEntity
-import ru.fincode.tsudesk.feature.schedule.domain.repository.ScheduleRepository
-import javax.inject.Inject
-
-class ScheduleRemoteDataSourceImpl @Inject constructor(
-    private val remote: ScheduleRemoteDataSource,
-    private val mapper: ScheduleDtoToDomainMapper
-) : ScheduleRepository {
-
-    override suspend fun loadScheduleByGroup(number: String): NetworkResult<ScheduleEntity> =
-        remote.loadScheduleByGroup(number).map(mapper::invoke)
-
-    override suspend fun loadScheduleByTeacher(name: String): NetworkResult<ScheduleEntity> =
-        remote.loadScheduleByTeacher(name).map(mapper::invoke)
-
-}
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/mapper/ScheduleDtoToDomainMapper.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/mapper/ScheduleDtoToDomainMapper.kt
@@ -1,5 +1,6 @@
 package ru.fincode.tsudesk.feature.schedule.data.mapper

+import ru.fincode.tsudesk.core.network.model.NetworkMeta
 import ru.fincode.tsudesk.feature.schedule.data.remote.model.LessonDto
 import ru.fincode.tsudesk.feature.schedule.data.remote.model.ScheduleDto
 import ru.fincode.tsudesk.feature.schedule.domain.model.LessonEntity
@@ -8,8 +9,11 @@ import javax.inject.Inject

 class ScheduleDtoToDomainMapper @Inject constructor() {

-    operator fun invoke(dto: ScheduleDto): ScheduleEntity =
-        ScheduleEntity(lessons = dto.map(::mapLesson))
+    operator fun invoke(dto: ScheduleDto, meta: NetworkMeta): ScheduleEntity =
+        ScheduleEntity(
+            lessons = dto.map(::mapLesson),
+            timestamp = meta.receivedAtMillis ?: meta.finishedAtMillis
+        )

    private fun mapLesson(item: LessonDto): LessonEntity =
        LessonEntity(
@@ -22,4 +26,4 @@ class ScheduleDtoToDomainMapper @Inject constructor() {
            groupId = item.groups.firstOrNull()?.groupCode.orEmpty(),
            type = item.type.trim()
        )
-}
+}
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleApi.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleApi.kt
@@ -1,27 +1,18 @@
 package ru.fincode.tsudesk.feature.schedule.data.remote

+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query
-import ru.fincode.tsudesk.feature.schedule.data.remote.model.LessonDto
-import ru.fincode.tsudesk.feature.schedule.data.remote.model.LessonDto.*
+import ru.fincode.tsudesk.feature.schedule.data.remote.ScheduleApiContract.Path.GET_SCHEDULE_METHOD
+import ru.fincode.tsudesk.feature.schedule.data.remote.ScheduleApiContract.Query.SEARCH_FIELD
+import ru.fincode.tsudesk.feature.schedule.data.remote.ScheduleApiContract.Query.SEARCH_VALUE
 import ru.fincode.tsudesk.feature.schedule.data.remote.model.ScheduleDto

 interface ScheduleApi {

-    /**
-     * Расписание по номеру группы.
-     * Пример: search_field=GROUP_P&search_value=220631
-     * https://tulsu.ru/schedule/queries/GetSchedule.php?search_field=GROUP_P&search_value=220631
-     *
-     *
-     * Расписание по ФИО преподавателя (строкой).
-     * Пример: search_field=PREP&search_value=Набродова Ирина Николаевна
-     *
-     * Важно: Retrofit сам URL-энкодит параметр search_value
-     * https://tulsu.ru/schedule/queries/GetDates.php?search_value=%D0%9D%D0%B0%D0%B1%D1%80%D0%BE%D0%B4%D0%BE%D0%B2%D0%B0%20%D0%98%D1%80%D0%B8%D0%BD%D0%B0%20%D0%9D%D0%B8%D0%BA%D0%BE%D0%BB%D0%B0%D0%B5%D0%B2%D0%BD%D0%B0
-     */
-    @GET("GetSchedule.php")
+    @GET(GET_SCHEDULE_METHOD)
    suspend fun getSchedule(
-        @Query("search_field") searchField: String, @Query("search_value") searchValue: String
-    ): ScheduleDto
+        @Query(SEARCH_FIELD) searchField: String,
+        @Query(SEARCH_VALUE) searchValue: String
+    ): Response<ScheduleDto>
 }
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleApiContract.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleApiContract.kt
@@ -0,0 +1,16 @@
+package ru.fincode.tsudesk.feature.schedule.data.remote
+
+object ScheduleApiContract {
+
+    object Path {
+        const val GET_SCHEDULE_METHOD = "GetSchedule.php"
+    }
+
+    object Query {
+        const val SEARCH_FIELD = "search_field"
+        const val SEARCH_VALUE = "search_value"
+
+        const val FIELD_GROUP = "GROUP_P"
+        const val FIELD_TEACHER = "PREP"
+    }
+}
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleRemoteDataSourceImpl.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/ScheduleRemoteDataSourceImpl.kt
@@ -0,0 +1,28 @@
+package ru.fincode.tsudesk.feature.schedule.data.remote
+
+import ru.fincode.tsudesk.core.network.model.NetworkResult
+import ru.fincode.tsudesk.core.network.apiCall
+import ru.fincode.tsudesk.feature.schedule.data.datasource.ScheduleRemoteDataSource
+import ru.fincode.tsudesk.feature.schedule.data.remote.model.ScheduleDto
+import javax.inject.Inject
+
+class ScheduleRemoteDataSourceImpl @Inject constructor(
+    private val api: ScheduleApi
+) : ScheduleRemoteDataSource {
+
+    override suspend fun loadScheduleByGroup(number: String): NetworkResult<ScheduleDto> =
+        apiCall {
+            api.getSchedule(
+                searchField = ScheduleApiContract.Query.FIELD_GROUP,
+                searchValue = number
+            )
+        }
+
+    override suspend fun loadScheduleByTeacher(name: String): NetworkResult<ScheduleDto> =
+        apiCall {
+            api.getSchedule(
+                searchField = ScheduleApiContract.Query.FIELD_TEACHER,
+                searchValue = name
+            )
+        }
+}
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/di/ScheduleRemoteDataSourceModule.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/di/ScheduleRemoteDataSourceModule.kt
@@ -0,0 +1,20 @@
+package ru.fincode.tsudesk.feature.schedule.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import ru.fincode.tsudesk.feature.schedule.data.datasource.ScheduleRemoteDataSource
+import ru.fincode.tsudesk.feature.schedule.data.remote.ScheduleRemoteDataSourceImpl
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class ScheduleRemoteDataSourceModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindScheduleRemoteDataSource(
+        impl: ScheduleRemoteDataSourceImpl
+    ): ScheduleRemoteDataSource
+}
--- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/domain/model/ScheduleEntity.kt
+++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/domain/model/ScheduleEntity.kt
@@ -1,7 +1,8 @@
 package ru.fincode.tsudesk.feature.schedule.domain.model

 data class ScheduleEntity(
-    val lessons: List<LessonEntity>
+    val lessons: List<LessonEntity>,
+    val timestamp: Long
 )