Merge pull request #5 from teogor/feature/introduce-core-database-pac…

…kage Add :core:database package for data management
teogor · Feb 15, 2024 · 749d858 · 749d858
2 parents fd9ac93 + ffceb58
commit 749d858
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 34 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 ksp {
   arg("stitch.addDocumentation", "true")
   arg("stitch.generateOperations", "true")
-  arg("stitch.generatedPackageName", "dev.teogor.stitch.database")
+  arg("stitch.generatedPackageName", "dev.teogor.stitch")
 }
 
 android {
@@ -94,4 +94,4 @@ dependencies {
 
   implementation(project(":common"))
   ksp(project(":ksp"))
-}
+}
diff --git a/...lin/dev/teogor/stitch/data/AppDatabase.kt → ...eogor/stitch/core/database/AppDatabase.kt b/...lin/dev/teogor/stitch/data/AppDatabase.kt → ...eogor/stitch/core/database/AppDatabase.kt
@@ -14,21 +14,20 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data
+package dev.teogor.stitch.core.database
 
-// import dev.teogor.stitch.data.dao.GameWithBoardDao
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import dev.teogor.stitch.data.converters.Converters
-import dev.teogor.stitch.data.converters.DurationConverter
-import dev.teogor.stitch.data.converters.ZonedDateTimeConverter
-import dev.teogor.stitch.data.dao.SavedGameDao
-import dev.teogor.stitch.data.dao.TestingKindDao
-import dev.teogor.stitch.data.model.SavedGame
-import dev.teogor.stitch.data.model.TestingKind
+import dev.teogor.stitch.core.database.util.Converters
+import dev.teogor.stitch.core.database.util.DurationConverter
+import dev.teogor.stitch.core.database.util.ZonedDateTimeConverter
+import dev.teogor.stitch.core.database.dao.SavedGameDao
+import dev.teogor.stitch.core.database.dao.TestingKindDao
+import dev.teogor.stitch.core.database.model.SavedGame
+import dev.teogor.stitch.core.database.model.TestingKind
 
 @Database(
     entities = [

diff --git a/...ev/teogor/stitch/data/dao/SavedGameDao.kt → .../stitch/core/database/dao/SavedGameDao.kt b/...ev/teogor/stitch/data/dao/SavedGameDao.kt → .../stitch/core/database/dao/SavedGameDao.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.dao
+package dev.teogor.stitch.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import dev.teogor.stitch.data.model.SavedGame
+import dev.teogor.stitch.core.database.model.SavedGame
 import kotlinx.coroutines.flow.Flow
 
 @Dao

diff --git a/.../teogor/stitch/data/dao/TestingKindDao.kt → ...titch/core/database/dao/TestingKindDao.kt b/.../teogor/stitch/data/dao/TestingKindDao.kt → ...titch/core/database/dao/TestingKindDao.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.dao
+package dev.teogor.stitch.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import dev.teogor.stitch.data.model.SavedGame
+import dev.teogor.stitch.core.database.model.SavedGame
 import kotlinx.coroutines.flow.Flow
 
 @Dao

diff --git a/...ev/teogor/stitch/data/model/Difficulty.kt → .../stitch/core/database/model/Difficulty.kt b/...ev/teogor/stitch/data/model/Difficulty.kt → .../stitch/core/database/model/Difficulty.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.model
+package dev.teogor.stitch.core.database.model
 
 /**
  * Represents the difficulty levels of Sudoku puzzles.

diff --git a/.../dev/teogor/stitch/data/model/GameType.kt → ...or/stitch/core/database/model/GameType.kt b/.../dev/teogor/stitch/data/model/GameType.kt → ...or/stitch/core/database/model/GameType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.model
+package dev.teogor.stitch.core.database.model
 
 // TODO get box size and row/col size
 

diff --git a/...dev/teogor/stitch/data/model/SavedGame.kt → ...r/stitch/core/database/model/SavedGame.kt b/...dev/teogor/stitch/data/model/SavedGame.kt → ...r/stitch/core/database/model/SavedGame.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.model
+package dev.teogor.stitch.core.database.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...ogor/stitch/data/model/SudokuEventType.kt → ...ch/core/database/model/SudokuEventType.kt b/...ogor/stitch/data/model/SudokuEventType.kt → ...ch/core/database/model/SudokuEventType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.model
+package dev.teogor.stitch.core.database.model
 
 enum class SudokuEventType {
     Daily,

diff --git a/...v/teogor/stitch/data/model/TestingKind.kt → ...stitch/core/database/model/TestingKind.kt b/...v/teogor/stitch/data/model/TestingKind.kt → ...stitch/core/database/model/TestingKind.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.model
+package dev.teogor.stitch.core.database.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...ogor/stitch/data/converters/Converters.kt → ...r/stitch/core/database/util/Converters.kt b/...ogor/stitch/data/converters/Converters.kt → ...r/stitch/core/database/util/Converters.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.converters
+package dev.teogor.stitch.core.database.util
 
 import androidx.room.TypeConverter
-import dev.teogor.stitch.data.model.Difficulty
-import dev.teogor.stitch.data.model.GameType
-import dev.teogor.stitch.data.model.SudokuEventType
+import dev.teogor.stitch.core.database.model.Difficulty
+import dev.teogor.stitch.core.database.model.GameType
+import dev.teogor.stitch.core.database.model.SudokuEventType
 
 object Converters {
     @TypeConverter

diff --git a/...itch/data/converters/DurationConverter.kt → ...h/core/database/util/DurationConverter.kt b/...itch/data/converters/DurationConverter.kt → ...h/core/database/util/DurationConverter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.converters
+package dev.teogor.stitch.core.database.util
 
 import androidx.room.TypeConverter
 import java.time.Duration

diff --git a/...data/converters/ZonedDateTimeConverter.kt → ...e/database/util/ZonedDateTimeConverter.kt b/...data/converters/ZonedDateTimeConverter.kt → ...e/database/util/ZonedDateTimeConverter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.teogor.stitch.data.converters
+package dev.teogor.stitch.core.database.util
 
 import androidx.room.TypeConverter
 import java.time.Instant

diff --git a/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/OperationOutputWriter.kt b/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/OperationOutputWriter.kt
@@ -77,7 +77,7 @@ class OperationOutputWriter(
             generatedClasses.forEach { (baseName, invokeFunctions) ->
                 val className = "${room.name}${baseName.titleCase()}Operation"
                 fileBuilder(
-                    packageName = "${room.getPackageName()}.operations",
+                    packageName = "${room.getPackageName()}.database.operation",
                     fileName = className,
                 ) {
                     addType(
@@ -88,7 +88,7 @@ class OperationOutputWriter(
                                     PropertySpec.builder(
                                         "repository",
                                         ClassName(
-                                            "${room.getPackageName()}.repository",
+                                            "${room.getPackageName()}.data.repository",
                                             "${room.name}Repository",
                                         ),
                                     )
@@ -101,7 +101,7 @@ class OperationOutputWriter(
                                         .addParameter(
                                             "repository",
                                             ClassName(
-                                                "${room.getPackageName()}.repository",
+                                                "${room.getPackageName()}.data.repository",
                                                 "${room.name}Repository",
                                             ),
                                         )

diff --git a/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/RepositoryImplOutputWriter.kt b/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/RepositoryImplOutputWriter.kt
@@ -40,7 +40,7 @@ class RepositoryImplOutputWriter(
         repositoryType: TypeName,
     ) {
         fileBuilder(
-            packageName = "${roomModel.getPackageName()}.repository.impl",
+            packageName = "${roomModel.getPackageName()}.data.repository.impl",
             fileName = "${roomModel.name}RepositoryImpl",
         ) {
             addType(

diff --git a/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/RepositoryOutputWriter.kt b/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/RepositoryOutputWriter.kt
@@ -37,7 +37,7 @@ class RepositoryOutputWriter(
 
     fun write(roomModel: RoomModel): TypeName {
         fileBuilder(
-            packageName = "${roomModel.getPackageName()}.repository",
+            packageName = "${roomModel.getPackageName()}.data.repository",
             fileName = "${roomModel.name}Repository",
         ) {
             addType(
@@ -103,7 +103,7 @@ class RepositoryOutputWriter(
         }.writeWith(codeOutputStreamMaker)
 
         return ClassName(
-            "${roomModel.getPackageName()}.repository",
+            "${roomModel.getPackageName()}.data.repository",
             "${roomModel.name}Repository",
         )
     }

diff --git a/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/StitchModuleOutputWriter.kt b/codegen/src/main/kotlin/dev/teogor/stitch/codegen/writers/StitchModuleOutputWriter.kt
@@ -133,7 +133,7 @@ class StitchModuleOutputWriter(
                                     .addAnnotation(DAGGER_PROVIDES)
                                     .returns(
                                         ClassName(
-                                            "${roomModel.getPackageName()}.repository",
+                                            "${roomModel.getPackageName()}.data.repository",
                                             "${roomModel.name}Repository",
                                         ),
                                     )
@@ -149,7 +149,7 @@ class StitchModuleOutputWriter(
                                     .addStatement(
                                         "return %T(dao)",
                                         ClassName(
-                                            "${roomModel.getPackageName()}.repository.impl",
+                                            "${roomModel.getPackageName()}.data.repository.impl",
                                             "${roomModel.name}RepositoryImpl",
                                         ),
                                     )