feat: New badges in cluster view for new Counties and new POTA

internal/qso/qso.go

@@ -1605,7 +1605,7 @@ func (r *Repo) IterateAll(ctx context.Context, fn func(QSO) error) error {
 // column to this list AND populate it in scanAwardQSO below, or that award will
 // silently see an empty value during stats/computation.
 const awardCols = `id, callsign, qso_date, band, freq_hz, mode, ` +
-	`grid, vucc_grids, country, state, cont, cqz, ituz, dxcc, iota, sota_ref, pota_ref, ` +
+	`grid, vucc_grids, country, state, cnty, cont, cqz, ituz, dxcc, iota, sota_ref, pota_ref, ` +
 	`name, qth, address, comment, notes, ` +
 	`qsl_rcvd, lotw_rcvd, eqsl_rcvd, extras_json`
 
@@ -1640,6 +1640,7 @@ func scanAwardQSO(s scanner) (QSO, error) {
 		qsoDateStr                  string
 		freqHz                      sql.NullInt64
 		grid, vucc, country, state  sql.NullString
+		cnty                        sql.NullString
 		cont, iotaRef, sota, pota   sql.NullString
 		dxcc, cqz, ituz             sql.NullInt64
 		name, qth, address          sql.NullString
@@ -1649,7 +1650,7 @@ func scanAwardQSO(s scanner) (QSO, error) {
 	)
 	if err := s.Scan(
 		&q.ID, &q.Callsign, &qsoDateStr, &q.Band, &freqHz, &q.Mode,
-		&grid, &vucc, &country, &state, &cont, &cqz, &ituz, &dxcc, &iotaRef, &sota, &pota,
+		&grid, &vucc, &country, &state, &cnty, &cont, &cqz, &ituz, &dxcc, &iotaRef, &sota, &pota,
 		&name, &qth, &address, &comment, &notes,
 		&qslRcvd, &lotwRcvd, &eqslRcvd, &extrasJSON,
 	); err != nil {
@@ -1664,6 +1665,7 @@ func scanAwardQSO(s scanner) (QSO, error) {
 	q.VUCCGrids = vucc.String
 	q.Country = country.String
 	q.State = state.String
+	q.County = cnty.String
 	q.Continent = cont.String
 	if cqz.Valid {
 		v := int(cqz.Int64)
@@ -1782,6 +1784,56 @@ func (r *Repo) WorkedCallsigns(ctx context.Context) (map[string]struct{}, error)
 	return out, rows.Err()
 }
 
+// WorkedCountyKeys returns the set of counties already worked, keyed by the
+// caller-supplied normaliser (award.USCountyKey — passed in to avoid importing
+// the award package here). Only US-entity QSOs (DXCC 291/110/6) with a county
+// are considered. Empty keys (unresolvable state/county) are skipped.
+func (r *Repo) WorkedCountyKeys(ctx context.Context, keyFn func(state, cnty string) string) (map[string]struct{}, error) {
+	rows, err := r.db.QueryContext(ctx,
+		`SELECT DISTINCT COALESCE(state,''), COALESCE(cnty,'') FROM qso
+		 WHERE dxcc IN (291,110,6) AND cnty IS NOT NULL AND cnty != ''`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := make(map[string]struct{}, 1024)
+	for rows.Next() {
+		var state, cnty string
+		if err := rows.Scan(&state, &cnty); err != nil {
+			return nil, err
+		}
+		if k := keyFn(state, cnty); k != "" {
+			out[k] = struct{}{}
+		}
+	}
+	return out, rows.Err()
+}
+
+// WorkedPOTARefs returns the set of POTA park references already worked
+// (upper-cased). A QSO's pota_ref may hold several comma-separated parks
+// (an n-fer); each is added separately.
+func (r *Repo) WorkedPOTARefs(ctx context.Context) (map[string]struct{}, error) {
+	rows, err := r.db.QueryContext(ctx,
+		`SELECT DISTINCT pota_ref FROM qso WHERE pota_ref IS NOT NULL AND pota_ref != ''`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := make(map[string]struct{}, 256)
+	for rows.Next() {
+		var ref string
+		if err := rows.Scan(&ref); err != nil {
+			return nil, err
+		}
+		for _, p := range strings.Split(ref, ",") {
+			if p = strings.ToUpper(strings.TrimSpace(p)); p != "" {
+				out[p] = struct{}{}
+			}
+		}
+	}
+	return out, rows.Err()
+}
+
 // Count returns the total number of QSOs in the database.
 func (r *Repo) Count(ctx context.Context) (int64, error) {
 	var n int64