From 3da92de951681c0b9baec4f032016c5ae67b43b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=8C=E8=8E=9E=7E=28=3D=5E=E2=96=BD=5E=3D=29?= Date: Sun, 2 Mar 2025 05:31:39 +0800 Subject: [PATCH] [F] Card access time is not correctly set (#120) --- src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt | 6 ++++-- .../icu/samnyan/aqua/sega/general/service/CardService.kt | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt index f9a2c5c1..1dded556 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt @@ -115,9 +115,11 @@ class AimeDB( } } - fun getCard(accessCode: String) = cardService.getCardByAccessCode(accessCode).getOrNull()?.let { + fun getCard(accessCode: String) = cardService.getCardByAccessCode(accessCode).getOrNull()?.let { card -> // Update card access time - cardService.cardRepo.save(it.apply { accessTime = LocalDateTime.now() }).extId + cardService.cardRepo.save(card.apply { accessTime = LocalDateTime.now() }).let { + it.aquaUser?.ghostCard ?: it + }?.extId } ?: -1 /** diff --git a/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt b/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt index fc5e2cf4..ad44336f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt +++ b/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt @@ -34,15 +34,11 @@ class CardService(val cardRepo: CardRepository) /** * Find a card by its access code * - * If the card is linked to a user, return the user's ghost card instead - * * @param accessCode String represent of an access code * @return Optional of a Card */ fun getCardByAccessCode(accessCode: String?): Optional = Optional.ofNullable( - cardRepo.findByLuid(accessCode).getOrNull()?.let { - it.aquaUser?.ghostCard ?: it - } + cardRepo.findByLuid(accessCode).getOrNull() ) /**