Merge pull request #2 from taetae98coding/develop

1.2.0

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 jobs:
   Linux-Build:
@@ -9,7 +9,6 @@ jobs:
       matrix:
         command: [
           './gradlew :app:platform:jvm:assemble',
-          './gradlew :app:platform:wasm:assemble',
           './gradlew :app:platform:android:assembleRealRelease',
         ]
     steps:

.github/workflows/check_code_style.yml

@@ -1,6 +1,6 @@
 name: Check Code Style
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 jobs:
   Spotless:

.github/workflows/dependency_guard.yml

@@ -1,6 +1,6 @@
 name: Dependency Guard
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 jobs:
   Dependency-Guard:

CHANGELOG.md

@@ -2,7 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.1.0] - 2024-11-17
+## [1.2.0] - 2024-11-23
+
+### 🚀 Features
+
+- App - Tag
+- Server - Tag
+
+### 🐛 Bug Fixes
+
+- App - Change the date update time in CalendarScreen(Background/Foreground -> Focus Change)
+
+## [1.1.0] - 2024-11-18
 
 ### 🚀 Features
 

app/core/diary-database-memory/README.md → app/core/backup-database-room/README.md

@@ -1,3 +1,3 @@
-# :app:core:diary-database-memory module
+# :app:core:backup-database-room module
 ## Dependency graph
-![Dependency graph](../../../docs/images/graphs/dep_graph_app_core_diary_database_memory.svg)
+![Dependency graph](../../../docs/images/graphs/dep_graph_app_core_backup_database_room.svg)

app/core/backup-database-room/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("diary.room")
+    id("diary.koin.room")
+}
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":app:core:backup-database"))
+                implementation(project(":library:coroutines"))
+                implementation(project(":library:room"))
+            }
+        }
+    }
+}
+
+android {
+    namespace = "${Build.NAMESPACE}.core.backup.database.room"
+}

app/core/backup-database-room/schemas/io.github.taetae98coding.diary.core.backup.database.room.BackupDatabase/1.json

@@ -0,0 +1,61 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "5f647fc9749a8d467a0a3c1fe9ef80ff",
+    "entities": [
+      {
+        "tableName": "MemoBackupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`memoId` TEXT NOT NULL, `uid` TEXT NOT NULL, PRIMARY KEY(`memoId`))",
+        "fields": [
+          {
+            "fieldPath": "memoId",
+            "columnName": "memoId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "memoId"
+          ]
+        }
+      },
+      {
+        "tableName": "TagBackupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tagId` TEXT NOT NULL, `uid` TEXT NOT NULL, PRIMARY KEY(`tagId`))",
+        "fields": [
+          {
+            "fieldPath": "tagId",
+            "columnName": "tagId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "tagId"
+          ]
+        }
+      }
+    ],
+    "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, '5f647fc9749a8d467a0a3c1fe9ef80ff')"
+    ]
+  }
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/BackupDatabase.kt

@@ -0,0 +1,29 @@
+package io.github.taetae98coding.diary.core.backup.database.room
+
+import androidx.room.ConstructedBy
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import io.github.taetae98coding.diary.core.backup.database.room.dao.MemoBackupEntityDao
+import io.github.taetae98coding.diary.core.backup.database.room.dao.TagBackupEntityDao
+import io.github.taetae98coding.diary.core.backup.database.room.entity.MemoBackupEntity
+import io.github.taetae98coding.diary.core.backup.database.room.entity.TagBackupEntity
+import io.github.taetae98coding.diary.core.backup.database.room.internal.BackupDatabaseConstructor
+import io.github.taetae98coding.diary.library.room.InstantConverter
+
+
+@Database(
+    entities = [
+        MemoBackupEntity::class,
+        TagBackupEntity::class,
+    ],
+    version = 1,
+)
+@ConstructedBy(BackupDatabaseConstructor::class)
+@TypeConverters(
+    InstantConverter::class,
+)
+internal abstract class BackupDatabase : RoomDatabase() {
+    abstract fun memo(): MemoBackupEntityDao
+    abstract fun tag(): TagBackupEntityDao
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/BackupRoomDatabaseModule.kt

@@ -0,0 +1,17 @@
+package io.github.taetae98coding.diary.core.backup.database.room
+
+import io.github.taetae98coding.diary.library.koin.room.getDatabaseBuilder
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
+import org.koin.core.component.KoinComponent
+
+@Module
+@ComponentScan
+public class BackupRoomDatabaseModule : KoinComponent {
+    @Singleton
+    internal fun providesDiaryDatabase(): BackupDatabase {
+        return getDatabaseBuilder<BackupDatabase>("backup.db")
+            .build()
+    }
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/dao/MemoBackupEntityDao.kt

@@ -0,0 +1,16 @@
+package io.github.taetae98coding.diary.core.backup.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.taetae98coding.diary.core.backup.database.room.entity.MemoBackupEntity
+import io.github.taetae98coding.diary.library.room.dao.EntityDao
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+internal abstract class MemoBackupEntityDao : EntityDao<MemoBackupEntity>() {
+    @Query("DELETE FROM MemoBackupEntity WHERE memoId IN (:memoIds)")
+    abstract suspend fun delete(memoIds: Set<String>)
+
+    @Query("SELECT memoId FROM MemoBackupEntity WHERE uid = :uid")
+    abstract fun findMemoIdByUid(uid: String): Flow<List<String>>
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/dao/MemoBackupRoomDao.kt

@@ -0,0 +1,24 @@
+package io.github.taetae98coding.diary.core.backup.database.room.dao
+
+import io.github.taetae98coding.diary.core.backup.database.MemoBackupDao
+import io.github.taetae98coding.diary.core.backup.database.room.BackupDatabase
+import io.github.taetae98coding.diary.core.backup.database.room.entity.MemoBackupEntity
+import kotlinx.coroutines.flow.Flow
+import org.koin.core.annotation.Factory
+
+@Factory
+internal class MemoBackupRoomDao(
+    private val database: BackupDatabase,
+) : MemoBackupDao {
+    override suspend fun upsert(uid: String, id: String) {
+        database.memo().upsert(MemoBackupEntity(memoId = id, uid = uid))
+    }
+
+    override suspend fun delete(ids: Set<String>) {
+        database.memo().delete(ids)
+    }
+
+    override fun findMemoIdByUid(uid: String): Flow<List<String>> {
+        return database.memo().findMemoIdByUid(uid)
+    }
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/dao/TagBackupEntityDao.kt

@@ -0,0 +1,19 @@
+package io.github.taetae98coding.diary.core.backup.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.taetae98coding.diary.core.backup.database.room.entity.TagBackupEntity
+import io.github.taetae98coding.diary.library.room.dao.EntityDao
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+internal abstract class TagBackupEntityDao : EntityDao<TagBackupEntity>() {
+    @Query("DELETE FROM TagBackupEntity WHERE tagId IN (:tagIds)")
+    abstract suspend fun delete(tagIds: Set<String>)
+
+    @Query("SELECT COUNT(DISTINCT uid) FROM TagBackupEntity WHERE uid = :uid")
+    abstract fun countByUid(uid: String): Flow<Int>
+
+    @Query("SELECT DISTINCT tagId FROM TagBackupEntity WHERE uid = :uid LIMIT 50")
+    abstract fun findByUid(uid: String): Flow<List<String>>
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/dao/TagBackupRoomDao.kt

@@ -0,0 +1,24 @@
+package io.github.taetae98coding.diary.core.backup.database.room.dao
+
+import io.github.taetae98coding.diary.core.backup.database.TagBackupDao
+import io.github.taetae98coding.diary.core.backup.database.room.BackupDatabase
+import io.github.taetae98coding.diary.core.backup.database.room.entity.TagBackupEntity
+import kotlinx.coroutines.flow.Flow
+import org.koin.core.annotation.Factory
+
+@Factory
+internal class TagBackupRoomDao(
+    private val database: BackupDatabase,
+) : TagBackupDao {
+    override suspend fun upsert(uid: String, id: String) {
+        database.tag().upsert(TagBackupEntity(tagId = id, uid = uid))
+    }
+
+    override suspend fun delete(ids: Set<String>) {
+        database.tag().delete(ids)
+    }
+
+    override fun findByUid(uid: String): Flow<List<String>> {
+        return database.tag().findByUid(uid)
+    }
+}

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/entity/MemoBackupEntity.kt

@@ -0,0 +1,11 @@
+package io.github.taetae98coding.diary.core.backup.database.room.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+internal data class MemoBackupEntity(
+    @PrimaryKey
+    val memoId: String,
+    val uid: String,
+)

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/entity/TagBackupEntity.kt

@@ -0,0 +1,11 @@
+package io.github.taetae98coding.diary.core.backup.database.room.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+internal data class TagBackupEntity(
+    @PrimaryKey
+    val tagId: String,
+    val uid: String,
+)

app/core/backup-database-room/src/commonMain/kotlin/io/github/taetae98coding/diary/core/backup/database/room/internal/BackupDatabaseConstructor.kt

@@ -0,0 +1,6 @@
+package io.github.taetae98coding.diary.core.backup.database.room.internal
+
+import androidx.room.RoomDatabaseConstructor
+import io.github.taetae98coding.diary.core.backup.database.room.BackupDatabase
+
+internal expect object BackupDatabaseConstructor : RoomDatabaseConstructor<BackupDatabase>

app/core/holiday-database-memory/README.md → app/core/backup-database/README.md

@@ -1,3 +1,3 @@
-# :app:core:holiday-database-memory module
+# :app:core:backup-database module
 ## Dependency graph
-![Dependency graph](../../../docs/images/graphs/dep_graph_app_core_holiday_database_memory.svg)
+![Dependency graph](../../../docs/images/graphs/dep_graph_app_core_backup_database.svg)