Feature/add audit functionalty

build.gradle.kts

@@ -58,5 +58,5 @@ tasks.test {
 }
 
 kotlin {
-    jvmToolchain(23)
+    jvmToolchain(22)
 }

csv_files/audit.csv

@@ -0,0 +1,7 @@
+"Audit Id","Timestamp","CreatedBy","Audit Action","Changes Description","Entity Type","Entity Id"
+"AUDITDD_52700","1746681952700","user1234","CREATE","","TASK","titlett_52651"
+"AUDITDD_16009","1746682016009","user1234","UPDATE","","TASK","titlett_52651"
+"AUDITDD_26796","1746682026796","user1234","DELETE","","TASK","titlett_52651"
+"AUDITDDDD_29153","1746685829153","user1234","CREATE","","TASK","titlett_29143"
+"AUDITDD_39457","1746685839457","user1234","UPDATE","","TASK","titlett_29143""AUDITDD_97145","1746688997145","user1234","CREATE","","PROJECT","taskmangermmmm_97132"
+"AUDITDDDD_44756","1746689044756","user1234","UPDATE","","PROJECT","taskmangermmmm_97132"

csv_files/project.csv

@@ -0,0 +1,2 @@
+"Project Id","Project Name","Description","States","Tasks"
+"taskmangermmmm_97132","title updated","the ultimate project","[]","[]"

csv_files/task.csv

@@ -1,2 +1,3 @@
 "Task Id","Project Id","Title","Description","State Id","Assigned To User Id","Create By User Id"
 "dfgsdgfdd_66055","P1","dfgsdgfd","gasdfgfdaf","S1","U1","U1"
+"titlett_29143","P1","title","description","S1","U2","user1234"

csv_files/user.csv

@@ -0,0 +1,2 @@
+"User Id","UserName","Password","User Role"
+"ahmadmmmm_70365","ahmad","d2dfac4d62e5470ab0c92d6f425b977d","MATE"

src/main/kotlin/Main.kt

@@ -4,7 +4,6 @@ import com.berlin.di.uiModule
 import com.berlin.di.useCaseModule
 import com.berlin.di.*
 import com.berlin.presentation.MainMenuUI
-import com.berlin.presentation.authService.AuthenticateUserUi
 import org.koin.core.context.startKoin
 import org.koin.mp.KoinPlatform.getKoin
 
@@ -14,8 +13,10 @@ fun main() {
         printLogger()
         modules(dataModule, appModule, useCaseModule, uiModule)
     }
-
     val mainMenu: MainMenuUI = getKoin().get()
     mainMenu.run()
 
-}
+}
+
+
+// autit -> project [tasks]

src/main/kotlin/data/DummyData.kt

@@ -19,6 +19,7 @@ object DummyData : BaseDataSource<Task> {
     )
 
     val states = mutableListOf(
+        State("Q1","Menna","P5"),
         State("S1", "TODO", "P1"),
         State("S2", "IN_PROGRESS", "P1"),
         State("S3", "REVIEW", "P1"),

src/main/kotlin/data/UserCache.kt

@@ -2,6 +2,8 @@ package data
 
 import com.berlin.domain.model.User
 
-object UserCache {
-    var currentUser: User? = null
+class UserCache(
+    admin: User
+) {
+    var currentUser: User = admin
 }

src/main/kotlin/data/authentication/AuthenticationRepositoryImpl.kt

@@ -3,18 +3,14 @@ package com.berlin.data.authentication
 import com.berlin.data.BaseDataSource
 import com.berlin.domain.exception.UserNotFoundException
 import com.berlin.domain.exception.UserNotLoggedInException
-import com.berlin.domain.hashPassword.HashingPassword
-import com.berlin.domain.hashPassword.MD5Hasher
-import com.berlin.domain.helper.IdGenerator
-import com.berlin.domain.helper.IdGeneratorImplementation
 import com.berlin.domain.model.User
-import com.berlin.domain.model.UserRole
 import com.berlin.domain.repository.AuthenticationRepository
 import data.UserCache
 import kotlin.Result.Companion.failure
 
 
 class AuthenticationRepositoryImpl(
+    private val userCache: UserCache,
     private val userDataSource: BaseDataSource<User>
     ): AuthenticationRepository {
 
@@ -45,11 +41,11 @@ class AuthenticationRepositoryImpl(
 
 
     override fun getCurrentUser(): Result<User> {
-        val user = UserCache.currentUser
+        val user = userCache.currentUser
         return if (user != null) {
             Result.success(user)
         } else {
-            Result.failure(UserNotLoggedInException("No one logged in"))
+            failure(UserNotLoggedInException("No one logged in"))
 
         }
 

src/main/kotlin/data/state/StateRepositoryImpl.kt

@@ -2,54 +2,60 @@ package com.berlin.data.state
 
 import com.berlin.data.BaseDataSource
 import com.berlin.domain.exception.InvalidStateException
+import com.berlin.domain.exception.StateNotFoundException
 import com.berlin.domain.model.State
 import com.berlin.domain.model.Task
 import com.berlin.domain.repository.StateRepository
+import kotlin.Result.Companion.failure
+import kotlin.Result.Companion.success
 
 class StateRepositoryImpl(
     private val stateDataSource: BaseDataSource<State>,
-    private val taskDataSource: BaseDataSource<Task>
-):StateRepository {
-    override fun addState(state: State): Result<String> {
-        return if (stateDataSource.write(state))
-            Result.success(state.id)
+    private val taskDataSource: BaseDataSource<Task>,
+) : StateRepository {
+    override fun addState(state: State): Result<String> =
+         if (stateDataSource.write(state))
+            success(state.id)
         else
-            Result.failure(InvalidStateException("can not add state"))
-    }
+            failure(InvalidStateException("can not add state"))
 
-    override fun getStatesByProjectId(projectId: String): List<State>? {
-        return stateDataSource.getAll()
-            .filter { it.projectId == projectId }
-            .takeIf { it.isNotEmpty() }
-    }
 
-    override fun getTasksByStateId(stateId: String): List<Task>? {
-        return taskDataSource.getAll()
+    override fun getStatesByProjectId(projectId: String): Result<List<State>> =
+        success(stateDataSource.getAll().filter { it.projectId == projectId })
+
+
+    override fun getTasksByStateId(stateId: String): List<Task>? =
+        taskDataSource.getAll()
             .filter { it.stateId == stateId }
             .takeIf { it.isNotEmpty() }
-    }
 
-    override fun deleteState(stateId: String): Result<String> {
-        return if (stateDataSource.delete(stateId))
-            Result.success(stateId)
+
+    override fun deleteState(stateId: String): Result<String> =
+        if (stateDataSource.delete(stateId))
+            success(stateId)
         else
-            Result.failure(InvalidStateException("can not delete state"))
-    }
+            failure(InvalidStateException("can not delete state"))
 
-    override fun updateState(state: State): Result<String> {
-        return if (stateDataSource.update(state.id,state))
-            Result.success(state.id)
+
+    override fun updateState(state: State): Result<String> =
+        if (stateDataSource.update(state.id, state))
+            success(state.id)
         else
-            Result.failure(InvalidStateException("can not update state"))
-    }
+            failure(InvalidStateException("can not update state"))
+
 
     override fun getStateByTaskId(taskId: String): State? {
-       return taskDataSource
-           .getById(taskId)
-           ?.let { stateDataSource.getById(it.stateId) }
+        return taskDataSource
+            .getById(taskId)
+            ?.let { stateDataSource.getById(it.stateId) }
     }
 
-    override fun getStateById(stateId: String): State? {
-        return stateDataSource.getById(stateId)
+    override fun getStateById(stateId: String): Result<State> =
+        stateDataSource.getById(stateId)
+            ?.let { success(it) }
+            ?: failure(StateNotFoundException(stateId))
+
+    override fun getAllStates(): List<State> {
+        return stateDataSource.getAll()
     }
 }

src/main/kotlin/data/task/TaskRepositoryImpl.kt

@@ -1,4 +1,4 @@
-package com.berlin.data.memory
+package com.berlin.data.task
 
 import com.berlin.data.BaseDataSource
 import com.berlin.domain.exception.InvalidTaskException

src/main/kotlin/di/appModule.kt

@@ -1,14 +1,17 @@
 package com.berlin.di
 
 
-import com.berlin.domain.hashPassword.HashingPassword
+import com.berlin.domain.hashPassword.HashingString
 import com.berlin.domain.hashPassword.MD5Hasher
-import com.berlin.domain.helper.IdGeneratorImplementation
-import com.berlin.domain.helper.IdGenerator
+import com.berlin.domain.model.User
+import com.berlin.domain.model.UserRole
+import com.berlin.domain.usecase.utils.IDGenerator.IdGeneratorImplementation
+import com.berlin.domain.usecase.utils.IDGenerator.IdGenerator
 import com.berlin.presentation.io.ConsoleReader
 import com.berlin.presentation.io.ConsoleViewer
 import com.berlin.presentation.io.Reader
 import com.berlin.presentation.io.Viewer
+import data.UserCache
 import org.koin.dsl.module
 
 
@@ -17,5 +20,12 @@ val appModule = module {
     single<Reader> { ConsoleReader() }
     single<IdGenerator> { IdGeneratorImplementation() }
     single<IdGeneratorImplementation> { IdGeneratorImplementation() }
-    single <HashingPassword> { MD5Hasher() }
+    single <HashingString> { MD5Hasher() }
+
+    single {
+        UserCache(
+            User("user1234", "admin", "1212", UserRole.ADMIN)
+        )
+    }
+
 }

src/main/kotlin/di/dataModule.kt

@@ -1,19 +1,16 @@
 package com.berlin.di
+
 import com.berlin.data.Audit.AuditRepositoryImpl
 import com.berlin.data.BaseDataSource
 import com.berlin.data.BaseSchema
 import com.berlin.data.authentication.AuthenticationRepositoryImpl
 import com.berlin.data.csv_data_source.CsvDataSource
-import com.berlin.data.memory.TaskRepositoryImpl
+import com.berlin.data.task.TaskRepositoryImpl
 import com.berlin.data.project.ProjectRepositoryImpl
 import com.berlin.data.schema.*
 import com.berlin.data.state.StateRepositoryImpl
 import com.berlin.domain.model.*
-import com.berlin.domain.repository.AuditRepository
-import com.berlin.domain.repository.AuthenticationRepository
-import com.berlin.domain.repository.ProjectRepository
-import com.berlin.domain.repository.StateRepository
-import com.berlin.domain.repository.TaskRepository
+import com.berlin.domain.repository.*
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
@@ -22,61 +19,49 @@ val dataModule = module {
 
     single<BaseSchema<User>>(named("UserSchema")) {
         UserSchema(
-            fileName = "user.csv",
-            header = listOf("User Id", "UserName", "Password", "User Role")
+            fileName = "user.csv", header = listOf("User Id", "UserName", "Password", "User Role")
         )
     }
     single<BaseSchema<Project>>(named("ProjectSchema")) {
         ProjectSchema(
-            fileName = "project.csv",
-            header = listOf("Project Id", "Project Name", "Description", "States", "Tasks")
+            fileName = "project.csv", header = listOf("Project Id", "Project Name", "Description", "States", "Tasks")
         )
     }
     single<BaseSchema<AuditLog>>(named("AuditSchema")) {
         AuditSchema(
-            fileName = "audit.csv",
-            header = listOf(
-                "Audit Id",
-                "Timestamp",
-                "CreatedBy",
-                "Audit Action",
-                "Changes Description",
-                "Entity Type",
-                "Entity Id"
+            fileName = "audit.csv", header = listOf(
+                "Audit Id", "Timestamp", "CreatedBy", "Audit Action", "Changes Description", "Entity Type", "Entity Id"
             )
         )
     }
     single<BaseSchema<State>>(named("StateSchema")) {
-        StateSchema(fileName = "state.csv",
-            header = listOf("State Id", "Name", "Project Id")) }
+        StateSchema(
+            fileName = "state.csv", header = listOf("State Id", "Name", "Project Id")
+        )
+    }
     single<BaseSchema<Task>>(named("TaskSchema")) {
         TaskSchema(
-            fileName = "task.csv",
-            header = listOf(
-                "Task Id",
-                "Project Id",
-                "Title",
-                "Description",
-                "State Id",
-                "Assigned To User Id",
-                "Create By User Id"
+            fileName = "task.csv", header = listOf(
+                "Task Id", "Project Id", "Title", "Description", "State Id", "Assigned To User Id", "Create By User Id"
             )
         )
     }
 
-    single<BaseDataSource<User>>(named("UserDataSource")){ CsvDataSource("csv_files", get(named("UserSchema"))) }
-    single<BaseDataSource<Project>>(named("ProjectDataSource")){ CsvDataSource("csv_files", get(named("ProjectSchema"))) }
-    single<BaseDataSource<Task>>(named("TaskDataSource")){ CsvDataSource("csv_files", get(named("TaskSchema"))) }
-    single<BaseDataSource<State>>(named("StateDataSource")){ CsvDataSource("csv_files", get(named("StateSchema"))) }
-    single<BaseDataSource<AuditLog>>(named("AuditDataSource")){ CsvDataSource("csv_files", get(named("AuditSchema"))) }
-
+    single<BaseDataSource<User>>(named("UserDataSource")) { CsvDataSource("csv_files", get(named("UserSchema"))) }
+    single<BaseDataSource<Project>>(named("ProjectDataSource")) {
+        CsvDataSource(
+            "csv_files", get(named("ProjectSchema"))
+        )
+    }
+    single<BaseDataSource<Task>>(named("TaskDataSource")) { CsvDataSource("csv_files", get(named("TaskSchema"))) }
+    single<BaseDataSource<State>>(named("StateDataSource")) { CsvDataSource("csv_files", get(named("StateSchema"))) }
+    single<BaseDataSource<AuditLog>>(named("AuditDataSource")) { CsvDataSource("csv_files", get(named("AuditSchema"))) }
 
 
-    single <ProjectRepository> { ProjectRepositoryImpl(get(named("ProjectDataSource"))) }
-    single <TaskRepository> { TaskRepositoryImpl(get(named("TaskDataSource"))) }
-    single <AuditRepository>{ AuditRepositoryImpl(get(named("AuditDataSource"))) }
-    single <StateRepository>{ StateRepositoryImpl(get(named("StateDataSource")),get(named("TaskDataSource"))) }
-    single <AuthenticationRepository> { AuthenticationRepositoryImpl(get(named("UserDataSource"))) }
 
-    single <AuthenticationRepository>{ AuthenticationRepositoryImpl(get(named("UserDataSource"))) }
+    single<ProjectRepository> { ProjectRepositoryImpl(get(named("ProjectDataSource"))) }
+    single<TaskRepository> { TaskRepositoryImpl(get(named("TaskDataSource"))) }
+    single<AuditRepository> { AuditRepositoryImpl(get(named("AuditDataSource"))) }
+    single<StateRepository> { StateRepositoryImpl(get(named("StateDataSource")), get(named("TaskDataSource"))) }
+    single<AuthenticationRepository> { AuthenticationRepositoryImpl(get(), get(named("UserDataSource"))) }
 }