Feature/#109 my writing

feature/timetable/src/main/java/com/suwiki/feature/timetable/timetablelist/component/TimetableEditContainer.kt → core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiEditContainer.kt

@@ -1,12 +1,11 @@
-package com.suwiki.feature.timetable.timetablelist.component
+package com.suwiki.core.designsystem.component.container
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -26,13 +25,13 @@ import com.suwiki.core.designsystem.theme.Black
 import com.suwiki.core.designsystem.theme.GrayF6
 import com.suwiki.core.designsystem.theme.SuwikiTheme
 import com.suwiki.core.designsystem.theme.White
-import com.suwiki.core.model.timetable.Timetable
 import com.suwiki.core.ui.extension.suwikiClickable
 
 @Composable
-fun TimetableEditContainer(
+fun SuwikiEditContainer(
   modifier: Modifier = Modifier,
-  timetable: Timetable = Timetable(),
+  name: String,
+  semester: String,
   onClickEditButton: () -> Unit = {},
   onClickDeleteButton: () -> Unit = {},
   onClick: () -> Unit = {},
@@ -67,12 +66,12 @@ fun TimetableEditContainer(
         modifier = Modifier.weight(1f, false),
         maxLines = 1,
         overflow = TextOverflow.Ellipsis,
-        text = timetable.name,
+        text = name,
         style = SuwikiTheme.typography.header6,
         color = Black,
       )
 
-      SuwikiBadge(color = BadgeColor.Gray, text = "${timetable.year}-${timetable.semester}")
+      SuwikiBadge(color = BadgeColor.Gray, text = semester)
     }
 
     Row(
@@ -95,14 +94,9 @@ fun TimetableEditContainer(
 fun TimetableEditContainerPreview() {
   SuwikiTheme {
     Column {
-      TimetableEditContainer(
-        timetable = Timetable(
-          createTime = 0,
-          year = "2024",
-          semester = "1",
-          name = "시간표시간표시간표시간표시간표시간표시간표시간표",
-          cellList = listOf(),
-        ),
+      SuwikiEditContainer(
+        name = "시간표시간표시간표시간표시간표시간표시간표시간표",
+        semester = "1",
       )
     }
   }

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/exam/MyExamEvaluation.kt

@@ -6,14 +6,14 @@ import kotlinx.serialization.Serializable
 @Serializable
 @Stable
 data class MyExamEvaluation(
-  val id: Long? = null,
-  val lectureName: String? = null, // 과목 이름
-  val professor: String? = null, // 교수이름
-  val majorType: String? = null, // 개설학과
-  val selectedSemester: String? = null,
-  val semesterList: String? = null,
-  val examInfo: List<String> = listOf(), // 시험 유형 ex) "족보, 교재, PPT, 필기, 응용, 실습, 과제",
-  val examType: String? = null, // 시험 종류(바텀시트) ex) "중간고사", //기말고사, 쪽지, 기타
+  val id: Long = -1L,
+  val lectureName: String = "", // 과목 이름
+  val professor: String = "", // 교수이름
+  val majorType: String = "", // 개설학과
+  val selectedSemester: String = "",
+  val semesterList: List<String> = emptyList(),
+  val examInfo: List<String> = emptyList(), // 시험 유형 ex) "족보, 교재, PPT, 필기, 응용, 실습, 과제",
+  val examType: String = "", // 시험 종류(바텀시트) ex) "중간고사", //기말고사, 쪽지, 기타
   val examDifficulty: String = "", // 시험 난이도
   val content: String = "",
-) : java.io.Serializable
+)

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/lecture/MyLectureEvaluation.kt

@@ -17,4 +17,4 @@ data class MyLectureEvaluation(
   val difficulty: Int = 0, // 학점 잘주는가? (까다로움 == 0, 보통 == 1, 학점느님 ==2)
   val homework: Int = 0, // 과제양 (없음 ==0, 보통 == 1, 많음 == 2)
   val content: String = "",
-) : java.io.Serializable
+)

core/network/src/main/java/com/suwiki/core/network/interceptor/AuthenticationInterceptor.kt

@@ -20,7 +20,7 @@ internal class AuthenticationInterceptor @Inject constructor(
       Timber.tag(RETROFIT_TAG)
         .d(
           "AuthenticationInterceptor - intercept() called / request header: %s",
-          request.headers,
+          accessToken,
         )
       return@runBlocking chain.proceed(request)
     }

core/ui/src/main/java/com/suwiki/core/ui/extension/LazyListState.kt

@@ -6,6 +6,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshotFlow
+import kotlinx.coroutines.flow.collectLatest
 
 // https://manavtamboli.medium.com/infinite-list-paged-list-in-jetpack-compose-b10fc7e74768
 @Composable
@@ -26,9 +27,9 @@ fun LazyListState.OnBottomReached(
       lastVisibleItem.index >= layoutInfo.totalItemsCount - 1 - buffer
     }
   }
-  LaunchedEffect(shouldLoadMore.value) {
+  LaunchedEffect(shouldLoadMore) {
     snapshotFlow { shouldLoadMore.value }
-      .collect {
+      .collectLatest {
         if (it) {
           onLoadMore()
         }

domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt

@@ -8,7 +8,7 @@ class UpdateLectureEvaluationUseCase @Inject constructor(
   private val lectureEditorRepository: LectureEditorRepository,
 ) {
   suspend operator fun invoke(param: Param): Result<Unit> = runCatchingIgnoreCancelled {
-    param.run {
+    with(param) {
       lectureEditorRepository.updateLectureEvaluation(
         lectureId = lectureId,
         selectedSemester = selectedSemester,

feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvaluationEditViewModel.kt

@@ -6,12 +6,8 @@ import com.suwiki.core.model.enums.ExamInfo
 import com.suwiki.core.model.enums.ExamLevel
 import com.suwiki.core.model.enums.ExamType
 import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation
-import com.suwiki.core.model.user.User
 import com.suwiki.core.ui.extension.decodeFromUri
-import com.suwiki.domain.lectureevaluation.editor.usecase.exam.DeleteExamEvaluationUseCase
 import com.suwiki.domain.lectureevaluation.editor.usecase.exam.UpdateExamEvaluationUseCase
-import com.suwiki.domain.user.usecase.GetUserInfoUseCase
-import com.suwiki.feature.lectureevaluation.editor.lectureevaluation.MINIMUM_DELETE_POINT
 import com.suwiki.feature.lectureevaluation.editor.navigation.MyEvaluationEditRoute
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.toPersistentList
@@ -29,8 +25,6 @@ import javax.inject.Inject
 @HiltViewModel
 class MyExamEvaluationEditViewModel @Inject constructor(
   savedStateHandle: SavedStateHandle,
-  val getUserInfoUseCase: GetUserInfoUseCase,
-  val deleteExamEvaluationUseCase: DeleteExamEvaluationUseCase,
   val updateExamEvaluationUseCase: UpdateExamEvaluationUseCase,
 ) : ContainerHost<MyExamEvaluationEditState, MyExamEvaluationEditSideEffect>, ViewModel() {
   override val container: Container<MyExamEvaluationEditState, MyExamEvaluationEditSideEffect> =
@@ -41,14 +35,11 @@ class MyExamEvaluationEditViewModel @Inject constructor(
 
   suspend fun initData() = intent {
     showLoadingScreen()
+
     with(myExamEvaluationItem) {
-      getUserInfoUseCase().collect(::getPoint).runCatching {}
-        .onFailure {
-          postSideEffect(MyExamEvaluationEditSideEffect.HandleException(it))
-        }
       reduce {
         state.copy(
-          semesterList = semesterList!!.split(", ").toPersistentList(),
+          semesterList = semesterList.toPersistentList(),
           selectedSemester = selectedSemester,
           selectedExamType = examType,
         )
@@ -69,13 +60,10 @@ class MyExamEvaluationEditViewModel @Inject constructor(
     }
     hideLoadingScreen()
   }
-
-  private fun getPoint(user: User) = intent { reduce { state.copy(point = user.point) } }
-
   fun updateExamEvaluation() = intent {
     updateExamEvaluationUseCase(
       UpdateExamEvaluationUseCase.Param(
-        lectureId = myExamEvaluationItem.id!!,
+        lectureId = myExamEvaluationItem.id,
         selectedSemester = state.selectedSemester,
         examInfo = state.examInfo.filter { it.isNotBlank() }.joinToString(", "),
         examType = state.selectedExamType,
@@ -84,18 +72,6 @@ class MyExamEvaluationEditViewModel @Inject constructor(
       ),
     )
       .onSuccess {
-        showReviseToast()
-        popBackStack()
-      }
-      .onFailure {
-        postSideEffect(MyExamEvaluationEditSideEffect.HandleException(it))
-      }
-  }
-
-  fun deleteExamEvaluation() = intent {
-    deleteExamEvaluationUseCase(myExamEvaluationItem.id!!)
-      .onSuccess {
-        showDeleteToast()
         popBackStack()
       }
       .onFailure {
@@ -116,9 +92,11 @@ class MyExamEvaluationEditViewModel @Inject constructor(
     }
     hideExamTypeBottomSheet()
   }
+
   fun updateExamLevel(examLevel: ExamLevel) = intent {
     reduce { state.copy(examLevel = examLevel) }
   }
+
   fun updateExamInfo(info: ExamInfo) = intent {
     val examInfoList = state.examInfo.toMutableList()
 
@@ -135,26 +113,12 @@ class MyExamEvaluationEditViewModel @Inject constructor(
     reduce { state.copy(examEvaluation = examEvaluationValue) }
   }
 
-  fun showDeleteOrLackPointDialog() = intent {
-    if (state.point > MINIMUM_DELETE_POINT) {
-      showExamEvaluationDeleteDialog()
-    } else {
-      showLackPointDialog()
-    }
-  }
-
   private fun showLoadingScreen() = intent { reduce { state.copy(isLoading = true) } }
   private fun hideLoadingScreen() = intent { reduce { state.copy(isLoading = false) } }
-  private fun showExamEvaluationDeleteDialog() = intent { reduce { state.copy(showDeleteExamEvaluationDialog = true) } }
-  fun hideExamEvaluationDeleteDialog() = intent { reduce { state.copy(showDeleteExamEvaluationDialog = false) } }
-  private fun showLackPointDialog() = intent { reduce { state.copy(showLackPointDialog = true) } }
-  fun hideLackPointDialog() = intent { reduce { state.copy(showLackPointDialog = false) } }
   fun showSemesterBottomSheet() = intent { reduce { state.copy(showSemesterBottomSheet = true) } }
   fun hideSemesterBottomSheet() = intent { reduce { state.copy(showSemesterBottomSheet = false) } }
   fun showExamTypeBottomSheet() = intent { reduce { state.copy(showExamTypeBottomSheet = true) } }
   fun hideExamTypeBottomSheet() = intent { reduce { state.copy(showExamTypeBottomSheet = false) } }
 
   fun popBackStack() = intent { postSideEffect(MyExamEvaluationEditSideEffect.PopBackStack) }
-  private fun showDeleteToast() = intent { postSideEffect(MyExamEvaluationEditSideEffect.ShowMyExamEvaluationDeleteToast) }
-  private fun showReviseToast() = intent { postSideEffect(MyExamEvaluationEditSideEffect.ShowMyExamEvaluationReviseToast) }
 }

feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvalutionEditContract.kt

@@ -17,13 +17,10 @@ data class MyExamEvaluationEditState(
   val examInfo: PersistentList<String> = persistentListOf(),
   val showSemesterBottomSheet: Boolean = false,
   val showExamTypeBottomSheet: Boolean = false,
-  val showDeleteExamEvaluationDialog: Boolean = false,
-  val showLackPointDialog: Boolean = false,
 )
 
 sealed interface MyExamEvaluationEditSideEffect {
   data object PopBackStack : MyExamEvaluationEditSideEffect
   data object ShowMyExamEvaluationDeleteToast : MyExamEvaluationEditSideEffect
-  data object ShowMyExamEvaluationReviseToast : MyExamEvaluationEditSideEffect
   data class HandleException(val throwable: Throwable) : MyExamEvaluationEditSideEffect
 }