From a716a69b8b325d175cadcb355fa6572f29b3b71e Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Mon, 19 Feb 2024 21:03:38 -0500
Subject: [PATCH] [F] Fix tests

---
 .../aqua/sega/general/service/CardService.kt  | 33 ++++++++++---------
 .../sega/general/dao/CardRepositoryTest.java  |  2 +-
 .../icu/samnyan/aqua/util/CardHelper.java     |  4 +--
 3 files changed, 20 insertions(+), 19 deletions(-)

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 d7045fa5..1e0120b5 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
@@ -13,42 +13,43 @@ import java.util.concurrent.ThreadLocalRandom
 @Service
 class CardService(val cardRepo: CardRepository) {
     /**
-     * Find a card by External Id
-     * @param extId External Id
+     * Find a card by External ID
+     * @param extId External ID
      * @return Optional of a Card
      */
     fun getCardByExtId(extId: String): Optional<Card> = cardRepo.findByExtId(extId.toLong())
 
     /**
-     * Find a card by External Id
+     * Find a card by External ID
      *
-     * @param extId External Id
+     * @param extId External ID
      * @return Optional of a Card
      */
     fun getCardByExtId(extId: Long?): Optional<Card> = cardRepo.findByExtId(extId)
 
     /**
-     * Find a card by it's access code
-     * @param accessCode String represent of a access code
+     * Find a card by its access code
+     * @param accessCode String represent of an access code
      * @return Optional of a Card
      */
     fun getCardByAccessCode(accessCode: String?): Optional<Card> = cardRepo.findByLuid(accessCode)
 
     /**
      * Register a new card with access code
-     * @param accessCode String represent of a access code
+     * @param accessCode String represent of an access code
      * @return a new registered Card
      */
     fun registerByAccessCode(accessCode: String?): Card {
-        val card = Card()
-        card.luid = accessCode
-        var extId = ThreadLocalRandom.current().nextLong(99999999)
-        while (cardRepo.findByExtId(extId).isPresent) {
-            extId = ThreadLocalRandom.current().nextLong(99999999)
+        var eid = ThreadLocalRandom.current().nextLong(99999999)
+        while (cardRepo.findByExtId(eid).isPresent) {
+            eid = ThreadLocalRandom.current().nextLong(99999999)
         }
-        card.extId = extId
-        card.registerTime = LocalDateTime.now()
-        card.accessTime = LocalDateTime.now()
-        return cardRepo.save(card)
+
+        return cardRepo.save(Card().apply {
+            luid = accessCode
+            extId = eid
+            registerTime = LocalDateTime.now()
+            accessTime = registerTime
+        })
     }
 }
diff --git a/src/test/java/icu/samnyan/aqua/sega/general/dao/CardRepositoryTest.java b/src/test/java/icu/samnyan/aqua/sega/general/dao/CardRepositoryTest.java
index de53b643..5cf5d389 100644
--- a/src/test/java/icu/samnyan/aqua/sega/general/dao/CardRepositoryTest.java
+++ b/src/test/java/icu/samnyan/aqua/sega/general/dao/CardRepositoryTest.java
@@ -21,7 +21,7 @@ class CardRepositoryTest {
 
     @Test
     void findByExtId_Exists() {
-        cardRepository.save(new Card(1, 114514L, "01145141919810000000", LocalDateTime.now(), LocalDateTime.now()));
+        cardRepository.save(new Card(1, 114514L, "01145141919810000000", LocalDateTime.now(), LocalDateTime.now(), null));
 
         var c = cardRepository.findByExtId(114514L);
 
diff --git a/src/test/java/icu/samnyan/aqua/util/CardHelper.java b/src/test/java/icu/samnyan/aqua/util/CardHelper.java
index bb227668..fa3ef007 100644
--- a/src/test/java/icu/samnyan/aqua/util/CardHelper.java
+++ b/src/test/java/icu/samnyan/aqua/util/CardHelper.java
@@ -13,7 +13,7 @@ public class CardHelper {
 
     public static Card getCard() {
         var now = LocalDateTime.now();
-        return new Card(1L, 114514L, "01145141919810000000", now, now);
+        return new Card(1L, 114514L, "01145141919810000000", now, now, null);
     }
 
     public static Card getRandomCard() {
@@ -27,6 +27,6 @@ public class CardHelper {
         for (int i = 0; i < "114514".length(); i++)
             extId = extId * 10 + rand.nextInt(10);
 
-        return new Card(0, extId, luid, now, now);
+        return new Card(0, extId, luid, now, now, null);
     }
 }