diff --git a/data/lectureevaluation/build.gradle.kts b/data/lectureevaluation/build.gradle.kts index 1fc4cd01c..0bcc510aa 100644 --- a/data/lectureevaluation/build.gradle.kts +++ b/data/lectureevaluation/build.gradle.kts @@ -8,8 +8,6 @@ android { } dependencies { - implementation(projects.domain.lectureevaluation.viewerreporter) - implementation(projects.domain.lectureevaluation.my) - implementation(projects.domain.lectureevaluation.editor) + implementation(projects.domain.lectureevaluation) } diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/di/RepositoryModule.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/di/RepositoryModule.kt index 25e1d1ccb..782d7248e 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/di/RepositoryModule.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/di/RepositoryModule.kt @@ -8,14 +8,14 @@ import com.suwiki.data.lectureevaluation.repository.LectureEditorRepositoryImpl import com.suwiki.data.lectureevaluation.repository.LectureMyRepositoryImpl import com.suwiki.data.lectureevaluation.repository.LectureProviderRepositoryImpl import com.suwiki.data.lectureevaluation.repository.LectureReportRepositoryImpl -import com.suwiki.domain.lectureevaluation.editor.repository.ExamEditorRepository -import com.suwiki.domain.lectureevaluation.editor.repository.LectureEditorRepository -import com.suwiki.domain.lectureevaluation.my.repository.ExamMyRepository -import com.suwiki.domain.lectureevaluation.my.repository.LectureMyRepository -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamProviderRepository -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamReportRepository -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureProviderRepository -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureReportRepository +import com.suwiki.domain.lectureevaluation.repository.ExamEditorRepository +import com.suwiki.domain.lectureevaluation.repository.LectureEditorRepository +import com.suwiki.domain.lectureevaluation.repository.ExamMyRepository +import com.suwiki.domain.lectureevaluation.repository.LectureMyRepository +import com.suwiki.domain.lectureevaluation.repository.ExamProviderRepository +import com.suwiki.domain.lectureevaluation.repository.ExamReportRepository +import com.suwiki.domain.lectureevaluation.repository.LectureProviderRepository +import com.suwiki.domain.lectureevaluation.repository.LectureReportRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamEditorRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamEditorRepositoryImpl.kt index 339e62000..725e80a1e 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamEditorRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamEditorRepositoryImpl.kt @@ -1,7 +1,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.data.lectureevaluation.datasource.RemoteExamEditorDataSource -import com.suwiki.domain.lectureevaluation.editor.repository.ExamEditorRepository +import com.suwiki.domain.lectureevaluation.repository.ExamEditorRepository import javax.inject.Inject class ExamEditorRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamMyRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamMyRepositoryImpl.kt index 8ec5d6710..feddf53e0 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamMyRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamMyRepositoryImpl.kt @@ -3,7 +3,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.PurchaseHistory import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.data.lectureevaluation.datasource.RemoteExamMyDataSource -import com.suwiki.domain.lectureevaluation.my.repository.ExamMyRepository +import com.suwiki.domain.lectureevaluation.repository.ExamMyRepository import javax.inject.Inject class ExamMyRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamProviderRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamProviderRepositoryImpl.kt index 755640ceb..5d5de07ad 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamProviderRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamProviderRepositoryImpl.kt @@ -2,7 +2,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.exam.ExamEvaluationList import com.suwiki.data.lectureevaluation.datasource.RemoteExamProviderDataSource -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamProviderRepository +import com.suwiki.domain.lectureevaluation.repository.ExamProviderRepository import javax.inject.Inject class ExamProviderRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamReportRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamReportRepositoryImpl.kt index 65a112502..63d95fd50 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamReportRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/ExamReportRepositoryImpl.kt @@ -1,7 +1,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.data.lectureevaluation.datasource.RemoteExamReportDataSource -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamReportRepository +import com.suwiki.domain.lectureevaluation.repository.ExamReportRepository import javax.inject.Inject class ExamReportRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureEditorRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureEditorRepositoryImpl.kt index ddb36d63c..4dc6cfab2 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureEditorRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureEditorRepositoryImpl.kt @@ -1,7 +1,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.data.lectureevaluation.datasource.RemoteLectureEditorDataSource -import com.suwiki.domain.lectureevaluation.editor.repository.LectureEditorRepository +import com.suwiki.domain.lectureevaluation.repository.LectureEditorRepository import javax.inject.Inject class LectureEditorRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureMyRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureMyRepositoryImpl.kt index 3fa387b3f..e0caf38bc 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureMyRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureMyRepositoryImpl.kt @@ -2,7 +2,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation import com.suwiki.data.lectureevaluation.datasource.RemoteLectureMyDataSource -import com.suwiki.domain.lectureevaluation.my.repository.LectureMyRepository +import com.suwiki.domain.lectureevaluation.repository.LectureMyRepository import javax.inject.Inject class LectureMyRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureProviderRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureProviderRepositoryImpl.kt index 1a3308222..6c44ee4f7 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureProviderRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureProviderRepositoryImpl.kt @@ -4,7 +4,7 @@ import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationAverage import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationExtraAverage import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationList import com.suwiki.data.lectureevaluation.datasource.RemoteLectureProviderDataSource -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureProviderRepository +import com.suwiki.domain.lectureevaluation.repository.LectureProviderRepository import javax.inject.Inject class LectureProviderRepositoryImpl @Inject constructor( diff --git a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureReportRepositoryImpl.kt b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureReportRepositoryImpl.kt index 18ad209e7..48b7f510e 100644 --- a/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureReportRepositoryImpl.kt +++ b/data/lectureevaluation/src/main/java/com/suwiki/data/lectureevaluation/repository/LectureReportRepositoryImpl.kt @@ -1,7 +1,7 @@ package com.suwiki.data.lectureevaluation.repository import com.suwiki.data.lectureevaluation.datasource.RemoteLectureReportDataSource -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureReportRepository +import com.suwiki.domain.lectureevaluation.repository.LectureReportRepository import javax.inject.Inject class LectureReportRepositoryImpl @Inject constructor( diff --git a/domain/lectureevaluation/editor/build.gradle.kts b/domain/lectureevaluation/build.gradle.kts similarity index 100% rename from domain/lectureevaluation/editor/build.gradle.kts rename to domain/lectureevaluation/build.gradle.kts diff --git a/domain/lectureevaluation/editor/.gitignore b/domain/lectureevaluation/editor/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/domain/lectureevaluation/editor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/domain/lectureevaluation/my/.gitignore b/domain/lectureevaluation/my/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/domain/lectureevaluation/my/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/domain/lectureevaluation/my/build.gradle.kts b/domain/lectureevaluation/my/build.gradle.kts deleted file mode 100644 index 1acb65dd5..000000000 --- a/domain/lectureevaluation/my/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -@file:Suppress("DSL_SCOPE_VIOLATION") // @file:을 붙인 이유 -> https://github.com/gradle/gradle/issues/20131 - -plugins { - alias(libs.plugins.suwiki.java.library) -} - -dependencies { - implementation(projects.core.model) - implementation(projects.domain.common) - - implementation(libs.kotlinx.coroutines.core) - implementation(libs.hilt.core) -} diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/repository/ExamEditorRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamEditorRepository.kt similarity index 89% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/repository/ExamEditorRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamEditorRepository.kt index f189efafb..264dedaf0 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/repository/ExamEditorRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamEditorRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.editor.repository +package com.suwiki.domain.lectureevaluation.repository interface ExamEditorRepository { diff --git a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/repository/ExamMyRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamMyRepository.kt similarity index 83% rename from domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/repository/ExamMyRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamMyRepository.kt index 9b9aedc7e..3eb2fad3f 100644 --- a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/repository/ExamMyRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamMyRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.my.repository +package com.suwiki.domain.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.PurchaseHistory import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/ExamProviderRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamProviderRepository.kt similarity index 77% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/ExamProviderRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamProviderRepository.kt index 207f9c09e..b5e5eb66f 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/ExamProviderRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamProviderRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.repository +package com.suwiki.domain.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.exam.ExamEvaluationList diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/ExamReportRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamReportRepository.kt similarity index 61% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/ExamReportRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamReportRepository.kt index b0de432e8..cef4dd555 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/ExamReportRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/ExamReportRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.repository +package com.suwiki.domain.lectureevaluation.repository interface ExamReportRepository { diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/repository/LectureEditorRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureEditorRepository.kt similarity index 90% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/repository/LectureEditorRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureEditorRepository.kt index 1b13fc39a..6edd0f5e8 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/repository/LectureEditorRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureEditorRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.editor.repository +package com.suwiki.domain.lectureevaluation.repository interface LectureEditorRepository { diff --git a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/repository/LectureMyRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureMyRepository.kt similarity index 76% rename from domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/repository/LectureMyRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureMyRepository.kt index a42e9293f..d7b8d73c1 100644 --- a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/repository/LectureMyRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureMyRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.my.repository +package com.suwiki.domain.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/LectureProviderRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureProviderRepository.kt similarity index 91% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/LectureProviderRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureProviderRepository.kt index e84eaa856..adf37c9ff 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/LectureProviderRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureProviderRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.repository +package com.suwiki.domain.lectureevaluation.repository import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationAverage import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationExtraAverage diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/LectureReportRepository.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureReportRepository.kt similarity index 63% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/LectureReportRepository.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureReportRepository.kt index 12f2974b6..7cf9da2d6 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/repository/LectureReportRepository.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/repository/LectureReportRepository.kt @@ -1,4 +1,4 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.repository +package com.suwiki.domain.lectureevaluation.repository interface LectureReportRepository { diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/BuyExamUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/BuyExamUseCase.kt similarity index 68% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/BuyExamUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/BuyExamUseCase.kt index a765e57b3..646b8a3fc 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/BuyExamUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/BuyExamUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamProviderRepository +import com.suwiki.domain.lectureevaluation.repository.ExamProviderRepository import javax.inject.Inject class BuyExamUseCase @Inject constructor( diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/DeleteExamEvaluationUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/DeleteExamEvaluationUseCase.kt similarity index 71% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/DeleteExamEvaluationUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/DeleteExamEvaluationUseCase.kt index cdef1f3ae..31ad4b925 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/DeleteExamEvaluationUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/DeleteExamEvaluationUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.editor.usecase.exam +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.editor.repository.ExamEditorRepository +import com.suwiki.domain.lectureevaluation.repository.ExamEditorRepository import javax.inject.Inject class DeleteExamEvaluationUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/GetExamEvaluationListUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetExamEvaluationListUseCase.kt similarity index 78% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/GetExamEvaluationListUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetExamEvaluationListUseCase.kt index b5056fcc5..9bb631f97 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/GetExamEvaluationListUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetExamEvaluationListUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.core.model.lectureevaluation.exam.ExamEvaluationList import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamProviderRepository +import com.suwiki.domain.lectureevaluation.repository.ExamProviderRepository import javax.inject.Inject class GetExamEvaluationListUseCase @Inject constructor( diff --git a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetMyExamEvaluationListUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetMyExamEvaluationListUseCase.kt similarity index 77% rename from domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetMyExamEvaluationListUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetMyExamEvaluationListUseCase.kt index 1877f48c9..5e68da006 100644 --- a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetMyExamEvaluationListUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetMyExamEvaluationListUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.my.usecase +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.my.repository.ExamMyRepository +import com.suwiki.domain.lectureevaluation.repository.ExamMyRepository import javax.inject.Inject class GetMyExamEvaluationListUseCase @Inject constructor( diff --git a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetPurchaseHistoryUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetPurchaseHistoryUseCase.kt similarity index 75% rename from domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetPurchaseHistoryUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetPurchaseHistoryUseCase.kt index f44b49ad4..bfefaa607 100644 --- a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetPurchaseHistoryUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/GetPurchaseHistoryUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.my.usecase +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.core.model.lectureevaluation.PurchaseHistory import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.my.repository.ExamMyRepository +import com.suwiki.domain.lectureevaluation.repository.ExamMyRepository import javax.inject.Inject class GetPurchaseHistoryUseCase @Inject constructor( diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/PostExamEvaluationUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/PostExamEvaluationUseCase.kt similarity index 85% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/PostExamEvaluationUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/PostExamEvaluationUseCase.kt index 9f4d7b045..02474d6b1 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/PostExamEvaluationUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/PostExamEvaluationUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.editor.usecase.exam +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.editor.repository.ExamEditorRepository +import com.suwiki.domain.lectureevaluation.repository.ExamEditorRepository import javax.inject.Inject class PostExamEvaluationUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/ReportExamUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/ReportExamUseCase.kt similarity index 68% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/ReportExamUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/ReportExamUseCase.kt index 703d60b08..0305269bd 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/exam/ReportExamUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/ReportExamUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.ExamReportRepository +import com.suwiki.domain.lectureevaluation.repository.ExamReportRepository import javax.inject.Inject class ReportExamUseCase @Inject constructor( diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/UpdateExamEvaluationUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/UpdateExamEvaluationUseCase.kt similarity index 84% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/UpdateExamEvaluationUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/UpdateExamEvaluationUseCase.kt index 7af133453..3eb9f009f 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/exam/UpdateExamEvaluationUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/exam/UpdateExamEvaluationUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.editor.usecase.exam +package com.suwiki.domain.lectureevaluation.usecase.exam import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.editor.repository.ExamEditorRepository +import com.suwiki.domain.lectureevaluation.repository.ExamEditorRepository import javax.inject.Inject class UpdateExamEvaluationUseCase @Inject constructor( diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/DeleteLectureEvaluationUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/DeleteLectureEvaluationUseCase.kt similarity index 71% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/DeleteLectureEvaluationUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/DeleteLectureEvaluationUseCase.kt index b0e7844ad..524a93976 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/DeleteLectureEvaluationUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/DeleteLectureEvaluationUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.editor.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.editor.repository.LectureEditorRepository +import com.suwiki.domain.lectureevaluation.repository.LectureEditorRepository import javax.inject.Inject class DeleteLectureEvaluationUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationAverageListUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationAverageListUseCase.kt similarity index 80% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationAverageListUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationAverageListUseCase.kt index 6c4b30499..44726ff73 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationAverageListUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationAverageListUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationAverage import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureProviderRepository +import com.suwiki.domain.lectureevaluation.repository.LectureProviderRepository import javax.inject.Inject class GetLectureEvaluationAverageListUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationExtraAverageUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationExtraAverageUseCase.kt similarity index 75% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationExtraAverageUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationExtraAverageUseCase.kt index a529317aa..d0ff08ef0 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationExtraAverageUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationExtraAverageUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationExtraAverage import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureProviderRepository +import com.suwiki.domain.lectureevaluation.repository.LectureProviderRepository import javax.inject.Inject class GetLectureEvaluationExtraAverageUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationListUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationListUseCase.kt similarity index 78% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationListUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationListUseCase.kt index 382eaa8fc..5f186c2ce 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/GetLectureEvaluationListUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetLectureEvaluationListUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationList import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureProviderRepository +import com.suwiki.domain.lectureevaluation.repository.LectureProviderRepository import javax.inject.Inject class GetLectureEvaluationListUseCase @Inject constructor( diff --git a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetMyLectureEvaluationListUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetMyLectureEvaluationListUseCase.kt similarity index 77% rename from domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetMyLectureEvaluationListUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetMyLectureEvaluationListUseCase.kt index 88969bf79..6481770d1 100644 --- a/domain/lectureevaluation/my/src/main/java/com/suwiki/domain/lectureevaluation/my/usecase/GetMyLectureEvaluationListUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/GetMyLectureEvaluationListUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.my.usecase +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.my.repository.LectureMyRepository +import com.suwiki.domain.lectureevaluation.repository.LectureMyRepository import javax.inject.Inject class GetMyLectureEvaluationListUseCase @Inject constructor( diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/PostLectureEvaluationUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/PostLectureEvaluationUseCase.kt similarity index 87% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/PostLectureEvaluationUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/PostLectureEvaluationUseCase.kt index 2b2a7dfed..0b25142c6 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/PostLectureEvaluationUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/PostLectureEvaluationUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.editor.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.editor.repository.LectureEditorRepository +import com.suwiki.domain.lectureevaluation.repository.LectureEditorRepository import javax.inject.Inject class PostLectureEvaluationUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/ReportLectureUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/ReportLectureUseCase.kt similarity index 68% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/ReportLectureUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/ReportLectureUseCase.kt index 19cf14bb6..790bec38c 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/ReportLectureUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/ReportLectureUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureReportRepository +import com.suwiki.domain.lectureevaluation.repository.LectureReportRepository import javax.inject.Inject class ReportLectureUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/RetrieveLectureEvaluationAverageListUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/RetrieveLectureEvaluationAverageListUseCase.kt similarity index 81% rename from domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/RetrieveLectureEvaluationAverageListUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/RetrieveLectureEvaluationAverageListUseCase.kt index 9ac87b2c0..9b49d5f6f 100644 --- a/domain/lectureevaluation/viewerreporter/src/main/java/com/suwiki/domain/lectureevaluation/viewerreporter/usecase/lecture/RetrieveLectureEvaluationAverageListUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/RetrieveLectureEvaluationAverageListUseCase.kt @@ -1,8 +1,8 @@ -package com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationAverage import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.viewerreporter.repository.LectureProviderRepository +import com.suwiki.domain.lectureevaluation.repository.LectureProviderRepository import javax.inject.Inject class RetrieveLectureEvaluationAverageListUseCase @Inject constructor( diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/UpdateLectureEvaluationUseCase.kt similarity index 85% rename from domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt rename to domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/UpdateLectureEvaluationUseCase.kt index b665f4ca0..8f12d1003 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt +++ b/domain/lectureevaluation/src/main/java/com/suwiki/domain/lectureevaluation/usecase/lecture/UpdateLectureEvaluationUseCase.kt @@ -1,7 +1,7 @@ -package com.suwiki.domain.lectureevaluation.editor.usecase.lecture +package com.suwiki.domain.lectureevaluation.usecase.lecture import com.suwiki.domain.common.runCatchingIgnoreCancelled -import com.suwiki.domain.lectureevaluation.editor.repository.LectureEditorRepository +import com.suwiki.domain.lectureevaluation.repository.LectureEditorRepository import javax.inject.Inject class UpdateLectureEvaluationUseCase @Inject constructor( diff --git a/domain/lectureevaluation/viewerreporter/.gitignore b/domain/lectureevaluation/viewerreporter/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/domain/lectureevaluation/viewerreporter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/domain/lectureevaluation/viewerreporter/build.gradle.kts b/domain/lectureevaluation/viewerreporter/build.gradle.kts deleted file mode 100644 index 1acb65dd5..000000000 --- a/domain/lectureevaluation/viewerreporter/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -@file:Suppress("DSL_SCOPE_VIOLATION") // @file:을 붙인 이유 -> https://github.com/gradle/gradle/issues/20131 - -plugins { - alias(libs.plugins.suwiki.java.library) -} - -dependencies { - implementation(projects.core.model) - implementation(projects.domain.common) - - implementation(libs.kotlinx.coroutines.core) - implementation(libs.hilt.core) -} diff --git a/presentation/lectureevaluation/build.gradle.kts b/presentation/lectureevaluation/build.gradle.kts index 7152a19ff..a28e7e068 100644 --- a/presentation/lectureevaluation/build.gradle.kts +++ b/presentation/lectureevaluation/build.gradle.kts @@ -9,9 +9,7 @@ android { dependencies { implementation(projects.domain.user) - implementation(projects.domain.lectureevaluation.editor) - implementation(projects.domain.lectureevaluation.my) - implementation(projects.domain.lectureevaluation.viewerreporter) + implementation(projects.domain.lectureevaluation) implementation(libs.kotlinx.serialization.json) implementation(libs.compose.toolbar) diff --git a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/examevaluation/ExamEvaluationEditorViewModel.kt b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/examevaluation/ExamEvaluationEditorViewModel.kt index 811b96c77..5abdfb22c 100644 --- a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/examevaluation/ExamEvaluationEditorViewModel.kt +++ b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/examevaluation/ExamEvaluationEditorViewModel.kt @@ -6,8 +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.domain.lectureevaluation.editor.usecase.exam.PostExamEvaluationUseCase -import com.suwiki.domain.lectureevaluation.editor.usecase.exam.UpdateExamEvaluationUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.PostExamEvaluationUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.UpdateExamEvaluationUseCase import com.suwiki.presentation.common.ui.extension.decodeFromUri import com.suwiki.presentation.lectureevaluation.navigation.EvaluationEditorRoute import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/lectureevaluation/LectureEvaluationEditorViewModel.kt b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/lectureevaluation/LectureEvaluationEditorViewModel.kt index 3683ebae8..b7dc5ac84 100644 --- a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/lectureevaluation/LectureEvaluationEditorViewModel.kt +++ b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/lectureevaluation/LectureEvaluationEditorViewModel.kt @@ -6,8 +6,8 @@ import com.suwiki.core.model.enums.GradeLevel import com.suwiki.core.model.enums.HomeworkLevel import com.suwiki.core.model.enums.TeamLevel import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation -import com.suwiki.domain.lectureevaluation.editor.usecase.lecture.PostLectureEvaluationUseCase -import com.suwiki.domain.lectureevaluation.editor.usecase.lecture.UpdateLectureEvaluationUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.PostLectureEvaluationUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.UpdateLectureEvaluationUseCase import com.suwiki.presentation.common.ui.extension.decodeFromUri import com.suwiki.presentation.lectureevaluation.navigation.EvaluationEditorRoute import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/my/MyEvaluationViewModel.kt b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/my/MyEvaluationViewModel.kt index d283d3fa1..eace87941 100644 --- a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/my/MyEvaluationViewModel.kt +++ b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/my/MyEvaluationViewModel.kt @@ -3,10 +3,10 @@ package com.suwiki.presentation.lectureevaluation.my import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.suwiki.core.model.user.User -import com.suwiki.domain.lectureevaluation.editor.usecase.exam.DeleteExamEvaluationUseCase -import com.suwiki.domain.lectureevaluation.editor.usecase.lecture.DeleteLectureEvaluationUseCase -import com.suwiki.domain.lectureevaluation.my.usecase.GetMyExamEvaluationListUseCase -import com.suwiki.domain.lectureevaluation.my.usecase.GetMyLectureEvaluationListUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.DeleteExamEvaluationUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.GetMyExamEvaluationListUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.DeleteLectureEvaluationUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.GetMyLectureEvaluationListUseCase import com.suwiki.domain.user.usecase.GetUserInfoUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.collections.immutable.persistentListOf diff --git a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/LectureEvaluationViewModel.kt b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/LectureEvaluationViewModel.kt index b4324db30..0151ee21d 100644 --- a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/LectureEvaluationViewModel.kt +++ b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/LectureEvaluationViewModel.kt @@ -3,7 +3,7 @@ package com.suwiki.presentation.lectureevaluation.viewerrepoter import androidx.lifecycle.ViewModel import com.suwiki.core.model.enums.LectureAlign import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationAverage -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture.RetrieveLectureEvaluationAverageListUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.RetrieveLectureEvaluationAverageListUseCase import com.suwiki.domain.user.usecase.GetUserInfoUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.collections.immutable.toPersistentList diff --git a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/detail/LectureEvaluationDetailViewModel.kt b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/detail/LectureEvaluationDetailViewModel.kt index 25f2c4893..f0b763484 100644 --- a/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/detail/LectureEvaluationDetailViewModel.kt +++ b/presentation/lectureevaluation/src/main/java/com/suwiki/presentation/lectureevaluation/viewerrepoter/detail/LectureEvaluationDetailViewModel.kt @@ -5,12 +5,12 @@ import androidx.lifecycle.ViewModel import com.suwiki.core.model.exception.UserPointLackException import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam.BuyExamUseCase -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam.GetExamEvaluationListUseCase -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam.ReportExamUseCase -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture.GetLectureEvaluationExtraAverageUseCase -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture.GetLectureEvaluationListUseCase -import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.lecture.ReportLectureUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.BuyExamUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.GetExamEvaluationListUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.ReportExamUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.GetLectureEvaluationExtraAverageUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.GetLectureEvaluationListUseCase +import com.suwiki.domain.lectureevaluation.usecase.lecture.ReportLectureUseCase import com.suwiki.presentation.common.ui.enums.LectureEvaluationTab import com.suwiki.presentation.common.ui.extension.encodeToUri import com.suwiki.presentation.lectureevaluation.navigation.LectureEvaluationRoute diff --git a/presentation/myinfo/build.gradle.kts b/presentation/myinfo/build.gradle.kts index 640918ac1..87e5e76c4 100644 --- a/presentation/myinfo/build.gradle.kts +++ b/presentation/myinfo/build.gradle.kts @@ -9,7 +9,7 @@ android { dependencies { implementation(projects.domain.user) - implementation(projects.domain.lectureevaluation.my) + implementation(projects.domain.lectureevaluation) implementation(libs.oss.licenses) } diff --git a/presentation/myinfo/src/main/java/com/suwiki/presentation/myinfo/mypoint/MyPointViewModel.kt b/presentation/myinfo/src/main/java/com/suwiki/presentation/myinfo/mypoint/MyPointViewModel.kt index 69f6e5a95..d14e68a5b 100644 --- a/presentation/myinfo/src/main/java/com/suwiki/presentation/myinfo/mypoint/MyPointViewModel.kt +++ b/presentation/myinfo/src/main/java/com/suwiki/presentation/myinfo/mypoint/MyPointViewModel.kt @@ -2,7 +2,7 @@ package com.suwiki.presentation.myinfo.mypoint import androidx.lifecycle.ViewModel import com.suwiki.core.model.user.User -import com.suwiki.domain.lectureevaluation.my.usecase.GetPurchaseHistoryUseCase +import com.suwiki.domain.lectureevaluation.usecase.exam.GetPurchaseHistoryUseCase import com.suwiki.domain.user.usecase.GetUserInfoUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.collections.immutable.toPersistentList diff --git a/settings.gradle.kts b/settings.gradle.kts index 4a5427454..21f546f13 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -49,9 +49,7 @@ include(":data:login") include(":domain:openmajor") include(":domain:user") include(":domain:signup") -include(":domain:lectureevaluation:viewerreporter") -include(":domain:lectureevaluation:my") -include(":domain:lectureevaluation:editor") +include(":domain:lectureevaluation") include(":domain:timetable") include(":domain:notice") include(":domain:login")