Merge pull request #458 from BCSDLab/feature/timetable_api_v2

[Feature] 시간표 로그인 기능 구현

Author: Jokwanhee

data/src/main/java/in/koreatech/koin/data/api/auth/TimetableAuthApi.kt

@@ -1,10 +1,13 @@
 package `in`.koreatech.koin.data.api.auth
 
+import `in`.koreatech.koin.data.request.timetable.LecturesQueryRequest
 import `in`.koreatech.koin.data.request.timetable.TimetableFrameCreateQueryRequest
 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.TimetableLecturesResponse
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -14,6 +17,9 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface TimetableAuthApi {
+    @GET("/semesters/check")
+    suspend fun getSemestersCheck(): SemesterCheckResponse
+
     @GET("/v2/timetables/lecture")
     suspend fun getTimetableLectures(
         @Query("timetable_frame_id") timetableFrameId: Int
@@ -26,7 +32,7 @@ interface TimetableAuthApi {
 
     @POST("/v2/timetables/lecture")
     suspend fun postTimetableLectures(
-        @Body lectures: TimetableLecturesQueryRequest
+        @Body lectures: LecturesQueryRequest
     ): TimetableLecturesResponse
 
     @PUT("/v2/timetables/frame/{id}")
@@ -43,7 +49,7 @@ interface TimetableAuthApi {
     @DELETE("/v2/timetables/frame")
     suspend fun deleteTimetableFrame()
 
-    @GET("/v2/timetables/frame")
+    @GET("/v2/timetables/frames")
     suspend fun getTimetableFrames(
         @Query("semester") semester: String
     ): List<TimetableFrameResponse>
@@ -53,6 +59,17 @@ interface TimetableAuthApi {
         @Path("id") id: Int
     )
 
+    @DELETE("/v2/timetables/frame/{frameId}/lecture/{lectureId}")
+    suspend fun deleteTimetableFrameLecture(
+        @Path("frameId") frameId: Int,
+        @Path("lectureId") lectureId: Int
+    ): Response<Unit>
+
+    @DELETE("/v2/timetables/lectures")
+    suspend fun deleteTimetableLectures(
+        @Query("timetable_lecture_ids") lectureIds : List<Int>
+    ): Response<Unit>
+
     @DELETE("/v2/all/timetables/frame")
     suspend fun deleteAllTimetableFrame()
 }

data/src/main/java/in/koreatech/koin/data/repository/TimetableRepositoryImpl.kt

@@ -2,21 +2,21 @@ package `in`.koreatech.koin.data.repository
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import `in`.koreatech.koin.data.request.timetable.LecturesQueryRequest
+import `in`.koreatech.koin.data.request.timetable.toLectureQueryRequest
 import `in`.koreatech.koin.data.request.timetable.toTimetableLecturesQueryRequest
 import `in`.koreatech.koin.data.source.datastore.TimetableDataStore
 import `in`.koreatech.koin.data.source.remote.TimetableRemoteDataSource
 import `in`.koreatech.koin.domain.model.timetable.request.TimetableFrameCreateQuery
 import `in`.koreatech.koin.domain.model.timetable.request.TimetableFrameQuery
 import `in`.koreatech.koin.domain.model.timetable.request.TimetableLecturesQuery
 import `in`.koreatech.koin.domain.model.timetable.response.Lecture
-import `in`.koreatech.koin.domain.model.timetable.response.Semester
 import `in`.koreatech.koin.domain.model.timetable.response.TimetableFrame
 import `in`.koreatech.koin.domain.model.timetable.response.TimetableLectures
 import `in`.koreatech.koin.domain.repository.TimetableRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
-import java.lang.NullPointerException
 import javax.inject.Inject
 
 class TimetableRepositoryImpl @Inject constructor(
@@ -25,8 +25,12 @@ class TimetableRepositoryImpl @Inject constructor(
 ) : TimetableRepository {
     private val gson = Gson()
 
-    override fun getSemesters(): Flow<List<Semester>> = flow {
-        emit(timetableRemoteDataSource.getSemesters().map { it.toSemester() })
+    override fun getSemesters(): Flow<List<String>> = flow {
+        emit(timetableRemoteDataSource.getSemesters().map { it.toSemester().semester })
+    }
+
+    override fun getSemesterCheck(): Flow<List<String>> = flow {
+        emit(timetableRemoteDataSource.getSemesterCheck().toSemesterCheck().semesters)
     }
 
     override fun getLectures(semesterDate: String): Flow<List<Lecture>> = flow {
@@ -52,8 +56,7 @@ class TimetableRepositoryImpl @Inject constructor(
     }
 
     override suspend fun putTimetableLectures(lectures: TimetableLecturesQuery): TimetableLectures =
-        timetableRemoteDataSource.postTimetableLectures(lectures.toTimetableLecturesQueryRequest())
-            .toTimetableLectures()
+        timetableRemoteDataSource.putTimetableLectures(lectures.toTimetableLecturesQueryRequest()).toTimetableLectures()
 
     override suspend fun putTimetableLectures(key: String, value: TimetableLectures): Result<TimetableLectures> = runCatching {
         timetableDataStore.putString(key, gson.toJson(value))
@@ -68,8 +71,11 @@ class TimetableRepositoryImpl @Inject constructor(
         TODO("Not yet implemented")
     }
 
-    override suspend fun postTimetableLectures(lectures: TimetableLecturesQuery): TimetableLectures {
-        TODO("Not yet implemented")
+    override suspend fun postTimetableLectures(frameId: Int, lectures: List<Lecture>): Result<TimetableLectures> = runCatching {
+        timetableRemoteDataSource.postTimetableLectures(LecturesQueryRequest(
+            timetableFrameId = frameId,
+            timetableLecture = lectures.map { it.toLectureQueryRequest() }
+        )).toTimetableLectures()
     }
 
 
@@ -81,8 +87,16 @@ class TimetableRepositoryImpl @Inject constructor(
         TODO("Not yet implemented")
     }
 
-    override suspend fun deleteTimetableLecture(id: Int) {
-        TODO("Not yet implemented")
+    override suspend fun deleteTimetableLecture(id: Int): Result<Unit> = runCatching {
+        timetableRemoteDataSource.deleteTimetableLecture(id)
+    }
+
+    override suspend fun deleteTimetableFrameLecture(frameId: Int, lectureId: Int): Result<Unit> = runCatching {
+        timetableRemoteDataSource.deleteTimetableFrameLecture(frameId, lectureId)
+    }
+
+    override suspend fun deleteTimetableLectures(lectureIds: List<Int>): Result<Unit> = runCatching {
+        timetableRemoteDataSource.deleteTimetableLectures(lectureIds)
     }
 
     override suspend fun deleteAllTimetableFrame() {

data/src/main/java/in/koreatech/koin/data/request/timetable/LecturesQueryRequest.kt

@@ -0,0 +1,38 @@
+package `in`.koreatech.koin.data.request.timetable
+
+import com.google.gson.annotations.SerializedName
+import `in`.koreatech.koin.domain.model.timetable.response.Lecture
+
+data class LecturesQueryRequest(
+    @SerializedName("timetable_frame_id")
+    val timetableFrameId: Int,
+    @SerializedName("timetable_lecture")
+    val timetableLecture: List<LectureQueryRequest>,
+)
+
+data class LectureQueryRequest(
+    @SerializedName("lecture_id")
+    val lectureId: Int?,
+    @SerializedName("class_title")
+    val classTitle: String,
+    @SerializedName("class_time")
+    val classTime: List<Int>,
+    @SerializedName("class_place")
+    val classPlace: String,
+    @SerializedName("professor")
+    val professor: String,
+    @SerializedName("grades")
+    val grades: String,
+    @SerializedName("memo")
+    val memo: String,
+)
+
+fun Lecture.toLectureQueryRequest() = LectureQueryRequest(
+    lectureId = id,
+    classTitle = name,
+    classTime = classTime,
+    classPlace = "",
+    professor = professor,
+    grades = grades,
+    memo = ""
+)

data/src/main/java/in/koreatech/koin/data/response/timetable/SemesterCheckResponse.kt

@@ -0,0 +1,16 @@
+package `in`.koreatech.koin.data.response.timetable
+
+import com.google.gson.annotations.SerializedName
+import `in`.koreatech.koin.domain.model.timetable.response.SemesterCheck
+
+data class SemesterCheckResponse(
+    @SerializedName("user_id")
+    val userId: Int,
+    @SerializedName("semesters")
+    val semesters: List<String>,
+) {
+    fun toSemesterCheck() = SemesterCheck(
+        userId = userId,
+        semesters = semesters
+    )
+}

data/src/main/java/in/koreatech/koin/data/source/remote/TimetableRemoteDataSource.kt

@@ -2,10 +2,12 @@ package `in`.koreatech.koin.data.source.remote
 
 import `in`.koreatech.koin.data.api.TimetableApi
 import `in`.koreatech.koin.data.api.auth.TimetableAuthApi
+import `in`.koreatech.koin.data.request.timetable.LecturesQueryRequest
 import `in`.koreatech.koin.data.request.timetable.TimetableFrameCreateQueryRequest
 import `in`.koreatech.koin.data.request.timetable.TimetableFrameQueryRequest
 import `in`.koreatech.koin.data.request.timetable.TimetableLecturesQueryRequest
 import `in`.koreatech.koin.data.response.timetable.LectureResponse
+import `in`.koreatech.koin.data.response.timetable.SemesterCheckResponse
 import `in`.koreatech.koin.data.response.timetable.SemesterResponse
 import `in`.koreatech.koin.data.response.timetable.TimetableFrameResponse
 import `in`.koreatech.koin.data.response.timetable.TimetableLecturesResponse
@@ -17,6 +19,8 @@ class TimetableRemoteDataSource @Inject constructor(
 ) {
     suspend fun getSemesters(): List<SemesterResponse> = timetableApi.getSemesters()
 
+    suspend fun getSemesterCheck(): SemesterCheckResponse = timetableAuthApi.getSemestersCheck()
+
     suspend fun getLectures(semesterDate: String): List<LectureResponse> =
         timetableApi.getLectures(semesterDate)
 
@@ -36,7 +40,7 @@ class TimetableRemoteDataSource @Inject constructor(
     ): TimetableFrameResponse = timetableAuthApi.putTimetableFrame(id, frame)
 
     suspend fun postTimetableLectures(
-        lectures: TimetableLecturesQueryRequest
+        lectures: LecturesQueryRequest
     ): TimetableLecturesResponse = timetableAuthApi.postTimetableLectures(lectures)
 
 
@@ -51,5 +55,14 @@ class TimetableRemoteDataSource @Inject constructor(
         id: Int
     ) = timetableAuthApi.deleteTimetableLecture(id)
 
+    suspend fun deleteTimetableFrameLecture(
+        frameId: Int,
+        lectureId: Int
+    ) = timetableAuthApi.deleteTimetableFrameLecture(frameId, lectureId)
+
+    suspend fun deleteTimetableLectures(
+        lectureIds: List<Int>
+    ) = timetableAuthApi.deleteTimetableLectures(lectureIds)
+
     suspend fun deleteAllTimetableFrame() = timetableAuthApi.deleteAllTimetableFrame()
 }

domain/src/main/java/in/koreatech/koin/domain/model/timetable/response/Lecture.kt

@@ -20,7 +20,7 @@ data class Lecture(
 ) {
     fun toTimetableLecture() = TimetableLecture(
         id = id,
-        lectureId = 0,
+        lectureId = id,
         regularNumber = regularNumber,
         code = code,
         designScore = designScore,

domain/src/main/java/in/koreatech/koin/domain/model/timetable/response/SemesterCheck.kt

@@ -0,0 +1,6 @@
+package `in`.koreatech.koin.domain.model.timetable.response
+
+data class SemesterCheck(
+    val userId: Int,
+    val semesters: List<String>
+)

domain/src/main/java/in/koreatech/koin/domain/repository/TimetableRepository.kt

@@ -4,13 +4,13 @@ import `in`.koreatech.koin.domain.model.timetable.request.TimetableFrameCreateQu
 import `in`.koreatech.koin.domain.model.timetable.request.TimetableFrameQuery
 import `in`.koreatech.koin.domain.model.timetable.request.TimetableLecturesQuery
 import `in`.koreatech.koin.domain.model.timetable.response.Lecture
-import `in`.koreatech.koin.domain.model.timetable.response.Semester
 import `in`.koreatech.koin.domain.model.timetable.response.TimetableFrame
 import `in`.koreatech.koin.domain.model.timetable.response.TimetableLectures
 import kotlinx.coroutines.flow.Flow
 
 interface TimetableRepository {
-    fun getSemesters(): Flow<List<Semester>>
+    fun getSemesters(): Flow<List<String>>
+    fun getSemesterCheck(): Flow<List<String>>
     fun getLectures(semesterDate: String): Flow<List<Lecture>>
     fun getTimetableFrames(semester: String): Flow<List<TimetableFrame>>
 
@@ -21,10 +21,13 @@ interface TimetableRepository {
     suspend fun putTimetableLectures(key: String, value: TimetableLectures): Result<TimetableLectures>
     suspend fun putTimetableFrame(id: Int, frame: TimetableFrameQuery): TimetableFrame
 
-    suspend fun postTimetableLectures(lectures: TimetableLecturesQuery): TimetableLectures
+    suspend fun postTimetableLectures(frameId: Int, lectures: List<Lecture>): Result<TimetableLectures>
     suspend fun postTimetableFrame(frame: TimetableFrameCreateQuery): TimetableFrame
 
     suspend fun deleteTimetableFrame()
-    suspend fun deleteTimetableLecture(id: Int)
+    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()
 }

domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/AddTimetableLectureUseCase.kt

@@ -0,0 +1,14 @@
+package `in`.koreatech.koin.domain.usecase.timetable
+
+import `in`.koreatech.koin.domain.model.timetable.response.Lecture
+import `in`.koreatech.koin.domain.model.timetable.response.TimetableLectures
+import `in`.koreatech.koin.domain.repository.TimetableRepository
+import javax.inject.Inject
+
+class AddTimetableLectureUseCase @Inject constructor(
+    private val timetableRepository: TimetableRepository
+) {
+    suspend operator fun invoke(frameId: Int, lectures: List<Lecture>): Result<TimetableLectures> {
+        return timetableRepository.postTimetableLectures(frameId, lectures)
+    }
+}

domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/DeleteTimetableFrameLectureUseCase.kt

@@ -0,0 +1,12 @@
+package `in`.koreatech.koin.domain.usecase.timetable
+
+import `in`.koreatech.koin.domain.repository.TimetableRepository
+import javax.inject.Inject
+
+class DeleteTimetableFrameLectureUseCase @Inject constructor(
+    private val timetableRepository: TimetableRepository
+) {
+    suspend operator fun invoke(frameId: Int, lectureId: Int): Result<Unit> {
+        return timetableRepository.deleteTimetableFrameLecture(frameId, lectureId)
+    }
+}

domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/DeleteTimetableLectureUseCase.kt

@@ -0,0 +1,12 @@
+package `in`.koreatech.koin.domain.usecase.timetable
+
+import `in`.koreatech.koin.domain.repository.TimetableRepository
+import javax.inject.Inject
+
+class DeleteTimetableLectureUseCase @Inject constructor(
+    private val timetableRepository: TimetableRepository
+) {
+    suspend operator fun invoke(id: Int): Result<Unit> {
+        return timetableRepository.deleteTimetableLecture(id)
+    }
+}

domain/src/main/java/in/koreatech/koin/domain/usecase/timetable/GetSemesterUseCase.kt

@@ -1,13 +1,12 @@
 package `in`.koreatech.koin.domain.usecase.timetable
 
-import `in`.koreatech.koin.domain.model.timetable.response.Semester
 import `in`.koreatech.koin.domain.repository.TimetableRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetSemesterUseCase @Inject constructor(
     private val timetableRepository: TimetableRepository
 ) {
-    operator fun invoke(): Flow<List<Semester>> =
-        timetableRepository.getSemesters()
+    operator fun invoke(isAnonymous: Boolean): Flow<List<String>> =
+        if (isAnonymous) timetableRepository.getSemesters() else timetableRepository.getSemesterCheck()
 }

feature/timetable/build.gradle.kts

@@ -27,6 +27,7 @@ dependencies {
     implementation(platform(libs.compose.bom))
     implementation(libs.compose.material2)
     implementation(libs.bundles.compose.m3)
+    implementation(libs.kotlinxCollectionsImmutable)
 
     implementation(libs.timber)
 

feature/timetable/src/main/java/in/koreatech/koin/feature/timetable/component/LectureBox.kt

@@ -50,7 +50,7 @@ fun LectureBox(
         derivedStateOf { selectedLecture == lecture }
     }
     val isAdded by remember(lecture, timetableEvents) {
-        derivedStateOf { timetableEvents.any {lecture.id == it.id} }
+        derivedStateOf { timetableEvents.any {lecture.id == it.lectureId} }
     }
 
     Row(