Merge pull request #16 from Task-Tracker-Systems/activities

Add Activities to Usecases and CLI

Author: ggarbereder

Task-Tracker-CLI/build.gradle.kts

@@ -15,6 +15,7 @@ repositories {
 dependencies {
     testImplementation(kotlin("test"))
     implementation("com.github.kotlin-inquirer:kotlin-inquirer:0.1.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
     implementation("com.garbereder.tasktracker.usecases:Task-Tracker-Usecases:1.0-SNAPSHOT")
     implementation("com.garbereder.tasktracker.entities:Task-Tracker-Entities:1.0-SNAPSHOT")
     implementation("com.garbereder.tasktracker.entities-impl:Task-Tracker-Entities-Impl:1.0-SNAPSHOT")

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

@@ -1,11 +1,7 @@
-
-import com.garbereder.tasktracker.entities.TaskCollection
-import com.garbereder.tasktracker.entities.TaskCollectionImpl
-import com.garbereder.tasktracker.usecases.tasks.AddTask
-import com.garbereder.tasktracker.usecases.tasks.ListTasks
-import com.garbereder.tasktracker.usecases.tasks.LoadTasks
-import com.garbereder.tasktracker.usecases.tasks.TaskCollectionReader
+import com.garbereder.tasktracker.entities.*
+import com.garbereder.tasktracker.usecases.tasks.*
 import com.github.kinquirer.KInquirer
+import com.github.kinquirer.components.promptConfirm
 import com.github.kinquirer.components.promptInput
 import com.github.kinquirer.components.promptList
 import kotlin.system.exitProcess
@@ -17,27 +13,53 @@ fun main() {
             return TaskCollectionImpl()
         }
     }).invoke()
-    val addTask : (tasks: TaskCollection) -> Unit = {
+
+    val activities: ActivityCollection = ActivityCollectionImpl()
+
+    val addTask: () -> Unit = {
         val taskName = KInquirer.promptInput("Task name:")
         AddTask(tasks, taskName).invoke()
     }
-    val listTasks : (tasks: TaskCollection) -> Unit = {
-            val taskIterator = ListTasks(tasks).invoke()
-            while(taskIterator.hasNext()) {
-                println(taskIterator.next().name)
-            }
+
+    val listTasks: () -> Unit = {
+        val taskIterator = ListTasks(tasks).invoke()
+        val taskList = mutableMapOf<String, Task>()
+        while (taskIterator.hasNext()) {
+            val task = taskIterator.next()
+            taskList[task.name] = task
+        }
+        val selection: String = KInquirer.promptList("What do you want to start?", taskList.keys.toList())
+        val activity = StartActivity(taskList[selection]!!).invoke()
+        activities.add(activity)
+        val stop = KInquirer.promptConfirm("${activity.task} started at ${activity.start}. Finish now?")
+        if (stop) {
+            val stoppedActivity = StopActivity(activity).invoke()
+            activities.add(stoppedActivity)
+            activities.remove(activity)
+            println("${stoppedActivity.task} started at ${stoppedActivity.start} and finished at ${stoppedActivity.end}")
+        }
     }
-    val quit : (tasks: TaskCollection) -> Unit = {
-            exitProcess(0)
+
+    val listActivities: () -> Unit = {
+        val actIt = activities.iterator()
+        while (actIt.hasNext()) {
+            println(actIt.next())
         }
+    }
+
+    val quit: () -> Unit = {
+        exitProcess(0)
+    }
+
     val choices = mapOf(
         "AddTask" to addTask,
         "ListTask" to listTasks,
+        "ListActivities" to listActivities,
         "Quit" to quit
     )
-    while(true) {
+    while (true) {
         val selection: String = KInquirer.promptList("What do you want to do?", choices.keys.toList())
-        choices[selection]!!.invoke(tasks)
+        choices[selection]!!.invoke()
     }
 
 }

Task-Tracker-Entities-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/entities/ActivityCollectionImpl.kt

@@ -0,0 +1,18 @@
+package com.garbereder.tasktracker.entities
+
+class ActivityCollectionImpl : ActivityCollection {
+
+    private val list = mutableListOf<Activity>()
+    override fun add(activity: Activity) {
+        list.add(activity)
+    }
+
+    override fun iterator(): Iterator<Activity> = list.iterator()
+
+    override fun remove(activity: Activity) {
+        if (!list.contains(activity))
+            throw ActivityNotFoundException(activity)
+        list.remove(activity)
+    }
+
+}

Task-Tracker-Entities/src/commonMain/kotlin/com/garbereder/tasktracker/entities/Activity.kt

@@ -4,7 +4,7 @@ import kotlinx.datetime.LocalDateTime
 
 data class Activity(
     val id: String,
-    val startUTC: LocalDateTime,
-    val endUTC: LocalDateTime,
+    val start: LocalDateTime,
+    val end: LocalDateTime?,
     val task: Task
 )

Task-Tracker-Entities/src/commonMain/kotlin/com/garbereder/tasktracker/entities/ActivityNotFoundException.kt

@@ -0,0 +1,4 @@
+package com.garbereder.tasktracker.entities
+
+class ActivityNotFoundException(activity: Activity): Exception("Could not find activity: $activity") {
+}

Task-Tracker-Entities/src/commonTest/kotlin/com/garbereder/tasktracker/entities/ActivityNotFoundExceptionTests.kt

@@ -0,0 +1,21 @@
+package com.garbereder.tasktracker.entities
+
+import kotlinx.datetime.Clock
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class ActivityNotFoundExceptionTests {
+
+    @Test
+    fun testMessage() {
+        val task = Task("TaskId", "TaskName")
+        val start = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
+        val end = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
+        val activity = Activity("1", start, end, task )
+        val ex = ActivityNotFoundException(activity)
+        assertEquals("Could not find activity: Activity(id=1, start=${start}, end=${end}, task=${task})", ex.message)
+    }
+
+}

Task-Tracker-Usecases/build.gradle.kts

@@ -16,6 +16,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
                 implementation("com.garbereder.tasktracker.entities:Task-Tracker-Entities:1.0-SNAPSHOT")
             }
         }

Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/AddActivity.kt

@@ -0,0 +1,14 @@
+package com.garbereder.tasktracker.usecases.tasks
+
+import com.garbereder.tasktracker.entities.Activity
+import com.garbereder.tasktracker.entities.ActivityCollection
+import com.garbereder.tasktracker.entities.Task
+import com.garbereder.tasktracker.usecases.UseCase
+import kotlinx.datetime.Clock
+
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+
+class AddActivity(private val collection: ActivityCollection, private val activity: Activity): UseCase<Unit> {
+    override fun invoke(): Unit = collection.add(activity)
+}

Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/StartActivity.kt

@@ -0,0 +1,13 @@
+package com.garbereder.tasktracker.usecases.tasks
+
+import com.garbereder.tasktracker.entities.Activity
+import com.garbereder.tasktracker.entities.Task
+import com.garbereder.tasktracker.usecases.UseCase
+import kotlinx.datetime.Clock
+
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+
+class StartActivity(private val task: Task): UseCase<Activity> {
+    override fun invoke(): Activity = Activity("1", Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()), null, task)
+}

Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/StopActivity.kt

@@ -0,0 +1,13 @@
+package com.garbereder.tasktracker.usecases.tasks
+
+import com.garbereder.tasktracker.entities.Activity
+import com.garbereder.tasktracker.entities.Task
+import com.garbereder.tasktracker.usecases.UseCase
+import kotlinx.datetime.Clock
+
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+
+class StopActivity(private val activity: Activity): UseCase<Activity> {
+    override fun invoke(): Activity = activity.copy(end = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()))
+}