Merge pull request #26 from uswLectureEvaluation/integration-data

Integration data
uswLectureEvaluation · Nov 17, 2023 · 36790d3 · 36790d3
2 parents 243e1b6 + 5c59bb6
commit 36790d3
Show file tree

Hide file tree

Showing 105 changed files with 202 additions and 669 deletions.
diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts
@@ -22,11 +22,9 @@ dependencies {
 
   implementation(projects.data)
   implementation(projects.data.openmajor)
-  implementation(projects.data.timetable.viewer)
-  implementation(projects.data.timetable.editor)
+  implementation(projects.data.timetable)
   implementation(projects.data.lectureevaluation.editor)
-  implementation(projects.data.lectureevaluation.viewer)
-  implementation(projects.data.lectureevaluation.report)
+  implementation(projects.data.lectureevaluation.viewerreporter)
   implementation(projects.data.lectureevaluation.my)
   implementation(projects.data.user)
   implementation(projects.data.notice)
@@ -37,18 +35,16 @@ dependencies {
   implementation(projects.domain.openmajor)
 
   implementation(projects.local.openmajor)
-  implementation(projects.local.timetable.editor)
-  implementation(projects.local.timetable.viewer)
+  implementation(projects.local.timetable)
   implementation(projects.local.user)
 
   implementation(projects.remote.lectureevaluation.editor)
   implementation(projects.remote.lectureevaluation.my)
-  implementation(projects.remote.lectureevaluation.report)
-  implementation(projects.remote.lectureevaluation.viewer)
+  implementation(projects.remote.lectureevaluation.viewerreporter)
   implementation(projects.remote.notice)
   implementation(projects.remote.openmajor)
   implementation(projects.remote.signup)
-  implementation(projects.remote.timetable.viewer)
+  implementation(projects.remote.timetable)
   implementation(projects.remote.user)
 
   implementation(projects.presentation)

diff --git a/data/lectureevaluation/viewer/build.gradle.kts b/data/lectureevaluation/viewer/build.gradle.kts
diff --git a/...aluation/viewer/src/test/java/com/suwiki/data/lectureevaluation/viewer/ExampleUnitTest.kt b/...aluation/viewer/src/test/java/com/suwiki/data/lectureevaluation/viewer/ExampleUnitTest.kt
diff --git a/data/lectureevaluation/report/.gitignore → ...ctureevaluation/viewerreporter/.gitignore b/data/lectureevaluation/report/.gitignore → ...ctureevaluation/viewerreporter/.gitignore
diff --git a/...lectureevaluation/report/build.gradle.kts → ...valuation/viewerreporter/build.gradle.kts b/...lectureevaluation/report/build.gradle.kts → ...valuation/viewerreporter/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 }
 
 android {
-  namespace = "com.suwiki.data.lectureevalution.report"
+  namespace = "com.suwiki.data.lectureevalution.viewerreporter"
 }
diff --git a/...ctureevaluation/report/consumer-rules.pro → ...luation/viewerreporter/consumer-rules.pro b/...ctureevaluation/report/consumer-rules.pro → ...luation/viewerreporter/consumer-rules.pro
diff --git a/...ctureevaluation/report/proguard-rules.pro → ...luation/viewerreporter/proguard-rules.pro b/...ctureevaluation/report/proguard-rules.pro → ...luation/viewerreporter/proguard-rules.pro
diff --git a/...luation/viewer/ExampleInstrumentedTest.kt → ...viewerreporter/ExampleInstrumentedTest.kt b/...luation/viewer/ExampleInstrumentedTest.kt → ...viewerreporter/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.lectureevaluation.viewer
+package com.suwiki.data.lectureevaluation.viewerreporter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry

diff --git a/...ation/report/src/main/AndroidManifest.xml → ...ewerreporter/src/main/AndroidManifest.xml b/...ation/report/src/main/AndroidManifest.xml → ...ewerreporter/src/main/AndroidManifest.xml
diff --git a/...atasource/RemoteExamProviderDataSource.kt → ...atasource/RemoteExamProviderDataSource.kt b/...atasource/RemoteExamProviderDataSource.kt → ...atasource/RemoteExamProviderDataSource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.lectureevaluation.viewer.datasource
+package com.suwiki.data.lectureevaluation.viewerreporter.datasource
 
 import com.suwiki.core.model.lectureevaluation.LectureDetailExamData
 

diff --git a/.../datasource/RemoteExamReportDataSource.kt → .../datasource/RemoteExamReportDataSource.kt b/.../datasource/RemoteExamReportDataSource.kt → .../datasource/RemoteExamReportDataSource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.lectureevaluation.report.datasource
+package com.suwiki.data.lectureevaluation.viewerreporter.datasource
 
 interface RemoteExamReportDataSource {
 

diff --git a/...source/RemoteLectureProviderDataSource.kt → ...source/RemoteLectureProviderDataSource.kt b/...source/RemoteLectureProviderDataSource.kt → ...source/RemoteLectureProviderDataSource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.lectureevaluation.viewer.datasource
+package com.suwiki.data.lectureevaluation.viewerreporter.datasource
 
 import com.suwiki.core.model.lectureevaluation.LectureDetailEvaluationData
 import com.suwiki.core.model.lectureevaluation.LectureDetailInfo

diff --git a/...tasource/RemoteLectureReportDataSource.kt → ...tasource/RemoteLectureReportDataSource.kt b/...tasource/RemoteLectureReportDataSource.kt → ...tasource/RemoteLectureReportDataSource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.lectureevaluation.report.datasource
+package com.suwiki.data.lectureevaluation.viewerreporter.datasource
 
 interface RemoteLectureReportDataSource {
 

diff --git a/...ctureevaluation/report/ExampleUnitTest.kt → ...luation/viewerreporter/ExampleUnitTest.kt b/...ctureevaluation/report/ExampleUnitTest.kt → ...luation/viewerreporter/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.lectureevaluation.report
+package com.suwiki.data.lectureevaluation.viewerreporter
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test

diff --git a/data/lectureevaluation/viewer/.gitignore → data/timetable/.gitignore b/data/lectureevaluation/viewer/.gitignore → data/timetable/.gitignore
diff --git a/data/timetable/viewer/build.gradle.kts → data/timetable/build.gradle.kts b/data/timetable/viewer/build.gradle.kts → data/timetable/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 }
 
 android {
-  namespace = "com.suwiki.data.timetable.viewer"
+  namespace = "com.suwiki.data.timetable"
 }
diff --git a/...ctureevaluation/viewer/consumer-rules.pro → data/timetable/consumer-rules.pro b/...ctureevaluation/viewer/consumer-rules.pro → data/timetable/consumer-rules.pro
diff --git a/data/timetable/editor/build.gradle.kts b/data/timetable/editor/build.gradle.kts
diff --git a/...e/editor/src/androidTest/java/com/suwiki/data/timetable/editor/ExampleInstrumentedTest.kt b/...e/editor/src/androidTest/java/com/suwiki/data/timetable/editor/ExampleInstrumentedTest.kt
diff --git a/data/timetable/editor/src/test/java/com/suwiki/data/timetable/editor/ExampleUnitTest.kt b/data/timetable/editor/src/test/java/com/suwiki/data/timetable/editor/ExampleUnitTest.kt
diff --git a/...ctureevaluation/viewer/proguard-rules.pro → data/timetable/proguard-rules.pro b/...ctureevaluation/viewer/proguard-rules.pro → data/timetable/proguard-rules.pro
diff --git a/...ation/viewer/src/main/AndroidManifest.xml → data/timetable/src/main/AndroidManifest.xml b/...ation/viewer/src/main/AndroidManifest.xml → data/timetable/src/main/AndroidManifest.xml
diff --git a/...ource/LocalTimetableProviderDatasource.kt → ...ource/LocalTimetableProviderDatasource.kt b/...ource/LocalTimetableProviderDatasource.kt → ...ource/LocalTimetableProviderDatasource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.timetable.viewer.datasource
+package com.suwiki.data.timetable.datasource
 
 import com.suwiki.core.model.timetable.TimetableData
 

diff --git a/...source/LocalTimetableStorageDatasource.kt → ...source/LocalTimetableStorageDatasource.kt b/...source/LocalTimetableStorageDatasource.kt → ...source/LocalTimetableStorageDatasource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.timetable.editor.datasource
+package com.suwiki.data.timetable.datasource
 
 import com.suwiki.core.model.timetable.TimetableData
 

diff --git a/...r/datasource/RemoteTimetableDataSource.kt → ...e/datasource/RemoteTimetableDataSource.kt b/...r/datasource/RemoteTimetableDataSource.kt → ...e/datasource/RemoteTimetableDataSource.kt
@@ -1,4 +1,4 @@
-package com.suwiki.data.timetable.viewer.datasource
+package com.suwiki.data.timetable.datasource
 
 import com.suwiki.core.model.timetable.TimetableData
 

diff --git a/...e/viewer/src/androidTest/java/com/suwiki/data/timetable/viewer/ExampleInstrumentedTest.kt b/...e/viewer/src/androidTest/java/com/suwiki/data/timetable/viewer/ExampleInstrumentedTest.kt
diff --git a/detekt-config.yml b/detekt-config.yml
@@ -88,4 +88,6 @@ naming:
     active: false
   PackageNaming:
     packagePattern: '[a-z]+(\._?[_?A-Za-z0-9]*)*'
+  InvalidPackageDeclaration:
+    active: false
 
diff --git a/data/timetable/editor/.gitignore → local/timetable/.gitignore b/data/timetable/editor/.gitignore → local/timetable/.gitignore
diff --git a/local/timetable/editor/build.gradle.kts → local/timetable/build.gradle.kts b/local/timetable/editor/build.gradle.kts → local/timetable/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-  namespace = "com.suwiki.local.timetable.editor"
+  namespace = "com.suwiki.local.timetable"
 }
 
 dependencies {
   implementation(projects.core.model)
-  implementation(projects.data.timetable.editor)
+  implementation(projects.data.timetable)
   implementation(projects.core.database)
 
   ksp(libs.room.compiler)

diff --git a/data/timetable/editor/consumer-rules.pro → local/timetable/consumer-rules.pro b/data/timetable/editor/consumer-rules.pro → local/timetable/consumer-rules.pro
diff --git a/...etable/editor/src/androidTest/java/com/suwiki/timetable/editor/ExampleInstrumentedTest.kt b/...etable/editor/src/androidTest/java/com/suwiki/timetable/editor/ExampleInstrumentedTest.kt
diff --git a/local/timetable/editor/src/main/AndroidManifest.xml b/local/timetable/editor/src/main/AndroidManifest.xml
diff --git a/...etable/editor/src/main/java/com/suwiki/local/timetable/editor/di/LocalDataSourceModule.kt b/...etable/editor/src/main/java/com/suwiki/local/timetable/editor/di/LocalDataSourceModule.kt
diff --git a/local/timetable/editor/src/test/java/com/suwiki/timetable/editor/ExampleUnitTest.kt b/local/timetable/editor/src/test/java/com/suwiki/timetable/editor/ExampleUnitTest.kt
diff --git a/data/timetable/editor/proguard-rules.pro → local/timetable/proguard-rules.pro b/data/timetable/editor/proguard-rules.pro → local/timetable/proguard-rules.pro
diff --git a/...table/editor/src/main/AndroidManifest.xml → local/timetable/src/main/AndroidManifest.xml b/...table/editor/src/main/AndroidManifest.xml → local/timetable/src/main/AndroidManifest.xml
diff --git a/...l/timetable/viewer/converter/Timetable.kt → ...ki.local.timetable/converter/Timetable.kt b/...l/timetable/viewer/converter/Timetable.kt → ...ki.local.timetable/converter/Timetable.kt
@@ -1,4 +1,4 @@
-package com.suwiki.local.timetable.viewer.converter
+package com.suwiki.local.timetable.converter
 
 import com.suwiki.core.database.model.TimetableEntity
 import com.suwiki.core.model.timetable.TimetableData

diff --git a/...metable/editor/converter/TimetableData.kt → ...ocal.timetable/converter/TimetableData.kt b/...metable/editor/converter/TimetableData.kt → ...ocal.timetable/converter/TimetableData.kt
@@ -1,4 +1,4 @@
-package com.suwiki.local.timetable.editor.converter
+package com.suwiki.local.timetable.converter
 
 import com.suwiki.core.database.model.TimetableEntity
 import com.suwiki.core.model.timetable.TimetableData

diff --git a/...e/LocalTimetableProviderDatasourceImpl.kt → ...e/LocalTimetableProviderDatasourceImpl.kt b/...e/LocalTimetableProviderDatasourceImpl.kt → ...e/LocalTimetableProviderDatasourceImpl.kt
@@ -1,9 +1,9 @@
-package com.suwiki.local.timetable.viewer.datasource
+package com.suwiki.local.timetable.datasource
 
 import com.suwiki.core.database.TimetableDatabase
 import com.suwiki.core.model.timetable.TimetableData
-import com.suwiki.data.timetable.viewer.datasource.LocalTimetableProviderDatasource
-import com.suwiki.local.timetable.viewer.converter.toModel
+import com.suwiki.data.timetable.datasource.LocalTimetableProviderDatasource
+import com.suwiki.local.timetable.converter.toModel
 import javax.inject.Inject
 
 class LocalTimetableProviderDatasourceImpl @Inject constructor(

diff --git a/...ce/LocalTimetableStorageDatasourceImpl.kt → ...ce/LocalTimetableStorageDatasourceImpl.kt b/...ce/LocalTimetableStorageDatasourceImpl.kt → ...ce/LocalTimetableStorageDatasourceImpl.kt
@@ -1,9 +1,9 @@
-package com.suwiki.local.timetable.editor.datasource
+package com.suwiki.local.timetable.datasource
 
 import com.suwiki.core.database.TimetableDatabase
 import com.suwiki.core.model.timetable.TimetableData
-import com.suwiki.data.timetable.editor.datasource.LocalTimetableStorageDatasource
-import com.suwiki.local.timetable.editor.converter.toEntity
+import com.suwiki.data.timetable.datasource.LocalTimetableStorageDatasource
+import com.suwiki.local.timetable.converter.toEntity
 import javax.inject.Inject
 
 class LocalTimetableStorageDatasourceImpl @Inject constructor(

diff --git a/local/timetable/src/main/java/com.suwiki.local.timetable/di/LocalDataSourceModule.kt b/local/timetable/src/main/java/com.suwiki.local.timetable/di/LocalDataSourceModule.kt
@@ -0,0 +1,28 @@
+package com.suwiki.local.timetable.di
+
+import com.suwiki.data.timetable.datasource.LocalTimetableProviderDatasource
+import com.suwiki.data.timetable.datasource.LocalTimetableStorageDatasource
+import com.suwiki.local.timetable.datasource.LocalTimetableProviderDatasourceImpl
+import com.suwiki.local.timetable.datasource.LocalTimetableStorageDatasourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class LocalDataSourceModule {
+
+  @Singleton
+  @Binds
+  abstract fun bindLocalTimetableStorageDataSource(
+    localTimetableStorageDataSourceImpl: LocalTimetableStorageDatasourceImpl,
+  ): LocalTimetableStorageDatasource
+
+  @Singleton
+  @Binds
+  abstract fun bindLocalTimetableProviderDataSource(
+    localTimetableProviderDataSourceImpl: LocalTimetableProviderDatasourceImpl,
+  ): LocalTimetableProviderDatasource
+}
diff --git a/local/timetable/viewer/.gitignore b/local/timetable/viewer/.gitignore
diff --git a/local/timetable/viewer/build.gradle.kts b/local/timetable/viewer/build.gradle.kts
diff --git a/local/timetable/viewer/consumer-rules.pro b/local/timetable/viewer/consumer-rules.pro