diff --git a/core/data/src/main/kotlin/com/giwon/aide/core/data/DefaultTaskRepository.kt b/core/data/src/main/kotlin/com/giwon/aide/core/data/DefaultTaskRepository.kt new file mode 100644 index 0000000..7eddc9a --- /dev/null +++ b/core/data/src/main/kotlin/com/giwon/aide/core/data/DefaultTaskRepository.kt @@ -0,0 +1,47 @@ +package com.giwon.aide.core.data + +import com.giwon.aide.core.database.TaskDao +import com.giwon.aide.core.database.TaskEntity +import com.giwon.aide.core.database.asExternalModel +import com.giwon.aide.core.model.Task +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import java.time.Clock +import java.time.LocalDate +import javax.inject.Inject + +internal class DefaultTaskRepository @Inject constructor( + private val taskDao: TaskDao, + private val clock: Clock, +) : TaskRepository { + + override fun observeOpenTasks(): Flow> = + taskDao.observeOpenTasks().map { tasks -> tasks.map { it.asExternalModel() } } + + override suspend fun add(title: String, due: LocalDate?): Long = + taskDao.insert( + TaskEntity( + title = title, + due = due, + done = false, + createdAt = clock.instant(), + doneAt = null + ) + ) + + override suspend fun update(id: Long, title: String, due: LocalDate?) { + taskDao.update(id, title, due) + } + + override suspend fun complete(id: Long) { + taskDao.complete(id, doneAt = clock.instant()) + } + + override suspend fun reopen(id: Long) { + taskDao.reopen(id) + } + + override suspend fun delete(id: Long) { + taskDao.delete(id) + } +} diff --git a/core/data/src/main/kotlin/com/giwon/aide/core/data/FakeTaskDao.kt b/core/data/src/main/kotlin/com/giwon/aide/core/data/FakeTaskDao.kt new file mode 100644 index 0000000..4dce135 --- /dev/null +++ b/core/data/src/main/kotlin/com/giwon/aide/core/data/FakeTaskDao.kt @@ -0,0 +1,65 @@ +package com.giwon.aide.core.data + +import com.giwon.aide.core.database.TaskDao +import com.giwon.aide.core.database.TaskEntity +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.update +import java.time.Instant +import java.time.LocalDate + +class FakeTaskDao : TaskDao { + private val tasks = MutableStateFlow>(emptyList()) + private var nextId = 1L + + override fun observeOpenTasks(): Flow> = + tasks.map { all -> + all.filterNot { + it.done + } + } + + + override suspend fun insert(task: TaskEntity): Long { + val id = nextId++ + tasks.update { + it + task.copy(id = id) + } + return id + } + + override suspend fun update(id: Long, title: String, due: LocalDate?) { + tasks.update { all -> + all.map { + if (it.id == id) it.copy(title = title, due = due) else it + } + } + } + + override suspend fun complete(id: Long, doneAt: Instant) { + tasks.update { all -> + all.map { + if (it.id == id) it.copy( + done = true, + doneAt = doneAt + ) else it + } + } + } + + override suspend fun reopen(id: Long) { + tasks.update { all -> + all.map { + if (it.id == id) it.copy( + done = false, + doneAt = null + ) else it + } + } + } + + override suspend fun delete(id: Long) { + tasks.update { all -> all.filterNot { it.id == id } } + } +} diff --git a/core/data/src/main/kotlin/com/giwon/aide/core/data/TaskRepository.kt b/core/data/src/main/kotlin/com/giwon/aide/core/data/TaskRepository.kt new file mode 100644 index 0000000..d390866 --- /dev/null +++ b/core/data/src/main/kotlin/com/giwon/aide/core/data/TaskRepository.kt @@ -0,0 +1,14 @@ +package com.giwon.aide.core.data + +import com.giwon.aide.core.model.Task +import kotlinx.coroutines.flow.Flow +import java.time.LocalDate + +interface TaskRepository { + fun observeOpenTasks(): Flow> + suspend fun add(title: String, due: LocalDate? = null): Long + suspend fun update(id: Long, title: String, due: LocalDate?) + suspend fun complete(id: Long) + suspend fun reopen(id: Long) + suspend fun delete(id: Long) +} diff --git a/core/data/src/main/kotlin/com/giwon/aide/core/data/di/DataModule.kt b/core/data/src/main/kotlin/com/giwon/aide/core/data/di/DataModule.kt index cc0a624..0f04a8d 100644 --- a/core/data/src/main/kotlin/com/giwon/aide/core/data/di/DataModule.kt +++ b/core/data/src/main/kotlin/com/giwon/aide/core/data/di/DataModule.kt @@ -6,13 +6,16 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.preferencesDataStoreFile import com.giwon.aide.core.data.DefaultEventRepository +import com.giwon.aide.core.data.DefaultTaskRepository import com.giwon.aide.core.data.EventRepository +import com.giwon.aide.core.data.TaskRepository import dagger.Binds import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent +import java.time.Clock import javax.inject.Singleton @Module @@ -21,10 +24,16 @@ internal abstract class DataModule { @Binds abstract fun bindsEventRepository(repository: DefaultEventRepository): EventRepository + @Binds + abstract fun bindsTaskRepository(repository: DefaultTaskRepository): TaskRepository + companion object { @Provides @Singleton fun providesPreferencesDataStore(@ApplicationContext context: Context): DataStore = PreferenceDataStoreFactory.create { context.preferencesDataStoreFile("settings") } + + @Provides + fun providesClock(): Clock = Clock.systemDefaultZone() } } diff --git a/core/data/src/test/kotlin/com/giwon/aide/core/data/DefaultTaskRepositoryTest.kt b/core/data/src/test/kotlin/com/giwon/aide/core/data/DefaultTaskRepositoryTest.kt new file mode 100644 index 0000000..0c8de04 --- /dev/null +++ b/core/data/src/test/kotlin/com/giwon/aide/core/data/DefaultTaskRepositoryTest.kt @@ -0,0 +1,81 @@ +package com.giwon.aide.core.data + +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.test.runTest +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test +import java.time.Clock +import java.time.Instant +import java.time.LocalDate +import java.time.ZoneOffset + +class DefaultTaskRepositoryTest { + + private val now = Instant.parse("2026-10-12T01:00:00Z") + private val repository = DefaultTaskRepository( + taskDao = FakeTaskDao(), + clock = Clock.fixed(now, ZoneOffset.UTC), + ) + + @Test + fun `할 일 추가시 현재 시각으로 추가된다`() = runTest { + val id = repository.add("할 일") + + val task = repository.observeOpenTasks().first().single() + assertThat(task.id).isEqualTo(id) + assertThat(task.title).isEqualTo("할 일") + assertThat(task.due).isNull() + assertThat(task.done).isFalse() + assertThat(task.createdAt).isEqualTo(now) + } + + @Test + fun `완료된 할일은 할일 리스트에서 제거된다`() = runTest { + val id = repository.add("완료된 할일") + + repository.complete(id) + + assertThat(repository.observeOpenTasks().first()).isEmpty() + } + + @Test + fun `완료를 취소하면 다시 할 일 리스트에 들어가고 완료 시각이 지워진다`() = runTest { + val id = repository.add("보고서") + repository.complete(id) + + repository.reopen(id) + + val task = repository.observeOpenTasks().first().single() + assertThat(task.done).isFalse() + assertThat(task.doneAt).isNull() + } + + @Test + fun `제목과 마감일을 고친다`() = runTest { + val id = repository.add("보고서") + + repository.update(id, "보고서 v2", LocalDate.of(2026, 10, 15)) + + val task = repository.observeOpenTasks().first().single() + assertThat(task.title).isEqualTo("보고서 v2") + assertThat(task.due).isEqualTo(LocalDate.of(2026, 10, 15)) + } + + @Test + fun `지운 할 일은 사라진다`() = runTest { + val id = repository.add("보고서") + + repository.delete(id) + + assertThat(repository.observeOpenTasks().first()).isEmpty() + } + + @Test + fun `없는 할 일을 완료시 무시`() = runTest { + repository.add("보고서") + + repository.complete(999) + + assertThat(repository.observeOpenTasks().first()).extracting { it.title }.containsExactly("보고서") + } +} diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 5b6bf28..9149d7f 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -1,11 +1,25 @@ plugins { alias(libs.plugins.aide.android.library) + alias(libs.plugins.aide.android.hilt) + alias(libs.plugins.aide.android.room) + alias(libs.plugins.aide.android.junit) } android { namespace = "com.giwon.aide.core.database" + testOptions.unitTests.isIncludeAndroidResources = true +} + +tasks.withType().configureEach { + jvmArgs("--add-opens=java.base/jdk.internal.access=ALL-UNNAMED") } dependencies { - implementation(project(":core:model")) + api(project(":core:model")) + api(libs.kotlinx.coroutines.core) + + testImplementation(libs.robolectric) + testImplementation(libs.androidx.test.core) + testImplementation(libs.junit4) + testRuntimeOnly(libs.junit.vintage.engine) } diff --git a/core/database/schemas/com.giwon.aide.core.database.AideDatabase/1.json b/core/database/schemas/com.giwon.aide.core.database.AideDatabase/1.json new file mode 100644 index 0000000..1d73f94 --- /dev/null +++ b/core/database/schemas/com.giwon.aide.core.database.AideDatabase/1.json @@ -0,0 +1,59 @@ +{ + "formatVersion": 1, + "database": { + "version": 1, + "identityHash": "94bfff0ae88588e0a4da59d585c0092f", + "entities": [ + { + "tableName": "tasks", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `due` TEXT, `done` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `done_at` INTEGER)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "due", + "columnName": "due", + "affinity": "TEXT" + }, + { + "fieldPath": "done", + "columnName": "done", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "createdAt", + "columnName": "created_at", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "doneAt", + "columnName": "done_at", + "affinity": "INTEGER" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '94bfff0ae88588e0a4da59d585c0092f')" + ] + } +} \ No newline at end of file diff --git a/core/database/src/main/kotlin/com/giwon/aide/core/database/AideDatabase.kt b/core/database/src/main/kotlin/com/giwon/aide/core/database/AideDatabase.kt new file mode 100644 index 0000000..0e075f9 --- /dev/null +++ b/core/database/src/main/kotlin/com/giwon/aide/core/database/AideDatabase.kt @@ -0,0 +1,11 @@ +package com.giwon.aide.core.database + +import androidx.room.Database +import androidx.room.RoomDatabase +import androidx.room.TypeConverters + +@Database(entities = [TaskEntity::class], version = 1) +@TypeConverters(Converters::class) +abstract class AideDatabase : RoomDatabase() { + abstract fun taskDao(): TaskDao +} diff --git a/core/database/src/main/kotlin/com/giwon/aide/core/database/Converters.kt b/core/database/src/main/kotlin/com/giwon/aide/core/database/Converters.kt new file mode 100644 index 0000000..a7db4ad --- /dev/null +++ b/core/database/src/main/kotlin/com/giwon/aide/core/database/Converters.kt @@ -0,0 +1,19 @@ +package com.giwon.aide.core.database + +import androidx.room.TypeConverter +import java.time.Instant +import java.time.LocalDate + +internal class Converters { + @TypeConverter + fun instantToLong(value: Instant?): Long? = value?.toEpochMilli() + + @TypeConverter + fun longToInstant(value: Long?): Instant? = value?.let(Instant::ofEpochMilli) + + @TypeConverter + fun localDateToString(value: LocalDate?): String? = value?.toString() + + @TypeConverter + fun stringToLocalDate(value: String?): LocalDate? = value?.let(LocalDate::parse) +} diff --git a/core/database/src/main/kotlin/com/giwon/aide/core/database/TaskDao.kt b/core/database/src/main/kotlin/com/giwon/aide/core/database/TaskDao.kt new file mode 100644 index 0000000..d4551de --- /dev/null +++ b/core/database/src/main/kotlin/com/giwon/aide/core/database/TaskDao.kt @@ -0,0 +1,29 @@ +package com.giwon.aide.core.database + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import kotlinx.coroutines.flow.Flow +import java.time.Instant +import java.time.LocalDate + +@Dao +interface TaskDao { + @Query("SELECT * FROM tasks WHERE done = 0") + fun observeOpenTasks(): Flow> + + @Insert + suspend fun insert(task: TaskEntity): Long + + @Query("UPDATE tasks SET title = :title, due = :due WHERE id = :id") + suspend fun update(id: Long, title: String, due: LocalDate?) + + @Query("Update tasks SET done = 1, done_at = :doneAt WHERE id = :id") + suspend fun complete(id: Long, doneAt: Instant) + + @Query("UPDATE tasks SET done = 0, done_at = NULL WHERE id = :id") + suspend fun reopen(id: Long) + + @Query("DELETE FROM tasks WHERE id = :id") + suspend fun delete(id: Long) +} diff --git a/core/database/src/main/kotlin/com/giwon/aide/core/database/TaskEntity.kt b/core/database/src/main/kotlin/com/giwon/aide/core/database/TaskEntity.kt new file mode 100644 index 0000000..15e4539 --- /dev/null +++ b/core/database/src/main/kotlin/com/giwon/aide/core/database/TaskEntity.kt @@ -0,0 +1,27 @@ +package com.giwon.aide.core.database + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey +import com.giwon.aide.core.model.Task +import java.time.Instant +import java.time.LocalDate + +@Entity(tableName = "tasks") +data class TaskEntity( + @PrimaryKey(autoGenerate = true) val id: Long = 0, + val title: String, + val due: LocalDate?, + val done: Boolean, + @ColumnInfo(name = "created_at") val createdAt: Instant, + @ColumnInfo(name = "done_at") val doneAt: Instant? +) + +fun TaskEntity.asExternalModel() = Task( + id = id, + title = title, + due = due, + done = done, + createdAt = createdAt, + doneAt = doneAt +) diff --git a/core/database/src/main/kotlin/com/giwon/aide/core/database/di/DatabaseModule.kt b/core/database/src/main/kotlin/com/giwon/aide/core/database/di/DatabaseModule.kt new file mode 100644 index 0000000..0448ca2 --- /dev/null +++ b/core/database/src/main/kotlin/com/giwon/aide/core/database/di/DatabaseModule.kt @@ -0,0 +1,28 @@ +package com.giwon.aide.core.database.di + +import android.content.Context +import androidx.room.Room +import com.giwon.aide.core.database.AideDatabase +import com.giwon.aide.core.database.TaskDao +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +internal object DatabaseModule { + @Provides + @Singleton + fun providesAideDatabase(@ApplicationContext context: Context): AideDatabase = + Room.databaseBuilder( + context, + AideDatabase::class.java, + "aide-database" + ).build() + + @Provides + fun providesTaskDao(database: AideDatabase): TaskDao = database.taskDao() +} diff --git a/core/database/src/test/kotlin/com/giwon/aide/core/database/TaskDaoTest.kt b/core/database/src/test/kotlin/com/giwon/aide/core/database/TaskDaoTest.kt new file mode 100644 index 0000000..27a7f1e --- /dev/null +++ b/core/database/src/test/kotlin/com/giwon/aide/core/database/TaskDaoTest.kt @@ -0,0 +1,80 @@ +package com.giwon.aide.core.database + +import androidx.room.Room +import androidx.test.core.app.ApplicationProvider +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.test.runTest +import org.assertj.core.api.Assertions.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import java.time.Instant +import java.time.LocalDate + + +@RunWith(RobolectricTestRunner::class) +class TaskDaoTest { + + private lateinit var database: AideDatabase + private lateinit var taskDao: TaskDao + + private val createdAt = Instant.parse("2026-10-12T01:00:00Z") + + @Before + fun setUp() { + database = Room.inMemoryDatabaseBuilder( + ApplicationProvider.getApplicationContext(), + AideDatabase::class.java, + ).allowMainThreadQueries().build() + + taskDao = database.taskDao() + } + + @After + fun tearDown() { + database.close() + } + + @Test + fun `삽입한 할일이 남은 할일에 노출된다`() = runTest { + val id = taskDao.insert( + task("보고서", due = LocalDate.of(2026, 10, 15)) + ) + + assertThat(taskDao.observeOpenTasks().first()).containsExactly( + task( + "보고서", + due = LocalDate.of(2026, 10, 15) + ).copy(id = id) + ) + + } + + @Test + fun `완료한 할일은 남은할일에서 빠진다`() = runTest { + val id = taskDao.insert(task("보고서")) + + taskDao.complete(id, doneAt = Instant.parse("2026-10-12T02:00:00Z")) + + assertThat(taskDao.observeOpenTasks().first()).isEmpty() + } + + @Test + fun `지운 할일 제거`() = runTest { + val id = taskDao.insert(task("보고서")) + + taskDao.delete(id) + + assertThat(taskDao.observeOpenTasks().first()).isEmpty() + } + + private fun task(title: String, due: LocalDate? = null) = TaskEntity( + title = title, + due = due, + done = false, + createdAt = createdAt, + doneAt = null + ) +} diff --git a/core/model/src/main/kotlin/com/giwon/aide/core/model/Task.kt b/core/model/src/main/kotlin/com/giwon/aide/core/model/Task.kt new file mode 100644 index 0000000..99ac477 --- /dev/null +++ b/core/model/src/main/kotlin/com/giwon/aide/core/model/Task.kt @@ -0,0 +1,13 @@ +package com.giwon.aide.core.model + +import java.time.Instant +import java.time.LocalDate + +data class Task( + val id: Long, + val title: String, + val due: LocalDate?, + val done: Boolean, + val createdAt: Instant, + val doneAt: Instant? +) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9671450..a64e683 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,9 @@ recyclerview = "1.4.0" constraintlayout = "2.2.2" material = "1.14.0" archCoreTesting = "2.2.0" +robolectric = "4.17" +androidxTestCore = "1.7.0" +junit4 = "4.13.2" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -73,6 +76,10 @@ androidx-constraintlayout = { group = "androidx.constraintlayout", name = "const androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" } androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "archCoreTesting" } google-material = { group = "com.google.android.material", name = "material", version.ref = "material" } +robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } +androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" } +junit4 = { group = "junit", name = "junit", version.ref = "junit4" } +junit-vintage-engine = { group = "org.junit.vintage", name = "junit-vintage-engine" } [plugins]