Jan Novak
8b3064ffab
All checks were successful
Deploy to K8s / deploy (push) Successful in 9s
Previously both backends defaulted to `CacheDir=tmp` and used the same cache keys (`attendance_regular`, `attendance_juniors`, `payments_transactions`, `exceptions_dict`) but stored different shapes: Python caches post-processed view-model tuples (e.g. `(members, sorted_months)`), Go caches raw sheet rows. Whichever backend wrote last poisoned the cache for the other, producing `ValueError: too many values to unpack (expected 2, got 68)` on Python's /adults after the Go side populated the file with 68 raw CSV rows. This breaks the M5.4 `make parity` workflow that requires both backends running side-by-side. Fix: change Go's default to `tmp/go` so the two cache trees never overlap. `CACHE_DIR` env var override still works. `os.MkdirAll` already handles creating the new subdirectory on first write. Recovery for users with poisoned `tmp/`: hit /flush-cache on the Python side once after pulling, then restart the Go server. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
94 lines
3.0 KiB
Go
94 lines
3.0 KiB
Go
package config
|
|
|
|
import (
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// Google Sheets IDs — change in code if sheets change (not from env).
|
|
const (
|
|
AttendanceSheetID = "1E2e_gT_K5AwSRCDLDTa2UetZTkHmBOcz0kFbBUNUNBA"
|
|
PaymentsSheetID = "1Om0YPoDVCH5cV8BrNz5LG5eR5MMU05ypQC7UMN1xn_Y"
|
|
|
|
// Both attendance tabs live in the same Google Spreadsheet (AttendanceSheetID).
|
|
// The original adult and junior attendance data lives in separate source spreadsheets,
|
|
// but is collected into this one sheet via IMPORTRANGE — one tab per group.
|
|
// Tabs are identified by the gid= query param in the CSV export URL.
|
|
AttendanceAdultSheetGID = "0" // gid=0 — adult practices tab (IMPORTRANGE'd)
|
|
JuniorSheetGID = "1213318614" // gid=1213318614 — junior practices tab (IMPORTRANGE'd)
|
|
)
|
|
|
|
// CacheSheetMap mirrors scripts/config.py CACHE_SHEET_MAP.
|
|
// Maps a cache key to the Google Sheet ID whose Drive modifiedTime gates it.
|
|
// Both attendance keys map to the same spreadsheet — different tabs, one Drive file.
|
|
var CacheSheetMap = map[string]string{
|
|
"attendance_regular": AttendanceSheetID,
|
|
"attendance_juniors": AttendanceSheetID,
|
|
"exceptions_dict": PaymentsSheetID,
|
|
"payments_transactions": PaymentsSheetID,
|
|
}
|
|
|
|
// Config holds all runtime configuration loaded from environment variables.
|
|
// Mirrors scripts/config.py.
|
|
type Config struct {
|
|
CredentialsPath string
|
|
BankAccount string
|
|
CacheDir string
|
|
CacheTTL time.Duration
|
|
CacheAPICheckTTL time.Duration
|
|
DriveTimeout time.Duration
|
|
LogLevel string
|
|
FioAPIToken string
|
|
ServerAddr string
|
|
}
|
|
|
|
// Load reads configuration from the environment, applying defaults that
|
|
// match the Python side.
|
|
func Load() Config {
|
|
return Config{
|
|
CredentialsPath: env("CREDENTIALS_PATH", ".secret/fuj-management-bot-credentials.json"),
|
|
BankAccount: env("BANK_ACCOUNT", "CZ8520100000002800359168"),
|
|
CacheDir: env("CACHE_DIR", "tmp/go"),
|
|
CacheTTL: envDuration("CACHE_TTL_SECONDS", 300),
|
|
CacheAPICheckTTL: envDuration("CACHE_API_CHECK_TTL_SECONDS", 300),
|
|
DriveTimeout: envDuration("DRIVE_TIMEOUT_SECONDS", 10),
|
|
LogLevel: env("LOG_LEVEL", "INFO"),
|
|
FioAPIToken: env("FIO_API_TOKEN", ""),
|
|
ServerAddr: env("SERVER_ADDR", ":8080"),
|
|
}
|
|
}
|
|
|
|
// IBANAccountNum extracts the bare account number from a Czech IBAN.
|
|
// "CZ8520100000002800359168" → "2800359168"
|
|
// Structure: CZ(2 check)(4 bank code)(16 zero-padded account).
|
|
func IBANAccountNum(iban string) string {
|
|
s := strings.ReplaceAll(iban, " ", "")
|
|
if len(s) < 8 {
|
|
return iban
|
|
}
|
|
raw := s[8:] // 16-digit zero-padded account portion
|
|
n := strings.TrimLeft(raw, "0")
|
|
if n == "" {
|
|
return "0"
|
|
}
|
|
return n
|
|
}
|
|
|
|
func env(key, fallback string) string {
|
|
if v := os.Getenv(key); v != "" {
|
|
return v
|
|
}
|
|
return fallback
|
|
}
|
|
|
|
func envDuration(key string, defaultSeconds int) time.Duration {
|
|
if v := os.Getenv(key); v != "" {
|
|
if n, err := strconv.Atoi(v); err == nil && n > 0 {
|
|
return time.Duration(n) * time.Second
|
|
}
|
|
}
|
|
return time.Duration(defaultSeconds) * time.Second
|
|
}
|