From 20143cf096c3caff9dcf6e76dff7581fe350a3d0 Mon Sep 17 00:00:00 2001
From: atsunatsu <atsunatsu@users.noreply.github.com>
Date: Tue, 8 Sep 2026 11:22:24 +0800
Subject: [PATCH] fix(lotw): strip STATE ' // Name' suffix for award stats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

LoTW returns STATE as 'CODE // Name' (verified with a real report 2026-09),
e.g. 'GD // Guangdong' (China), '34 // Tottori-ken' (Japan), 'CA // California'
(US). The award calculator matched on the bare CODE, so every mainland China
province (WAPC), all Japan prefectures (WAJA) and US states (WAS) failed —
WAPC only showed HK/MO/TW (entity branch, no STATE needed) and WAJA was empty.

Normalize STATE once at parse time: strip the ' // Name' suffix so the stored
GridQso.state is the clean code consumed by persistence and AwardCalculator.
Add a test covering China/Japan/US formats.
---
 .../core/data/repository/LoTWRepository.kt    | 12 ++++++++++-
 .../data/repository/LoTWRepositoryTest.kt     | 21 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt
index afc54f19..e0055629 100644
--- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt
+++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt
@@ -212,7 +212,7 @@ class LoTWRepository : ILoTWRepository {
                 line.startsWith("<CQZ:") ->
                     cqz = adifValue(line).toIntOrNull()
                 line.startsWith("<STATE:") ->
-                    state = adifValue(line).trim().ifBlank { null }
+                    state = adifValue(line).trim().ifBlank { null }?.let { normalizeState(it) }
                 line.startsWith("<GRIDSQUARE:") || line.startsWith("<VUCC_GRIDS:") -> {
                     // VUCC_GRIDS holds a comma-separated list of grids
                     // ("EN52en,EN53fa"), up to four for contacts spanning
@@ -231,6 +231,16 @@ class LoTWRepository : ILoTWRepository {
     private fun adifValue(line: String): String =
         line.substringAfter('>').substringBefore("E<").trim()
 
+    /**
+     * LoTW returns STATE as "CODE // NAME" (e.g. "HB // Hubei" for China,
+     * "34 // Tottori-ken" for Japan, "CA // California" for the US). The award
+     * statistics match on the short CODE only (China 2-letter province pinyin,
+     * Japan 2-digit prefecture, US 2-letter state), so strip the " // NAME"
+     * suffix here once, storing the clean code for every downstream consumer
+     * (persistence, AwardCalculator).
+     */
+    private fun normalizeState(raw: String): String = raw.substringBefore(" // ").trim()
+
     /** "20260820" + "1130" (or "113000") -> UTC epoch ms; 0 when unparseable. */
     private fun adifTimestampToEpoch(date: String, time: String): Long = try {
         val d = date.trim()
diff --git a/core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/LoTWRepositoryTest.kt b/core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/LoTWRepositoryTest.kt
index 49f59ad7..1abc3a57 100644
--- a/core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/LoTWRepositoryTest.kt
+++ b/core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/LoTWRepositoryTest.kt
@@ -156,11 +156,13 @@ class LoTWRepositoryTest {
     @Test
     fun parseQsosExtractsAwardFields() {
         // Award statistics rely on the DXCC/CQZ/STATE fields coming straight
-        // from LoTW's qso_qsldetail report (STATE depends on DXCC).
+        // from LoTW's qso_qsldetail report (STATE depends on DXCC). LoTW
+        // writes STATE as "CODE // NAME" (verified with a real report 2026-09);
+        // the parser must strip the name suffix and keep the bare code.
         val qso = "<CALL:5>BG7XYZ\n" +
             "<QSO_DATE:8>20260820\n<TIME_ON:4>1130\n" +
             "<PROP_MODE:3>SAT\n<SAT_NAME:5>FO-29\n<MODE:2>CW\n" +
-            "<DXCC:3>318\n<COUNTRY:5>CHINA\n<CQZ:2>24\n<STATE:2>GD\n" +
+            "<DXCC:3>318\n<COUNTRY:5>CHINA\n<CQZ:2>24\n<STATE:13>GD // Guangdong\n" +
             "<GRIDSQUARE:4>OL62\n<EOR>\n"
         val result = repo.parseConfirmedGridQsos(report(qso))!!
         val parsed = result["OL62"]!!.first()
@@ -170,6 +172,21 @@ class LoTWRepositoryTest {
         assertEquals("GD", parsed.state)
     }
 
+    @Test
+    fun parseQsosStripsStateNameSuffixForAllEntities() {
+        // Japan prefecture: "34 // Tottori-ken" -> "34" (WAJA matching needs
+        // the 2-digit code). US states also arrive as "CODE // Name".
+        val jp = "<CALL:5>JH0ABC\n<QSO_DATE:8>20260820\n<TIME_ON:4>1130\n" +
+            "<PROP_MODE:3>SAT\n<SAT_NAME:5>RS-44\n<DXCC:3>339\n<COUNTRY:7>JAPAN\n" +
+            "<STATE:18>34 // Tottori-ken\n<GRIDSQUARE:4>PM95\n<EOR>\n"
+        val us = "<CALL:5>K1ABC\n<QSO_DATE:8>20260820\n<TIME_ON:4>1130\n" +
+            "<PROP_MODE:3>SAT\n<SAT_NAME:5>AO-07\n<DXCC:3>291\n<COUNTRY:12>UNITED STATES\n" +
+            "<STATE:22>CA // California\n<GRIDSQUARE:4>EM40\n<EOR>\n"
+        val result = repo.parseConfirmedGridQsos(report(jp, us))!!
+        assertEquals("34", result["PM95"]!!.first().state)
+        assertEquals("CA", result["EM40"]!!.first().state)
+    }
+
     @Test
     fun parseQsosLeavesAwardFieldsNullWhenAbsent() {
         val qso = "<CALL:5>JH0ABC\n<QSO_DATE:8>20260820\n<TIME_ON:4>1130\n" +