Merge pull request #519 from BCSDLab/refactor/timetable_semester

[Refactor] 시간표 학기 페이지 리팩토링 1차
BCSDLab · Jan 8, 2025 · b470c69 · b470c69
2 parents bb2330d + 7a757e2
commit b470c69
Show file tree

Hide file tree

Showing 12 changed files with 260 additions and 300 deletions.
diff --git a/data/src/main/java/in/koreatech/koin/data/api/auth/TimetableAuthApi.kt b/data/src/main/java/in/koreatech/koin/data/api/auth/TimetableAuthApi.kt
@@ -6,6 +6,7 @@ import `in`.koreatech.koin.data.request.timetable.TimetableFrameQueryRequest
 import `in`.koreatech.koin.data.request.timetable.TimetableLecturesQueryRequest
 import `in`.koreatech.koin.data.response.timetable.SemesterCheckResponse
 import `in`.koreatech.koin.data.response.timetable.TimetableFrameResponse
+import `in`.koreatech.koin.data.response.timetable.TimetableFramesResponse
 import `in`.koreatech.koin.data.response.timetable.TimetableLecturesResponse
 import retrofit2.Response
 import retrofit2.http.Body
@@ -46,16 +47,32 @@ interface TimetableAuthApi {
         @Body frame: TimetableFrameCreateQueryRequest
     ): TimetableFrameResponse
 
+    @POST("/v2/timetables/frame/rollback")
+    suspend fun postRollbackFrame(
+        @Query("timetable_frame_id") frameId: Int
+    ): TimetableLecturesResponse
+
     @DELETE("/v2/timetables/frame")
     suspend fun deleteTimetableFrame(
         @Query("id") frameId: Int
     ): Response<Unit>
 
+    /**
+     * @param semester 학기명
+     * @return 학기의 프레임 리스트
+     */
     @GET("/v2/timetables/frames")
     suspend fun getTimetableFrames(
         @Query("semester") semester: String
     ): List<TimetableFrameResponse>
 
+    /**
+     * 학생이 추가한 모든 학기의 프레임을 불러옴
+     * @return 학생이 추가한 모든 시간표 프레임
+     */
+    @GET("/v2/timetables/frames")
+    suspend fun getAllFrames(): TimetableFramesResponse
+
     @DELETE("/v2/timetables/lecture/{id}")
     suspend fun deleteTimetableLecture(
         @Path("id") id: Int

diff --git a/data/src/main/java/in/koreatech/koin/data/repository/TimetableRepositoryImpl.kt b/data/src/main/java/in/koreatech/koin/data/repository/TimetableRepositoryImpl.kt
@@ -46,7 +46,11 @@ class TimetableRepositoryImpl @Inject constructor(
     }
 
     override fun getTimetableFrames(semester: String): Flow<List<TimetableFrame>> = flow {
-        emit(timetableRemoteDataSource.getTimetableFrames(semester).map { it.toTimetableFrameResponse() })
+        emit(timetableRemoteDataSource.getTimetableFrames(semester).map { it.toTimetableFrame() })
+    }
+
+    override fun getAllFrames(): Flow<Map<String, List<TimetableFrame>>> = flow {
+        emit(timetableRemoteDataSource.getAllFrames().mapValues { it.value.map { it.toTimetableFrame() } })
     }
 
     override suspend fun getTimetableLectures(timetableFrameId: Int): Result<TimetableLectures> = runCatching {
@@ -83,7 +87,7 @@ class TimetableRepositoryImpl @Inject constructor(
                 frame.timetableName,
                 frame.isMain
             )
-        ).toTimetableFrameResponse()
+        ).toTimetableFrame()
     }
 
     override suspend fun postTimetableLectures(frameId: Int, lectures: List<Lecture>): Result<TimetableLectures> = runCatching {
@@ -135,12 +139,15 @@ class TimetableRepositoryImpl @Inject constructor(
                 semester = frame.semester,
                 timetableName = frame.timetableName
             )
-        ).toTimetableFrameResponse()
+        ).toTimetableFrame()
     }.recoverCatching {
         if(it is HttpException) throw Exception(it.getErrorResponse().message ?: "")
         else throw it
     }
 
+    override suspend fun postRollbackFrame(frameId: Int): Result<TimetableLectures> = runCatching {
+        timetableRemoteDataSource.postRollbackFrame(frameId).toTimetableLectures()
+    }
 
     override suspend fun deleteTimetableFrame(frameId: Int): Result<Unit> = runCatching {
         timetableRemoteDataSource.deleteTimetableFrame(frameId)

diff --git a/data/src/main/java/in/koreatech/koin/data/response/timetable/TimetableFrameResponse.kt b/data/src/main/java/in/koreatech/koin/data/response/timetable/TimetableFrameResponse.kt
@@ -11,7 +11,7 @@ data class TimetableFrameResponse(
     @SerializedName("is_main")
     val isMain: Boolean,
 ) {
-    fun toTimetableFrameResponse(): TimetableFrame = TimetableFrame(
+    fun toTimetableFrame(): TimetableFrame = TimetableFrame(
         id = id,
         timetableName = timetableName.orEmpty(),
         isMain = isMain

diff --git a/data/src/main/java/in/koreatech/koin/data/response/timetable/TimetableFramesResponse.kt b/data/src/main/java/in/koreatech/koin/data/response/timetable/TimetableFramesResponse.kt
@@ -0,0 +1,8 @@
+package `in`.koreatech.koin.data.response.timetable
+
+import com.google.gson.annotations.SerializedName
+
+data class TimetableFramesResponse(
+    @SerializedName("semesters")
+    val semesterFrames: Map<String, List<TimetableFrameResponse>>
+)
diff --git a/data/src/main/java/in/koreatech/koin/data/source/remote/TimetableRemoteDataSource.kt b/data/src/main/java/in/koreatech/koin/data/source/remote/TimetableRemoteDataSource.kt
@@ -31,6 +31,9 @@ class TimetableRemoteDataSource @Inject constructor(
         semester: String
     ): List<TimetableFrameResponse> = timetableAuthApi.getTimetableFrames(semester)
 
+    suspend fun getAllFrames(): Map<String, List<TimetableFrameResponse>> =
+        timetableAuthApi.getAllFrames().semesterFrames
+
     suspend fun putTimetableLectures(
         lectures: TimetableLecturesQueryRequest
     ): TimetableLecturesResponse = timetableAuthApi.putTimetableLectures(lectures)
@@ -47,6 +50,10 @@ class TimetableRemoteDataSource @Inject constructor(
         frame: TimetableFrameCreateQueryRequest
     ): TimetableFrameResponse = timetableAuthApi.postTimetableFrame(frame)
 
+    suspend fun postRollbackFrame(
+        frameId: Int
+    ): TimetableLecturesResponse = timetableAuthApi.postRollbackFrame(frameId)
+
     suspend fun deleteTimetableFrame(
         frameId: Int
     ) = timetableAuthApi.deleteTimetableFrame(frameId)

diff --git a/domain/src/main/java/in/koreatech/koin/domain/repository/TimetableRepository.kt b/domain/src/main/java/in/koreatech/koin/domain/repository/TimetableRepository.kt
@@ -14,6 +14,8 @@ interface TimetableRepository {
     fun getSemesterCheck(): Flow<List<String>>
     fun getLectures(semesterDate: String): Flow<List<Lecture>>
     fun getTimetableFrames(semester: String): Flow<List<TimetableFrame>>
+    fun getAllFrames(): Flow<Map<String, List<TimetableFrame>>>
+
 
     suspend fun getTimetableLectures(timetableFrameId: Int): Result<TimetableLectures>
     suspend fun getTimetableLectures(semester: String): Result<TimetableLectures>
@@ -26,11 +28,11 @@ interface TimetableRepository {
     suspend fun postTimetableCustomLectures(frameId: Int, lectures: List<Lecture>): Result<TimetableLectures>
     suspend fun postTimetableBasicLectures(frameId: Int, lectures: List<TimetableLecture>): Result<TimetableLectures>
     suspend fun postTimetableFrame(frame: TimetableFrameCreateQuery): Result<TimetableFrame>
+    suspend fun postRollbackFrame(frameId: Int): Result<TimetableLectures>
 
     suspend fun deleteTimetableFrame(frameId: Int): Result<Unit>
     suspend fun deleteTimetableLecture(id: Int): Result<Unit>
     suspend fun deleteTimetableLectures(lectureIds: List<Int>): Result<Unit>
     suspend fun deleteTimetableFrameLecture(frameId: Int, lectureId: Int): Result<Unit>
-
     suspend fun deleteAllTimetableFrame(semester: String): Result<Unit>
 }
diff --git a/domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/GetAllFramesUseCase.kt b/domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/GetAllFramesUseCase.kt
@@ -0,0 +1,13 @@
+package `in`.koreatech.koin.domain.usecase.timetable
+
+import `in`.koreatech.koin.domain.model.timetable.response.TimetableFrame
+import `in`.koreatech.koin.domain.repository.TimetableRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GetAllFramesUseCase @Inject constructor(
+    private val timetableRepository: TimetableRepository
+) {
+    suspend operator fun invoke(): Flow<Map<String, List<TimetableFrame>>> =
+        timetableRepository.getAllFrames()
+}
diff --git a/...main/java/in/koreatech/koin/domain/usecase/timetable/GetSemesterTimetableFramesUseCase.kt b/...main/java/in/koreatech/koin/domain/usecase/timetable/GetSemesterTimetableFramesUseCase.kt
diff --git a/domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/RollbackFrameUseCase.kt b/domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/RollbackFrameUseCase.kt
@@ -0,0 +1,18 @@
+package `in`.koreatech.koin.domain.usecase.timetable
+
+import `in`.koreatech.koin.domain.model.timetable.response.TimetableLectures
+import `in`.koreatech.koin.domain.repository.TimetableRepository
+import javax.inject.Inject
+
+/**
+ * 시간표 프레임과 담긴 강의들을 복구하는 유즈케이스
+ * 학기가 함께 삭제된 경우, 학기도 같이 추가한다
+ */
+class RollbackFrameUseCase @Inject constructor(
+    private val timetableRepository: TimetableRepository
+) {
+
+    suspend operator fun invoke(frameId: Int): Result<TimetableLectures> {
+        return timetableRepository.postRollbackFrame(frameId)
+    }
+}
diff --git a/...table/src/main/java/in/koreatech/koin/feature/timetable/view/dialog/EditSemesterDialog.kt b/...table/src/main/java/in/koreatech/koin/feature/timetable/view/dialog/EditSemesterDialog.kt
@@ -49,26 +49,28 @@ import java.time.LocalDate
 fun EditSemesterDialogImpl(
     years: List<Int>,
     userSemesters: List<SemesterModel>,
+    isSelectYearDialogVisible: Boolean,
     modifier: Modifier = Modifier,
+    onConfirmSelectYear: () -> Unit = {},
+    onDismissSelectYear: () -> Unit = {},
+    onClickSelectYear: () -> Unit = {},
     onConfirm: (List<SemesterModel>) -> Unit = {},
     onDismiss: () -> Unit = {},
 ) {
     var currentYear by remember { mutableStateOf(LocalDate.now().year) }
     var selectedSemesters by remember(currentYear, userSemesters) { mutableStateOf(listOf<SemesterType>()) }
 
-    var isShowingSelectYearDialog by remember { mutableStateOf(false) }
-
     Box(
         modifier = modifier
     ) {
-        if (isShowingSelectYearDialog) {
+        if (isSelectYearDialogVisible) {
             SelectYearDialog(
                 currentYear = currentYear,
                 yearList = years,
-                onDismiss = { isShowingSelectYearDialog = false },
+                onDismiss = onDismissSelectYear,
                 onSelectYear = {
                     currentYear = it
-                    isShowingSelectYearDialog = false
+                    onConfirmSelectYear()
                 }
             )
         } else {
@@ -83,7 +85,7 @@ fun EditSemesterDialogImpl(
                     else
                         selectedSemesters = selectedSemesters + clickedSemester
                 },
-                onClickYear = { isShowingSelectYearDialog = true },
+                onClickYear = onClickSelectYear,
                 onConfirm = { onConfirm(selectedSemesters.map { SemesterModel(currentYear, it) }) },
                 onDismiss = onDismiss
             )
@@ -280,6 +282,7 @@ private fun EditSemesterDialogImplPreview() {
     EditSemesterDialogImpl(
         years = listOf(2019, 2020, 2021, 2022, 2023, 2024),
         userSemesters = userSemesters,
+        isSelectYearDialogVisible = false,
         onConfirm = { selectedSemester ->
             userSemesters = userSemesters.toMutableList().apply {
                 selectedSemester.forEach {