合并拉取请求 #1

增加月份统计、优化统计表现形式

Author: ForteScarlet

.idea/runConfigurations/MainKt.xml

@@ -12,7 +12,7 @@ val appName = "StopBonus"
 val appPackage = "love.forte.bonus"
 val appMenuGroup = "forteApp"
 val appNameWithPackage = "$appPackage.$appName"
-val appVersion = "1.0.6"
+val appVersion = "1.0.7"
 
 group = appPackage
 version = appVersion

build.gradle.kts

@@ -22,6 +22,10 @@ import kotlin.io.path.Path
 import kotlin.io.path.pathString
 
 fun storeAppPath(): Path {
+    if (System.getenv("DEBUG").toBoolean() || System.getProperty("debug").toBoolean()) {
+        return Path("./data")
+    }
+
     val localAppData = System.getenv("LOCALAPPDATA")
     if (localAppData != null) {
         return Path(localAppData, "StopBonus", "data")

src/main/kotlin/Main.kt

@@ -14,6 +14,7 @@ object Accounts : BaseIntIdTable() {
 
 class Account(id: EntityID<Int>) : BaseIntEntity(id, Accounts) {
     companion object : BaseEntityClass<Account>(Accounts)
+
     var name by Accounts.name
 
     val records by BonusRecord referrersOn BonusRecords.account
@@ -27,3 +28,16 @@ fun Table.referenceAccount(
     fkName: String? = null
 ): Column<EntityID<Int>> =
     reference(columnName, Accounts, onDelete, onUpdate, fkName)
+
+
+data class AccountView(
+    override val entityID: EntityID<Int>,
+    val name: String,
+) : BaseIntEntityView
+
+fun Account.toView(
+    name: String = this.name,
+): AccountView = AccountView(
+    id,
+    name = name,
+)

src/main/kotlin/database/entity/Account.kt

@@ -0,0 +1,22 @@
+package database.entity
+
+import org.jetbrains.exposed.dao.DaoEntityID
+import org.jetbrains.exposed.dao.id.EntityID
+
+
+/**
+ *
+ * @author ForteScarlet
+ */
+interface BaseEntityView<ID : Comparable<ID>> {
+    val entityID: EntityID<ID>
+    val id: ID
+        get() = entityID.value
+
+}
+
+/**
+ *
+ * @author ForteScarlet
+ */
+interface BaseIntEntityView : BaseEntityView<Int>

src/main/kotlin/database/entity/BaseEntityView.kt

@@ -5,6 +5,8 @@ import org.jetbrains.exposed.sql.ReferenceOption
 import org.jetbrains.exposed.sql.Table
 import org.jetbrains.exposed.sql.javatime.duration
 import org.jetbrains.exposed.sql.javatime.timestamp
+import java.time.Duration
+import java.time.Instant
 
 /**
  * 奖励记录
@@ -64,3 +66,26 @@ object BonusRecordWeapons : Table() {
     override val primaryKey: PrimaryKey = PrimaryKey(record, weapon)
 }
 
+data class BonusRecordView(
+    override val entityID: EntityID<Int>,
+    val startTime: Instant,
+    val endTime: Instant,
+    val duration: Duration,
+    val score: UInt,
+    val weapons: List<WeaponView>
+) : BaseIntEntityView
+
+fun BonusRecord.toView(
+    startTime: Instant = this.startTime,
+    endTime: Instant = this.endTime,
+    duration: Duration = this.duration,
+    score: UInt = this.score,
+    weapons: List<WeaponView> = this.weapons.map { it.toView() }
+): BonusRecordView = BonusRecordView(
+    entityID = id,
+    startTime = startTime,
+    endTime = endTime,
+    duration = duration,
+    score = score,
+    weapons = weapons,
+)

src/main/kotlin/database/entity/BonusRecord.kt

@@ -1,12 +1,9 @@
 package database.entity
 
 import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.sql.ReferenceOption
-import org.jetbrains.exposed.sql.Table
 
-//region 配菜
 /**
- * 配菜信息。
+ * 武器信息。
  */
 object Weapons : BaseIntIdTable() {
     val account = referenceAccount()
@@ -22,5 +19,16 @@ class Weapon(id: EntityID<Int>) : BaseIntEntity(id, Weapons) {
     var account by Account referencedOn Weapons.account
     var name by Weapons.name
 }
-//endregion
 
+
+data class WeaponView(
+    override val entityID: EntityID<Int>,
+    val name: String
+) : BaseIntEntityView
+
+fun Weapon.toView(
+    name: String = this.name,
+): WeaponView = WeaponView(
+    entityID = id,
+    name = name
+)

src/main/kotlin/database/entity/Weapon.kt

@@ -9,7 +9,6 @@ import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsHoveredAsState
 import androidx.compose.foundation.layout.Column
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
@@ -28,7 +27,7 @@ import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.window.FrameWindowScope
 import androidx.compose.ui.window.WindowState
 import database.DatabaseOperator
-import database.entity.Account
+import database.entity.AccountView
 import kotlinx.coroutines.CoroutineScope
 import view.account.AccountHome
 import view.account.AccountState
@@ -47,7 +46,7 @@ class AppState(
 @Composable
 @Preview
 fun FrameWindowScope.App(appState: AppState) {
-    val targetAccount = remember { mutableStateOf<Account?>(null) }
+    val targetAccount = remember { mutableStateOf<AccountView?>(null) }
 
     AnimatedContent(targetAccount.value) { account ->
         when (account) {

src/main/kotlin/view/App.kt

@@ -1,15 +1,15 @@
 package view.account
 
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.NavigationDrawerItem
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 
 @Composable

src/main/kotlin/view/account/AccountAction.kt

@@ -8,7 +8,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import database.DatabaseOperator
-import database.entity.Account
+import database.entity.AccountView
 import org.jetbrains.exposed.sql.Transaction
 import view.AppState
 import view.account.home.AccountHomeView
@@ -21,15 +21,15 @@ import kotlin.coroutines.CoroutineContext
 class AccountState(
     val appState: AppState,
     val database: DatabaseOperator,
-    val account: Account,
-    val accountState: MutableState<Account?>,
+    val account: AccountView,
+    val accountState: MutableState<AccountView?>,
 ) {
     var accountOrNull by accountState
 
     suspend inline fun <T> inAccountTransaction(
         context: CoroutineContext? = null,
         transactionIsolation: Int? = null,
-        crossinline block: suspend Transaction.(Account) -> T
+        crossinline block: suspend Transaction.(AccountView) -> T
     ): T {
         return account.let { a ->
             database.inSuspendedTransaction(context, transactionIsolation) {

src/main/kotlin/view/account/AccountDetailView.kt

@@ -22,10 +22,7 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.PopupProperties
-import database.entity.Account
-import database.entity.BonusRecord
-import database.entity.Weapon
-import database.entity.Weapons
+import database.entity.*
 import kotlinx.coroutines.launch
 import org.jetbrains.exposed.sql.SizedCollection
 import view.account.AccountViewPage
@@ -111,7 +108,7 @@ private fun AccountHome(state: PageViewState) {
         initialMinute = nowTime.minute
     )
 
-    var weapon by remember { mutableStateOf<Weapon?>(null) }
+    var weapon by remember { mutableStateOf<WeaponView?>(null) }
     val score = remember { SliderState(value = 10f, steps = 8, valueRange = 1f..10f) }
 
     suspend fun clearStates() {
@@ -287,15 +284,16 @@ private fun AccountHome(state: PageViewState) {
 
 
                                     BonusRecord.new {
-                                        this.account = account
+                                        this.account = Account.findById(account.id)!! // TODO null ?
                                         this.duration = duration
                                         this.startTime =
                                             ZonedDateTime.of(selectedStartDateTime, ZoneId.systemDefault()).toInstant()
                                         this.endTime =
                                             ZonedDateTime.of(selectedEndDateTime, ZoneId.systemDefault()).toInstant()
                                         this.score = score.value.toUInt()
                                         weapon?.also { w ->
-                                            this.weapons = SizedCollection(listOf(w))
+                                            this.weapons = SizedCollection(listOf(Weapon.findById(w.id)!!))
+                                            // TODO null?
                                         }
                                     }
                                 }
@@ -358,14 +356,14 @@ private fun AccountHome(state: PageViewState) {
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private inline fun WeaponSelector(
-    state: PageViewState, selectedWeapon: Weapon?,
-    crossinline onSelect: (Weapon?) -> Unit
+    state: PageViewState, selectedWeapon: WeaponView?,
+    crossinline onSelect: (WeaponView?) -> Unit
 ) {
-    val weapons = remember { mutableStateListOf<Weapon>() }
+    val weapons = remember { mutableStateListOf<WeaponView>() }
     LaunchedEffect(state) {
-        state.accountState.inAccountTransaction { account: Account ->
+        state.accountState.inAccountTransaction { account ->
             val all = Weapon.find { Weapons.account eq account.id }
-                .notForUpdate()
+                .notForUpdate().map { it.toView() }
 
             weapons.addAll(all)
         }

src/main/kotlin/view/account/AccountHome.kt

@@ -23,20 +23,18 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import database.entity.BonusRecord
-import database.entity.BonusRecordWeapons.weapon
+import database.entity.BonusRecordView
 import database.entity.BonusRecords
-import database.entity.Weapon
+import database.entity.toView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.jetbrains.exposed.dao.with
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.mapLazy
 import view.account.AccountViewPage
 import view.account.PageViewState
 import java.time.Duration
-import java.time.Instant
 import java.time.ZoneId
 
 
@@ -75,37 +73,28 @@ var account by Account referencedOn BonusRecords.account
     var weapons by Weapon via BonusRecordWeapons
  */
 
-private data class RecordData(
-    val id: Int,
-    val startTime: Instant,
-    val endTime: Instant,
-    val duration: Duration,
-    val score: UInt,
-    val weapons: List<Weapon>
-)
+// private data class RecordData(
+//     val id: Int,
+//     val startTime: Instant,
+//     val endTime: Instant,
+//     val duration: Duration,
+//     val score: UInt,
+//     val weapons: List<WeaponView>
+// )
 
 @Composable
 private fun ShowBonusRecordList(state: PageViewState) {
     val scope = rememberCoroutineScope()
-    val recordList = remember { mutableStateListOf<RecordData>() }
+    val recordList = remember { mutableStateListOf<BonusRecordView>() }
     val listState = rememberLazyListState()
 
     LaunchedEffect(Unit) {
         state.accountState.inAccountTransaction { account ->
-            val all = account.records
+            val all = BonusRecord.find { BonusRecords.account eq account.id }
                 .orderBy(BonusRecords.createTime to SortOrder.DESC)
                 .with(BonusRecord::weapons)
                 .notForUpdate()
-                .mapLazy {
-                    RecordData(
-                        id = it.id.value,
-                        startTime = it.startTime,
-                        endTime = it.endTime,
-                        duration = it.duration,
-                        score = it.score,
-                        weapons = it.weapons.toList(),
-                    )
-                }
+                .map { it.toView() }
 
             recordList.addAll(all)
         }
@@ -125,8 +114,8 @@ private fun ShowBonusRecordList(state: PageViewState) {
 private fun ListItemRecord(
     state: PageViewState,
     scope: CoroutineScope,
-    record: RecordData,
-    onDelete: (RecordData) -> Unit,
+    record: BonusRecordView,
+    onDelete: (BonusRecordView) -> Unit,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isHovered by interactionSource.collectIsHoveredAsState()