Merge pull request #48 from Task-Tracker-Systems/coverage

Coverage

Author: ggarbereder

Task-Tracker-CLI/src/main/kotlin/CLI.kt

@@ -53,7 +53,7 @@ class CLI(
                     "Delete" -> {
                         val confirm = KInquirer.promptConfirm("Are you sure to delete $task")
                         if (confirm) {
-                            useCases.createRemoveTasks(task).invoke()
+                            useCases.createRemoveTask(task).invoke()
                             println("$task was removed")
                         }
                     }

Task-Tracker-CLI/src/main/kotlin/Main.kt

@@ -1,7 +1,8 @@
+import com.garbereder.tasktracker.usecases.sqlite.DriverFactory
 import com.garbereder.tasktracker.usecases.tasks.DBTaskCollectionReaderFactory
 
 fun main() {
     CLI(
-        DBTaskCollectionReaderFactory()
+        DBTaskCollectionReaderFactory(DriverFactory("jdbc:sqlite:tasktracker.sqlite"))
     ).run()
 }

Task-Tracker-Entities/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     kotlin("multiplatform") version "1.8.22"
     id("org.jlleitschuh.gradle.ktlint") version "11.5.1"
     id("maven-publish")
+    id("org.jetbrains.kotlinx.kover") version "0.7.3"
 }
 
 group = "com.garbereder.tasktracker.entities"

Task-Tracker-Usecases-SQLite-Impl/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("maven-publish")
     id("app.cash.sqldelight") version "2.0.0-rc01"
     id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
+    id("org.jetbrains.kotlinx.kover") version "0.7.3"
 }
 
 group = "com.garbereder.tasktracker.usecases.sqlite"
@@ -73,3 +74,15 @@ ktlint {
         }
     }
 }
+
+koverReport {
+    filters {
+        excludes {
+            classes(
+                "com.garbereder.tasktracker.usecases.sqlite.TaskTrackerUsecasesSQLiteImpl.DatabaseImpl",
+                "com.garbereder.tasktracker.usecases.sqlite.TaskTrackerUsecasesSQLiteImpl.DatabaseImpl\$Schema",
+                "com.garbereder.tasktracker.usecases.sqlite.TaskTrackerUsecasesSQLiteImpl.DatabaseImplKt"
+            )
+        }
+    }
+}

Task-Tracker-Usecases-SQLite-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/sqlite/DriverFactory.kt

@@ -1,7 +1,8 @@
 package com.garbereder.tasktracker.usecases.sqlite
 
 import app.cash.sqldelight.db.SqlDriver
+import com.garbereder.tasktracker.usecases.tasks.DBDriverFactory
 
-expect class DriverFactory {
-    fun createDriver(): SqlDriver
+expect class DriverFactory : DBDriverFactory {
+    override fun createDriver(): SqlDriver
 }

Task-Tracker-Usecases-SQLite-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/DBDriverFactory.kt

@@ -0,0 +1,7 @@
+package com.garbereder.tasktracker.usecases.tasks
+
+import app.cash.sqldelight.db.SqlDriver
+
+interface DBDriverFactory {
+    fun createDriver(): SqlDriver
+}

Task-Tracker-Usecases-SQLite-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/DBTask.kt

@@ -4,28 +4,26 @@ import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
 import com.garbereder.tasktracker.usecases.sqlite.Database
 
-class DBAwareTaskCollection(private val database: Database) :
+class DBTaskCollection(private val database: Database) :
     TaskCollection {
 
-    override fun add(task: Task) {
+    override fun add(task: Task) =
         database.transaction {
-            database.tasksQueries.insert(task.name)
+            database.tasksQueries.insert(task.name, task.totalDuration)
         }
-    }
 
-    override fun iterator(): Iterator<Task> = database.tasksQueries.selectAll().executeAsList().map { t -> Task(t.name, t.total_duration) }.iterator()
+    override fun iterator(): Iterator<Task> =
+        database.tasksQueries.selectAll().executeAsList().map { t -> Task(t.name, t.total_duration) }.iterator()
 
-    override fun remove(task: Task) {
+    override fun remove(task: Task) =
         database.transaction {
             database.tasksQueries.deleteByName(task.name)
         }
-    }
 
-    override fun replace(task: Task) {
+    override fun replace(task: Task) =
         database.transaction {
             database.tasksQueries.setTotalDuration(task.totalDuration, task.name)
         }
-    }
 
     override fun size(): Int = database.tasksQueries.selectAll().executeAsList().count()
 }

Task-Tracker-Usecases-SQLite-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/DBAwareTaskCollection.kt renamed to Task-Tracker-Usecases-SQLite-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/DBTaskCollection.kt

@@ -2,11 +2,7 @@ package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.TaskCollection
 import com.garbereder.tasktracker.usecases.sqlite.Database
-import com.garbereder.tasktracker.usecases.sqlite.DriverFactory
 
-class DBTaskCollectionReader internal constructor(private val driverFactory: DriverFactory) : TaskCollectionReader {
-    override fun read(): TaskCollection {
-        val database = Database(driverFactory.createDriver())
-        return DBAwareTaskCollection(database)
-    }
+class DBTaskCollectionReader internal constructor(private val driverFactory: DBDriverFactory) : TaskCollectionReader {
+    override fun read(): TaskCollection = DBTaskCollection(Database(driverFactory.createDriver()))
 }

Task-Tracker-Usecases-SQLite-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/DBTaskCollectionReader.kt

@@ -1,22 +1,23 @@
-CREATE TABLE IF NOT EXISTS Task (
+CREATE TABLE IF NOT EXISTS PersistentTask (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   name TEXT NOT NULL,
   total_duration INTEGER NOT NULL DEFAULT 0
 );
 
 selectAll:
 SELECT *
-FROM Task;
+FROM PersistentTask
+ORDER BY name;
 
 insert:
-INSERT INTO Task(name)
-VALUES (?);
+INSERT INTO PersistentTask(name, total_duration)
+VALUES (?, ?);
 
 deleteByName:
-DELETE FROM Task
+DELETE FROM PersistentTask
 WHERE name = ?;
 
 setTotalDuration:
-UPDATE Task
+UPDATE PersistentTask
 SET total_duration = ?
 WHERE name = ?;