Refactor/Data & Domain Layers, Package Structure, and DI Configuration

README.md

@@ -135,7 +135,7 @@ src/
 │   │   │   └── repository/ # Repository implementations  
 │   │   ├── di/             # Dependency injection  
 │   │   ├── entity/         # Domain entities  
-│   │   ├── logic/          # Business logic  
+│   │   ├── domain/          # Business domain  
 │   │   │   └── usecase/    # Use cases  
 │   │   ├── presentation/   # UI layer  
 │   │   └── utils/          # Utilities  

src/main/kotlin/data/Authentication.kt

@@ -0,0 +1,9 @@
+package org.example.data
+
+import org.example.data.remote.dto.UserDto
+
+interface Authentication {
+    suspend fun addCurrentUser(user: UserDto)
+    suspend fun deleteCurrentUser()
+    suspend fun getCurrentUser(): UserDto?
+}

src/main/kotlin/data/DataProvider.kt → src/main/kotlin/data/LocalDataSource.kt

@@ -1,8 +1,8 @@
 package org.example.data
 
-import java.util.*
+import java.util.UUID
 
-interface DataProvider<Entity> {
+interface LocalDataSource <Entity>{
     suspend fun add(item: Entity)
     suspend fun get(): List<Entity>
     suspend fun getById(id: UUID): Entity?

src/main/kotlin/data/RemoteDataSource.kt

@@ -0,0 +1,11 @@
+package org.example.data
+
+import java.util.UUID
+
+interface RemoteDataSource<Entity> {
+    suspend fun add(item: Entity)
+    suspend fun get(): List<Entity>
+    suspend fun getById(id: UUID): Entity?
+    suspend fun update(item: Entity)
+    suspend fun delete(id: UUID)
+}

src/main/kotlin/data/csvfile/AuditLogCsvImpl.kt → src/main/kotlin/data/local/csvfile/AuditLogCsvImpl.kt

@@ -1,48 +1,48 @@
-package data.csvfile
+package org.example.data.local.csvfile
 
 import kotlinx.datetime.LocalDateTime
-import org.example.data.DataProvider
-import org.example.entity.AuditAction
-import org.example.entity.AuditLogEntity
-import org.example.entity.AuditedEntityType
-import org.example.utils.PlanMateException
+import org.example.data.LocalDataSource
+import org.example.data.util.exception.FileException
+import domain.model.AuditAction
+import domain.model.AuditLog
+import domain.model.AuditedType
 import java.io.File
 import java.io.IOException
-import java.util.*
+import java.util.UUID
 
 class AuditLogCsvImpl(
     fileName: String
-) : DataProvider<AuditLogEntity> {
+) : LocalDataSource<AuditLog> {
 
     private val file: File = File(fileName)
 
-    override suspend fun add(item: AuditLogEntity) {
+    override suspend fun add(item: AuditLog) {
         try {
             val items = loadFromCsv().toMutableList()
             items.add(item)
             saveToCsv(items)
         } catch (e: Exception) {
-            throw PlanMateException.FileWriteException("Error adding audit log: ${e.message}")
+            throw FileException.FileWriteException("Error adding audit log: ${e.message}")
         }
     }
 
-    override suspend fun get(): List<AuditLogEntity> = loadFromCsv()
+    override suspend fun get(): List<AuditLog> = loadFromCsv()
 
-    override suspend fun getById(id: UUID): AuditLogEntity? = loadFromCsv().find { it.id == id }
+    override suspend fun getById(id: UUID): AuditLog? = loadFromCsv().find { it.id == id }
 
-    override suspend fun update(item: AuditLogEntity) {
+    override suspend fun update(item: AuditLog) {
         val items = loadFromCsv().toMutableList()
         val index = items.indexOfFirst { it.id == item.id }
 
         if (index == -1) {
-            throw PlanMateException.ItemNotFoundException("Audit log with ID ${item.id} not found.")
+            throw FileException.FileItemNotFoundException("Audit log with ID ${item.id} not found.")
         }
 
         items[index] = item
         try {
             saveToCsv(items)
         } catch (e: Exception) {
-            throw PlanMateException.FileWriteException("Error updating audit log: ${e.message}")
+            throw FileException.FileWriteException("Error updating audit log: ${e.message}")
         }
     }
 
@@ -51,18 +51,18 @@ class AuditLogCsvImpl(
         val logToDelete = items.find { it.id == id }
 
         if (logToDelete == null) {
-            throw PlanMateException.ItemNotFoundException("Audit log with ID $id not found.")
+            throw FileException.FileItemNotFoundException("Audit log with ID $id not found.")
         }
 
         items.remove(logToDelete)
         try {
             saveToCsv(items)
         } catch (e: Exception) {
-            throw PlanMateException.FileWriteException("Error deleting audit log: ${e.message}")
+            throw FileException.FileWriteException("Error deleting audit log: ${e.message}")
         }
     }
 
-    private fun loadFromCsv(): List<AuditLogEntity> {
+    private fun loadFromCsv(): List<AuditLog> {
         ensureFileExists()
         return readAndParseFile()
     }
@@ -73,43 +73,43 @@ class AuditLogCsvImpl(
         try {
             file.createNewFile()
         } catch (e: IOException) {
-            throw PlanMateException.FileWriteException("Error creating file '${file.name}': ${e.message}")
+            throw FileException.FileWriteException("Error creating file '${file.name}': ${e.message}")
         }
     }
 
-    private fun readAndParseFile(): List<AuditLogEntity> {
-           return file.readLines()
-                .filter { it.isNotBlank() }
-                .map { fromCSVLine(it) }
+    private fun readAndParseFile(): List<AuditLog> {
+        return file.readLines()
+            .filter { it.isNotBlank() }
+            .map { fromCSVLine(it) }
     }
 
-    private fun saveToCsv(data: List<AuditLogEntity>) {
+    private fun saveToCsv(data: List<AuditLog>) {
         try {
             val content = data.joinToString("\n") { toCSVLine(it) }
             file.writeText(content)
         } catch (e: IOException) {
-            throw PlanMateException.FileWriteException("Error writing to file '${file.name}': ${e.message}")
+            throw FileException.FileWriteException("Error writing to file '${file.name}': ${e.message}")
         }
     }
 
-    private fun fromCSVLine(line: String): AuditLogEntity {
+    private fun fromCSVLine(line: String): AuditLog {
         try {
             val parts = line.split(",")
-            return AuditLogEntity(
+            return AuditLog(
                 id = UUID.fromString(parts[0]),
                 userId = UUID.fromString(parts[1]),
-                entityType = AuditedEntityType.valueOf(parts[2]),
+                entityType = AuditedType.valueOf(parts[2]),
                 entityId = UUID.fromString(parts[3]),
                 action = AuditAction.valueOf(parts[4]),
                 changeDetails = parts[5],
                 timestamp = LocalDateTime.parse(parts[6])
             )
         } catch (e: Exception) {
-            throw PlanMateException.InvalidFormatException("Malformed CSV line: $line. ${e.message}")
+            throw FileException.FileInvalidFormatException("Malformed CSV line: $line. ${e.message}")
         }
     }
 
-    private fun toCSVLine(entity: AuditLogEntity): String {
+    private fun toCSVLine(entity: AuditLog): String {
         return "${entity.id},${entity.userId},${entity.entityType},${entity.entityId},${entity.action},${entity.changeDetails},${entity.timestamp}"
     }
 }

src/main/kotlin/data/csvfile/AuthProviderImpl.kt → src/main/kotlin/data/local/csvfile/AuthCsvImpl.kt

@@ -1,25 +1,27 @@
-package org.example.data.csvfile
+package org.example.data.local.csvfile
 
-import org.example.data.AuthProvider
-import org.example.entity.UserEntity
+import org.example.data.Authentication
+import org.example.data.remote.dto.UserDto
+import org.example.data.util.exception.FileException
+import org.example.data.util.mapper.toUserDto
+import org.example.entity.User
 import org.example.entity.UserType
-import org.example.utils.PlanMateException
 import java.io.File
 import java.io.IOException
-import java.util.*
+import java.util.UUID
 
-class AuthProviderImpl(
+class AuthCsvImpl(
     fileName: String
-) : AuthProvider {
+) : Authentication {
 
     private val file = File(fileName)
 
-    override suspend fun addCurrentUser(user: UserEntity) {
+    override suspend fun addCurrentUser(user: UserDto) {
         ensureFileExists()
         try {
             file.writeText(toCSVLine(user))
         } catch (e: IOException) {
-            throw PlanMateException.FileWriteException("Error writing current user to file: ${e.message}")
+            throw FileException.FileWriteException("Error writing current user to file: ${e.message}")
         }
     }
 
@@ -29,38 +31,38 @@ class AuthProviderImpl(
             file.writeText("")
             file.delete()
         } catch (e: IOException) {
-            throw PlanMateException.FileWriteException("Error deleting current user: ${e.message}")
+            throw FileException.FileWriteException("Error deleting current user: ${e.message}")
         }
     }
 
-    override suspend fun getCurrentUser(): UserEntity {
+    override suspend fun getCurrentUser(): UserDto {
         ensureFileExists()
         val content = file.readText().trim()
         if (content.isBlank()) {
-            throw PlanMateException.ItemNotFoundException("No current user found.")
+            throw FileException.FileItemNotFoundException("No current user found.")
         }
         return try {
-            fromCSVLine(content)
+            fromCSVLine(content).toUserDto()
         } catch (e: Exception) {
-            throw PlanMateException.InvalidFormatException("Malformed current user data: ${e.message}")
+            throw FileException.FileInvalidFormatException("Malformed current user data: ${e.message}")
         }
     }
 
-    private fun toCSVLine(user: UserEntity): String {
+    private fun toCSVLine(user: UserDto): String {
         return "${user.id},${user.username},${user.password},${user.type}"
     }
 
-    private fun fromCSVLine(line: String): UserEntity {
+    private fun fromCSVLine(line: String): User {
         val parts = line.split(",")
         return try {
-            UserEntity(
+            User(
                 id = UUID.fromString(parts[0]),
                 username = parts[1],
                 password = parts[2],
                 type = UserType.valueOf(parts[3])
             )
         } catch (e: Exception) {
-            throw PlanMateException.InvalidFormatException("Malformed CSV line: $line. ${e.message}")
+            throw FileException.FileInvalidFormatException("Malformed CSV line: $line. ${e.message}")
         }
     }
 
@@ -69,7 +71,7 @@ class AuthProviderImpl(
             try {
                 file.createNewFile()
             } catch (e: IOException) {
-                throw PlanMateException.FileWriteException("Could not create file: ${e.message}")
+                throw FileException.FileWriteException("Could not create file: ${e.message}")
             }
         }
     }