From 178cca1611c42163e0e001c9af5f5e0ba6529d4c Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Thu, 22 Feb 2024 17:31:10 -0500 Subject: [PATCH] [O] Reduce bits for DIVA --- src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt | 8 +++++--- .../aqua/sega/diva/model/userdata/DivaRepositoryTest.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt index 80f67c17..ff60f1f2 100644 --- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt +++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt @@ -30,9 +30,11 @@ class UserRegistrar( val emailProps: EmailProperties ) { companion object { - // Random long with length 17 (10^18 possibilities) - const val cardExtIdStart = 1e17.toLong() - const val cardExtIdEnd = 1e18.toLong() - 1 + // Random long with length 9 (10^10 possibilities) + // This is because DIVA is using int for card ID, which is at max 10 digits (2147483647) + // TODO: Figure out if DIVA can handle int64 + const val cardExtIdStart = 1e9.toLong() + const val cardExtIdEnd = 1e10.toLong() - 1 } /** diff --git a/src/test/java/icu/samnyan/aqua/sega/diva/model/userdata/DivaRepositoryTest.java b/src/test/java/icu/samnyan/aqua/sega/diva/model/userdata/DivaRepositoryTest.java index b672cfbc..e3a746ba 100644 --- a/src/test/java/icu/samnyan/aqua/sega/diva/model/userdata/DivaRepositoryTest.java +++ b/src/test/java/icu/samnyan/aqua/sega/diva/model/userdata/DivaRepositoryTest.java @@ -54,9 +54,9 @@ class DivaRepositoryTest { var c = cardRepository.save(getCard()); playerProfileRepository.save(getProfile(c)); - var p = playerProfileRepository.findByPdId(c.getExtId().intValue()); + var p = playerProfileRepository.findByPdId((int) c.getExtId()); - assertThat(p).isPresent().hasValueSatisfying(v -> assertThat(v.getPdId()).isEqualTo(c.getExtId().intValue())); + assertThat(p).isPresent().hasValueSatisfying(v -> assertThat(v.getPdId()).isEqualTo(c.getExtId())); } @Test @@ -200,7 +200,7 @@ class DivaRepositoryTest { private PlayerProfile getProfile(Card c) { var p = new PlayerProfile(); - p.setPdId(c.getExtId().intValue()); + p.setPdId((int) c.getExtId()); return p; }