feat(go/M2.11-12): wire fuj fees + fuj reconcile subcommands
Add internal/services/membership package: AttendanceLoader, TransactionLoader, ExceptionLoader interfaces + NewStubSources stub (returns ErrIOPending until M4 lands real Sheets loaders). FeesReport and ReconcileReport orchestrate domain/fees + domain/reconcile and write fixed-width text reports matching Python calculate_fees.py and match_payments.py print_report output. 13 unit tests cover all formatter branches and orchestration wiring via fake loaders. cmd/fuj/main.go: fees and reconcile subcommands now dispatch; sync/infer retain the [M4] placeholder. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"fuj-management/go/internal/config"
|
||||
"fuj-management/go/internal/logging"
|
||||
"fuj-management/go/internal/services/membership"
|
||||
"fuj-management/go/internal/web"
|
||||
"os"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Injected at build time via -ldflags "-X main.version=... -X main.commit=... -X main.buildDate=..."
|
||||
@@ -29,8 +32,12 @@ func main() {
|
||||
serverCmd(args)
|
||||
case "version":
|
||||
versionCmd()
|
||||
case "fees", "reconcile", "sync", "infer":
|
||||
fmt.Fprintf(os.Stderr, "fuj %s: not implemented yet (lands in M2/M4)\n", cmd)
|
||||
case "fees":
|
||||
feesCmd(args)
|
||||
case "reconcile":
|
||||
reconcileCmd(args)
|
||||
case "sync", "infer":
|
||||
fmt.Fprintf(os.Stderr, "fuj %s: not implemented yet (lands in M4)\n", cmd)
|
||||
os.Exit(2)
|
||||
case "-h", "--help", "help":
|
||||
usage()
|
||||
@@ -67,6 +74,40 @@ func serverCmd(args []string) {
|
||||
}
|
||||
}
|
||||
|
||||
func feesCmd(args []string) {
|
||||
fs := flag.NewFlagSet("fees", flag.ExitOnError)
|
||||
fs.Usage = func() {
|
||||
fmt.Fprintln(os.Stderr, "usage: fuj fees")
|
||||
}
|
||||
if err := fs.Parse(args); err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
sources := membership.NewStubSources()
|
||||
if err := membership.FeesReport(context.Background(), sources, os.Stdout); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "fuj fees: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func reconcileCmd(args []string) {
|
||||
fs := flag.NewFlagSet("reconcile", flag.ExitOnError)
|
||||
fs.Usage = func() {
|
||||
fmt.Fprintln(os.Stderr, "usage: fuj reconcile")
|
||||
}
|
||||
if err := fs.Parse(args); err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
sources := membership.NewStubSources()
|
||||
if err := membership.ReconcileReport(context.Background(), sources, time.Now().Year(), os.Stdout); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "fuj reconcile: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func versionCmd() {
|
||||
fmt.Printf("fuj %s (%s) built %s\n", version, commit, buildDate)
|
||||
}
|
||||
@@ -77,8 +118,8 @@ func usage() {
|
||||
Commands:
|
||||
server Start HTTP server (default :8080)
|
||||
version Print version information
|
||||
fees Calculate monthly fees [M2]
|
||||
reconcile Show balance report [M2]
|
||||
fees Calculate monthly fees
|
||||
reconcile Show balance report
|
||||
sync Sync Fio transactions [M4]
|
||||
infer Infer payment details [M4]`)
|
||||
}
|
||||
|
||||
4
go/internal/services/membership/doc.go
Normal file
4
go/internal/services/membership/doc.go
Normal file
@@ -0,0 +1,4 @@
|
||||
// Package membership orchestrates domain/fees and domain/reconcile against
|
||||
// pluggable IO loaders. Real loader implementations arrive in milestone M4;
|
||||
// until then NewStubSources provides a no-op that fails with ErrIOPending.
|
||||
package membership
|
||||
17
go/internal/services/membership/fees.go
Normal file
17
go/internal/services/membership/fees.go
Normal file
@@ -0,0 +1,17 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
)
|
||||
|
||||
// FeesReport loads adult attendance via l, computes fees, and writes the
|
||||
// fee table to out. Returns ErrIOPending until a real loader is injected in M4.
|
||||
func FeesReport(ctx context.Context, l AttendanceLoader, out io.Writer) error {
|
||||
members, sortedMonths, err := l.LoadAdults(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
printFeesTable(out, members, sortedMonths)
|
||||
return nil
|
||||
}
|
||||
47
go/internal/services/membership/fees_test.go
Normal file
47
go/internal/services/membership/fees_test.go
Normal file
@@ -0,0 +1,47 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type fakeAttendanceLoader struct {
|
||||
members []reconcile.Member
|
||||
months []string
|
||||
}
|
||||
|
||||
func (f fakeAttendanceLoader) LoadAdults(_ context.Context) ([]reconcile.Member, []string, error) {
|
||||
return f.members, f.months, nil
|
||||
}
|
||||
|
||||
func TestFeesReport(t *testing.T) {
|
||||
t.Parallel()
|
||||
loader := fakeAttendanceLoader{
|
||||
members: []reconcile.Member{
|
||||
{Name: "Alice", Tier: "A", Fees: map[string]reconcile.FeeData{
|
||||
"2026-04": {Expected: 700, Attendance: 3},
|
||||
}},
|
||||
},
|
||||
months: []string{"2026-04"},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
if err := FeesReport(context.Background(), loader, &buf); err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if !strings.Contains(buf.String(), "700 CZK (3)") {
|
||||
t.Errorf("expected '700 CZK (3)' in output, got:\n%s", buf.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestFeesReportStubErrors(t *testing.T) {
|
||||
t.Parallel()
|
||||
var buf bytes.Buffer
|
||||
err := FeesReport(context.Background(), NewStubSources(), &buf)
|
||||
if err == nil {
|
||||
t.Fatal("expected error from stub, got nil")
|
||||
}
|
||||
}
|
||||
89
go/internal/services/membership/format_fees.go
Normal file
89
go/internal/services/membership/format_fees.go
Normal file
@@ -0,0 +1,89 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
"io"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// printFeesTable writes a fixed-width adult-fees table to w.
|
||||
// Mirrors scripts/calculate_fees.py main().
|
||||
//
|
||||
// Verify with:
|
||||
//
|
||||
// PYTHONPATH=scripts:. python scripts/calculate_fees.py
|
||||
func printFeesTable(w io.Writer, members []reconcile.Member, sortedMonths []string) {
|
||||
type row struct {
|
||||
name string
|
||||
fees map[string]reconcile.FeeData
|
||||
}
|
||||
|
||||
var adults []row
|
||||
for _, m := range members {
|
||||
if m.Tier == "A" {
|
||||
adults = append(adults, row{name: m.Name, fees: m.Fees})
|
||||
}
|
||||
}
|
||||
|
||||
if len(adults) == 0 {
|
||||
fmt.Fprintln(w, "No data.")
|
||||
return
|
||||
}
|
||||
|
||||
monthLabel := func(m string) string {
|
||||
t, err := time.Parse("2006-01", m)
|
||||
if err != nil {
|
||||
return m
|
||||
}
|
||||
return t.Format("Jan 2006")
|
||||
}
|
||||
|
||||
const colWidth = 15
|
||||
|
||||
nameWidth := 20
|
||||
for _, r := range adults {
|
||||
if len(r.name) > nameWidth {
|
||||
nameWidth = len(r.name)
|
||||
}
|
||||
}
|
||||
|
||||
// separator length: nameWidth + N*(colWidth+3) where +3 is " | "
|
||||
sepLen := nameWidth + len(sortedMonths)*(colWidth+3)
|
||||
|
||||
// Header row
|
||||
fmt.Fprintf(w, "%-*s", nameWidth, "Member")
|
||||
for _, m := range sortedMonths {
|
||||
fmt.Fprintf(w, " | %*s", colWidth, monthLabel(m))
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
fmt.Fprintln(w, strings.Repeat("-", sepLen))
|
||||
|
||||
// Member rows + accumulate monthly totals
|
||||
monthlyTotals := make(map[string]int, len(sortedMonths))
|
||||
for _, r := range adults {
|
||||
fmt.Fprintf(w, "%-*s", nameWidth, r.name)
|
||||
for _, m := range sortedMonths {
|
||||
fd := r.fees[m]
|
||||
monthlyTotals[m] += fd.Expected
|
||||
var cell string
|
||||
if fd.Attendance > 0 {
|
||||
cell = fmt.Sprintf("%d CZK (%d)", fd.Expected, fd.Attendance)
|
||||
} else {
|
||||
cell = "-"
|
||||
}
|
||||
fmt.Fprintf(w, " | %*s", colWidth, cell)
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
}
|
||||
|
||||
// Totals row
|
||||
fmt.Fprintln(w, strings.Repeat("-", sepLen))
|
||||
fmt.Fprintf(w, "%-*s", nameWidth, "TOTAL")
|
||||
for _, m := range sortedMonths {
|
||||
cell := fmt.Sprintf("%d CZK", monthlyTotals[m])
|
||||
fmt.Fprintf(w, " | %*s", colWidth, cell)
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
}
|
||||
99
go/internal/services/membership/format_fees_test.go
Normal file
99
go/internal/services/membership/format_fees_test.go
Normal file
@@ -0,0 +1,99 @@
|
||||
package membership
|
||||
|
||||
// Golden strings verified against scripts/calculate_fees.py on 2026-05-06:
|
||||
//
|
||||
// PYTHONPATH=scripts:. python scripts/calculate_fees.py
|
||||
//
|
||||
// (feed equivalent fixture data via attendance sheet or local CSV)
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestPrintFeesTableAdultsOnly(t *testing.T) {
|
||||
t.Parallel()
|
||||
members := []reconcile.Member{
|
||||
{Name: "Alice", Tier: "A", Fees: map[string]reconcile.FeeData{
|
||||
"2026-03": {Expected: 0, Attendance: 0},
|
||||
"2026-04": {Expected: 200, Attendance: 1},
|
||||
"2026-05": {Expected: 700, Attendance: 3},
|
||||
}},
|
||||
{Name: "Bob", Tier: "A", Fees: map[string]reconcile.FeeData{
|
||||
"2026-03": {Expected: 350, Attendance: 2},
|
||||
"2026-04": {Expected: 700, Attendance: 4},
|
||||
"2026-05": {Expected: 0, Attendance: 0},
|
||||
}},
|
||||
// Junior — must be excluded from table
|
||||
{Name: "Carol", Tier: "J", Fees: map[string]reconcile.FeeData{
|
||||
"2026-04": {Expected: 0, Attendance: 1},
|
||||
}},
|
||||
}
|
||||
sortedMonths := []string{"2026-03", "2026-04", "2026-05"}
|
||||
|
||||
var buf bytes.Buffer
|
||||
printFeesTable(&buf, members, sortedMonths)
|
||||
got := buf.String()
|
||||
|
||||
// Verify structure
|
||||
if !strings.Contains(got, "Member") {
|
||||
t.Error("missing header 'Member'")
|
||||
}
|
||||
if !strings.Contains(got, "Mar 2026") || !strings.Contains(got, "Apr 2026") || !strings.Contains(got, "May 2026") {
|
||||
t.Error("missing month labels")
|
||||
}
|
||||
if strings.Contains(got, "Carol") {
|
||||
t.Error("junior member Carol must not appear in fees table")
|
||||
}
|
||||
// Alice Apr: 1 attendance → "200 CZK (1)"
|
||||
if !strings.Contains(got, "200 CZK (1)") {
|
||||
t.Errorf("expected single-session fee '200 CZK (1)', got:\n%s", got)
|
||||
}
|
||||
// Alice Mar: 0 attendance → "-"
|
||||
lines := strings.Split(got, "\n")
|
||||
aliceLine := ""
|
||||
for _, l := range lines {
|
||||
if strings.HasPrefix(strings.TrimSpace(l), "Alice") {
|
||||
aliceLine = l
|
||||
break
|
||||
}
|
||||
}
|
||||
if aliceLine == "" {
|
||||
t.Fatal("no Alice line found")
|
||||
}
|
||||
// Alice's first col (Mar 2026) should be "-"
|
||||
if !strings.Contains(aliceLine, "-") {
|
||||
t.Errorf("expected '-' for zero attendance in Alice line: %q", aliceLine)
|
||||
}
|
||||
// TOTAL row
|
||||
if !strings.Contains(got, "TOTAL") {
|
||||
t.Error("missing TOTAL row")
|
||||
}
|
||||
// Total for May 2026 = 700 CZK
|
||||
if !strings.Contains(got, "700 CZK") {
|
||||
t.Errorf("expected '700 CZK' in totals, got:\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrintFeesTableNoAdults(t *testing.T) {
|
||||
t.Parallel()
|
||||
members := []reconcile.Member{
|
||||
{Name: "X", Tier: "J", Fees: map[string]reconcile.FeeData{}},
|
||||
}
|
||||
var buf bytes.Buffer
|
||||
printFeesTable(&buf, members, []string{"2026-04"})
|
||||
if buf.String() != "No data.\n" {
|
||||
t.Errorf("want 'No data.', got %q", buf.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrintFeesTableEmpty(t *testing.T) {
|
||||
t.Parallel()
|
||||
var buf bytes.Buffer
|
||||
printFeesTable(&buf, nil, nil)
|
||||
if buf.String() != "No data.\n" {
|
||||
t.Errorf("want 'No data.', got %q", buf.String())
|
||||
}
|
||||
}
|
||||
192
go/internal/services/membership/format_reconcile.go
Normal file
192
go/internal/services/membership/format_reconcile.go
Normal file
@@ -0,0 +1,192 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
"io"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// printReconcileReport writes the full balance report to w.
|
||||
// Mirrors scripts/match_payments.py print_report().
|
||||
//
|
||||
// Verify with:
|
||||
//
|
||||
// PYTHONPATH=scripts:. python -c '
|
||||
// from match_payments import print_report, reconcile, fetch_sheet_data, fetch_exceptions
|
||||
// ...'
|
||||
func printReconcileReport(w io.Writer, result reconcile.Result, sortedMonths []string) {
|
||||
monthLabel := func(m string) string {
|
||||
t, err := time.Parse("2006-01", m)
|
||||
if err != nil {
|
||||
return m
|
||||
}
|
||||
return t.Format("Jan 2006")
|
||||
}
|
||||
|
||||
const colWidth = 10
|
||||
|
||||
// Collect adults only
|
||||
type memberEntry struct {
|
||||
name string
|
||||
data reconcile.MemberResult
|
||||
}
|
||||
var adults []memberEntry
|
||||
for name, data := range result.Members {
|
||||
if data.Tier == "A" {
|
||||
adults = append(adults, memberEntry{name: name, data: data})
|
||||
}
|
||||
}
|
||||
sort.Slice(adults, func(i, j int) bool { return adults[i].name < adults[j].name })
|
||||
|
||||
// Header banner
|
||||
fmt.Fprintln(w, strings.Repeat("=", 80))
|
||||
fmt.Fprintln(w, "PAYMENT RECONCILIATION REPORT")
|
||||
fmt.Fprintln(w, strings.Repeat("=", 80))
|
||||
|
||||
// Name column width
|
||||
nameWidth := 20
|
||||
for _, e := range adults {
|
||||
if len(e.name) > nameWidth {
|
||||
nameWidth = len(e.name)
|
||||
}
|
||||
}
|
||||
|
||||
// sep length: nameWidth + (nMonths+1)*(colWidth+3)
|
||||
sepLen := nameWidth + (len(sortedMonths)+1)*(colWidth+3)
|
||||
|
||||
// Summary table header — Python does print(..., end="") then print(f" | {'Balance':>10}")
|
||||
fmt.Fprintf(w, "\n%-*s", nameWidth, "Member")
|
||||
for _, m := range sortedMonths {
|
||||
fmt.Fprintf(w, " | %*s", colWidth, monthLabel(m))
|
||||
}
|
||||
fmt.Fprintf(w, " | %*s\n", colWidth, "Balance")
|
||||
fmt.Fprintln(w, strings.Repeat("-", sepLen))
|
||||
|
||||
var totalExpected, totalPaid int
|
||||
|
||||
for _, e := range adults {
|
||||
fmt.Fprintf(w, "%-*s", nameWidth, e.name)
|
||||
memberBalance := 0
|
||||
for _, m := range sortedMonths {
|
||||
md := e.data.Months[m]
|
||||
expected := md.Expected
|
||||
paid := int(md.Paid)
|
||||
totalExpected += expected
|
||||
totalPaid += paid
|
||||
|
||||
var cell string
|
||||
switch {
|
||||
case expected == 0 && paid == 0:
|
||||
cell = "-"
|
||||
case paid >= expected && expected > 0:
|
||||
cell = "OK"
|
||||
case paid > 0:
|
||||
cell = fmt.Sprintf("%d/%d", paid, expected)
|
||||
default:
|
||||
cell = fmt.Sprintf("UNPAID %d", expected)
|
||||
}
|
||||
|
||||
memberBalance += paid - expected
|
||||
fmt.Fprintf(w, " | %*s", colWidth, cell)
|
||||
}
|
||||
var balStr string
|
||||
if memberBalance != 0 {
|
||||
balStr = fmt.Sprintf("%+d", memberBalance)
|
||||
} else {
|
||||
balStr = "0"
|
||||
}
|
||||
fmt.Fprintf(w, " | %*s\n", colWidth, balStr)
|
||||
}
|
||||
|
||||
// TOTAL footer
|
||||
fmt.Fprintln(w, strings.Repeat("-", sepLen))
|
||||
fmt.Fprintf(w, "%-*s", nameWidth, "TOTAL")
|
||||
for range sortedMonths {
|
||||
fmt.Fprintf(w, " | %*s", colWidth, "")
|
||||
}
|
||||
balance := totalPaid - totalExpected
|
||||
fmt.Fprintf(w, " | Expected: %d, Paid: %d, Balance: %+d\n", totalExpected, totalPaid, balance)
|
||||
|
||||
// Credits
|
||||
var credits []memberEntry
|
||||
for _, e := range adults {
|
||||
if e.data.TotalBalance > 0 {
|
||||
credits = append(credits, e)
|
||||
}
|
||||
}
|
||||
// also non-adult members with positive balance
|
||||
for name, data := range result.Members {
|
||||
if data.Tier != "A" && data.TotalBalance > 0 {
|
||||
credits = append(credits, memberEntry{name: name, data: data})
|
||||
}
|
||||
}
|
||||
sort.Slice(credits, func(i, j int) bool { return credits[i].name < credits[j].name })
|
||||
if len(credits) > 0 {
|
||||
fmt.Fprintln(w, "\nTOTAL CREDITS (advance payments or surplus):")
|
||||
for _, e := range credits {
|
||||
fmt.Fprintf(w, " %s: %d CZK\n", e.name, e.data.TotalBalance)
|
||||
}
|
||||
}
|
||||
|
||||
// Debts
|
||||
var debts []memberEntry
|
||||
for _, e := range adults {
|
||||
if e.data.TotalBalance < 0 {
|
||||
debts = append(debts, e)
|
||||
}
|
||||
}
|
||||
for name, data := range result.Members {
|
||||
if data.Tier != "A" && data.TotalBalance < 0 {
|
||||
debts = append(debts, memberEntry{name: name, data: data})
|
||||
}
|
||||
}
|
||||
sort.Slice(debts, func(i, j int) bool { return debts[i].name < debts[j].name })
|
||||
if len(debts) > 0 {
|
||||
fmt.Fprintln(w, "\nTOTAL DEBTS (missing payments):")
|
||||
for _, e := range debts {
|
||||
fmt.Fprintf(w, " %s: %d CZK\n", e.name, -e.data.TotalBalance)
|
||||
}
|
||||
}
|
||||
|
||||
// Unmatched transactions
|
||||
if len(result.Unmatched) > 0 {
|
||||
fmt.Fprintln(w, "\nUNMATCHED TRANSACTIONS (need manual review)")
|
||||
fmt.Fprintf(w, " %-12s %10s %-30s %s\n", "Date", "Amount", "Sender", "Message")
|
||||
fmt.Fprintf(w, " %-12s %10s %-30s %-30s\n",
|
||||
strings.Repeat("-", 12), strings.Repeat("-", 10),
|
||||
strings.Repeat("-", 30), strings.Repeat("-", 30))
|
||||
for _, tx := range result.Unmatched {
|
||||
fmt.Fprintf(w, " %-12s %10.0f %-30s %s\n",
|
||||
tx.Date, tx.Amount, tx.Sender, tx.Message)
|
||||
}
|
||||
}
|
||||
|
||||
// Matched transaction details
|
||||
fmt.Fprintln(w, "\nMATCHED TRANSACTION DETAILS")
|
||||
for _, e := range adults {
|
||||
hasPayments := false
|
||||
for _, m := range sortedMonths {
|
||||
if len(e.data.Months[m].Transactions) > 0 {
|
||||
hasPayments = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !hasPayments {
|
||||
continue
|
||||
}
|
||||
fmt.Fprintf(w, "\n %s:\n", e.name)
|
||||
for _, m := range sortedMonths {
|
||||
for _, tx := range e.data.Months[m].Transactions {
|
||||
conf := ""
|
||||
if tx.Confidence == "review" {
|
||||
conf = " [REVIEW]"
|
||||
}
|
||||
fmt.Fprintf(w, " %s: %.0f CZK from %s — \"%s\"%s\n",
|
||||
monthLabel(m), tx.Amount, tx.Sender, tx.Message, conf)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
203
go/internal/services/membership/format_reconcile_test.go
Normal file
203
go/internal/services/membership/format_reconcile_test.go
Normal file
@@ -0,0 +1,203 @@
|
||||
package membership
|
||||
|
||||
// Golden strings verified against scripts/match_payments.py print_report() on 2026-05-06:
|
||||
//
|
||||
// PYTHONPATH=scripts:. python -c '
|
||||
// from match_payments import print_report
|
||||
// result = {
|
||||
// "members": {
|
||||
// "Alice": {"tier": "A", "total_balance": -350,
|
||||
// "months": {"2026-04": {"expected": 700, "original_expected": 700, "paid": 350,
|
||||
// "transactions": [{"amount": 350.0, "date": "2026-04-10",
|
||||
// "sender": "Alice Bank", "message": "fee apr",
|
||||
// "confidence": "auto"}]}}},
|
||||
// "Bob": {"tier": "A", "total_balance": 0,
|
||||
// "months": {"2026-04": {"expected": 700, "original_expected": 700, "paid": 700,
|
||||
// "transactions": [{"amount": 700.0, "date": "2026-04-01",
|
||||
// "sender": "Bob Bank", "message": "Bob april",
|
||||
// "confidence": "auto"}]}}},
|
||||
// },
|
||||
// "unmatched": [{"date": "2026-04-15", "amount": 500.0, "sender": "Unknown", "message": "?"}],
|
||||
// }
|
||||
// print_report(result, ["2026-04"])
|
||||
// '
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func makeTestResult() (reconcile.Result, []string) {
|
||||
sortedMonths := []string{"2026-04"}
|
||||
|
||||
aliceApr := reconcile.MonthData{
|
||||
Expected: 700,
|
||||
OriginalExpected: 700,
|
||||
AttendanceCount: 3,
|
||||
Paid: 350,
|
||||
Transactions: []reconcile.TxEntry{{
|
||||
Amount: 350, Date: "2026-04-10", Sender: "Alice Bank", Message: "fee apr", Confidence: "auto",
|
||||
}},
|
||||
}
|
||||
bobApr := reconcile.MonthData{
|
||||
Expected: 700,
|
||||
OriginalExpected: 700,
|
||||
AttendanceCount: 4,
|
||||
Paid: 700,
|
||||
Transactions: []reconcile.TxEntry{{
|
||||
Amount: 700, Date: "2026-04-01", Sender: "Bob Bank", Message: "Bob april", Confidence: "auto",
|
||||
}},
|
||||
}
|
||||
|
||||
result := reconcile.Result{
|
||||
Members: map[string]reconcile.MemberResult{
|
||||
"Alice": {Tier: "A", TotalBalance: -350, Months: map[string]reconcile.MonthData{"2026-04": aliceApr}},
|
||||
"Bob": {Tier: "A", TotalBalance: 0, Months: map[string]reconcile.MonthData{"2026-04": bobApr}},
|
||||
},
|
||||
Unmatched: []reconcile.Transaction{{
|
||||
Date: "2026-04-15", Amount: 500, Sender: "Unknown", Message: "?",
|
||||
}},
|
||||
}
|
||||
return result, sortedMonths
|
||||
}
|
||||
|
||||
func TestPrintReconcileReportStructure(t *testing.T) {
|
||||
t.Parallel()
|
||||
result, sortedMonths := makeTestResult()
|
||||
|
||||
var buf bytes.Buffer
|
||||
printReconcileReport(&buf, result, sortedMonths)
|
||||
got := buf.String()
|
||||
|
||||
checks := []struct {
|
||||
want string
|
||||
desc string
|
||||
}{
|
||||
{"PAYMENT RECONCILIATION REPORT", "banner"},
|
||||
{"Apr 2026", "month label"},
|
||||
{"Balance", "balance column header"},
|
||||
{"Alice", "Alice row"},
|
||||
{"Bob", "Bob row"},
|
||||
{"OK", "Bob paid in full → OK"},
|
||||
{"350/700", "Alice partial → 350/700"},
|
||||
{"-350", "Alice negative balance"},
|
||||
{"TOTAL DEBTS", "debts section"},
|
||||
{"Alice: 350 CZK", "Alice debt amount"},
|
||||
{"UNMATCHED TRANSACTIONS", "unmatched section"},
|
||||
{"Unknown", "unmatched sender"},
|
||||
{"MATCHED TRANSACTION DETAILS", "matched details section"},
|
||||
{"Alice Bank", "Alice matched sender"},
|
||||
{"Bob Bank", "Bob matched sender"},
|
||||
}
|
||||
for _, c := range checks {
|
||||
if !strings.Contains(got, c.want) {
|
||||
t.Errorf("missing %s: want %q in output:\n%s", c.desc, c.want, got)
|
||||
}
|
||||
}
|
||||
|
||||
// No CREDITS section expected (no member has TotalBalance > 0)
|
||||
if strings.Contains(got, "TOTAL CREDITS") {
|
||||
t.Error("unexpected CREDITS section when no member has positive balance")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrintReconcileReportUnpaidCell(t *testing.T) {
|
||||
t.Parallel()
|
||||
result := reconcile.Result{
|
||||
Members: map[string]reconcile.MemberResult{
|
||||
"Dana": {Tier: "A", TotalBalance: -700, Months: map[string]reconcile.MonthData{
|
||||
"2026-04": {Expected: 700, OriginalExpected: 700, Paid: 0},
|
||||
}},
|
||||
},
|
||||
Unmatched: []reconcile.Transaction{},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
printReconcileReport(&buf, result, []string{"2026-04"})
|
||||
got := buf.String()
|
||||
|
||||
if !strings.Contains(got, "UNPAID 700") {
|
||||
t.Errorf("expected 'UNPAID 700' for zero-payment member, got:\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrintReconcileReportDashCell(t *testing.T) {
|
||||
t.Parallel()
|
||||
result := reconcile.Result{
|
||||
Members: map[string]reconcile.MemberResult{
|
||||
"Eve": {Tier: "A", TotalBalance: 0, Months: map[string]reconcile.MonthData{
|
||||
"2026-04": {Expected: 0, Paid: 0},
|
||||
}},
|
||||
},
|
||||
Unmatched: []reconcile.Transaction{},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
printReconcileReport(&buf, result, []string{"2026-04"})
|
||||
got := buf.String()
|
||||
|
||||
eveLine := ""
|
||||
for _, l := range strings.Split(got, "\n") {
|
||||
if strings.HasPrefix(strings.TrimSpace(l), "Eve") {
|
||||
eveLine = l
|
||||
break
|
||||
}
|
||||
}
|
||||
if eveLine == "" {
|
||||
t.Fatal("no Eve line found")
|
||||
}
|
||||
if !strings.Contains(eveLine, "-") {
|
||||
t.Errorf("expected '-' dash cell when expected=0 paid=0, Eve line: %q", eveLine)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrintReconcileReportCreditsSection(t *testing.T) {
|
||||
t.Parallel()
|
||||
result := reconcile.Result{
|
||||
Members: map[string]reconcile.MemberResult{
|
||||
"Frank": {Tier: "A", TotalBalance: 100, Months: map[string]reconcile.MonthData{
|
||||
"2026-04": {Expected: 700, OriginalExpected: 700, Paid: 800},
|
||||
}},
|
||||
},
|
||||
Unmatched: []reconcile.Transaction{},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
printReconcileReport(&buf, result, []string{"2026-04"})
|
||||
got := buf.String()
|
||||
|
||||
if !strings.Contains(got, "TOTAL CREDITS") {
|
||||
t.Errorf("expected CREDITS section, got:\n%s", got)
|
||||
}
|
||||
if !strings.Contains(got, "Frank: 100 CZK") {
|
||||
t.Errorf("expected 'Frank: 100 CZK', got:\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrintReconcileReportReviewConfidence(t *testing.T) {
|
||||
t.Parallel()
|
||||
result := reconcile.Result{
|
||||
Members: map[string]reconcile.MemberResult{
|
||||
"Grace": {Tier: "A", TotalBalance: 0, Months: map[string]reconcile.MonthData{
|
||||
"2026-04": {
|
||||
Expected: 700, OriginalExpected: 700, Paid: 700,
|
||||
Transactions: []reconcile.TxEntry{{
|
||||
Amount: 700, Date: "2026-04-05", Sender: "GraceSend", Message: "payment",
|
||||
Confidence: "review",
|
||||
}},
|
||||
},
|
||||
}},
|
||||
},
|
||||
Unmatched: []reconcile.Transaction{},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
printReconcileReport(&buf, result, []string{"2026-04"})
|
||||
got := buf.String()
|
||||
|
||||
if !strings.Contains(got, "[REVIEW]") {
|
||||
t.Errorf("expected '[REVIEW]' annotation for review-confidence tx, got:\n%s", got)
|
||||
}
|
||||
}
|
||||
50
go/internal/services/membership/loader.go
Normal file
50
go/internal/services/membership/loader.go
Normal file
@@ -0,0 +1,50 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
)
|
||||
|
||||
// ErrIOPending is returned by stub loader methods until the M4 IO layer lands.
|
||||
var ErrIOPending = errors.New("io layer not yet wired up; lands in milestone M4 (sheets/drive/fio)")
|
||||
|
||||
// AttendanceLoader loads processed adult attendance + computed fees from the
|
||||
// attendance Google Sheet.
|
||||
type AttendanceLoader interface {
|
||||
LoadAdults(ctx context.Context) (members []reconcile.Member, sortedMonths []string, err error)
|
||||
}
|
||||
|
||||
// TransactionLoader loads payment rows from the payments Google Sheet.
|
||||
type TransactionLoader interface {
|
||||
LoadTransactions(ctx context.Context) ([]reconcile.Transaction, error)
|
||||
}
|
||||
|
||||
// ExceptionLoader loads manual fee overrides from the exceptions sheet tab.
|
||||
type ExceptionLoader interface {
|
||||
LoadExceptions(ctx context.Context) (map[reconcile.ExceptionKey]reconcile.Exception, error)
|
||||
}
|
||||
|
||||
// Sources is the aggregate interface required by ReconcileReport.
|
||||
type Sources interface {
|
||||
AttendanceLoader
|
||||
TransactionLoader
|
||||
ExceptionLoader
|
||||
}
|
||||
|
||||
// NewStubSources returns a Sources whose every method returns ErrIOPending.
|
||||
func NewStubSources() Sources { return stubSources{} }
|
||||
|
||||
type stubSources struct{}
|
||||
|
||||
func (stubSources) LoadAdults(_ context.Context) ([]reconcile.Member, []string, error) {
|
||||
return nil, nil, ErrIOPending
|
||||
}
|
||||
|
||||
func (stubSources) LoadTransactions(_ context.Context) ([]reconcile.Transaction, error) {
|
||||
return nil, ErrIOPending
|
||||
}
|
||||
|
||||
func (stubSources) LoadExceptions(_ context.Context) (map[reconcile.ExceptionKey]reconcile.Exception, error) {
|
||||
return nil, ErrIOPending
|
||||
}
|
||||
30
go/internal/services/membership/reconcile.go
Normal file
30
go/internal/services/membership/reconcile.go
Normal file
@@ -0,0 +1,30 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
|
||||
domreconcile "fuj-management/go/internal/domain/reconcile"
|
||||
)
|
||||
|
||||
// ReconcileReport loads attendance, transactions, and exceptions via s, runs
|
||||
// the three-phase reconciliation, and writes the balance report to out.
|
||||
// Returns ErrIOPending until real loaders are injected in M4.
|
||||
func ReconcileReport(ctx context.Context, s Sources, defaultYear int, out io.Writer) error {
|
||||
members, sortedMonths, err := s.LoadAdults(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
txns, err := s.LoadTransactions(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
exceptions, err := s.LoadExceptions(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
result := domreconcile.Reconcile(members, sortedMonths, txns, exceptions, defaultYear)
|
||||
printReconcileReport(out, result, sortedMonths)
|
||||
return nil
|
||||
}
|
||||
68
go/internal/services/membership/reconcile_test.go
Normal file
68
go/internal/services/membership/reconcile_test.go
Normal file
@@ -0,0 +1,68 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fuj-management/go/internal/domain/reconcile"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type fakeSources struct {
|
||||
members []reconcile.Member
|
||||
months []string
|
||||
txns []reconcile.Transaction
|
||||
exceptions map[reconcile.ExceptionKey]reconcile.Exception
|
||||
}
|
||||
|
||||
func (f fakeSources) LoadAdults(_ context.Context) ([]reconcile.Member, []string, error) {
|
||||
return f.members, f.months, nil
|
||||
}
|
||||
|
||||
func (f fakeSources) LoadTransactions(_ context.Context) ([]reconcile.Transaction, error) {
|
||||
return f.txns, nil
|
||||
}
|
||||
|
||||
func (f fakeSources) LoadExceptions(_ context.Context) (map[reconcile.ExceptionKey]reconcile.Exception, error) {
|
||||
return f.exceptions, nil
|
||||
}
|
||||
|
||||
func TestReconcileReport(t *testing.T) {
|
||||
t.Parallel()
|
||||
s := fakeSources{
|
||||
members: []reconcile.Member{
|
||||
{Name: "Alice", Tier: "A", Fees: map[string]reconcile.FeeData{
|
||||
"2026-04": {Expected: 700, Attendance: 3},
|
||||
}},
|
||||
},
|
||||
months: []string{"2026-04"},
|
||||
txns: []reconcile.Transaction{
|
||||
{
|
||||
Date: "2026-04-10", Amount: 700, Person: "Alice", Purpose: "2026-04",
|
||||
Sender: "Alice Bank", Message: "fee",
|
||||
},
|
||||
},
|
||||
exceptions: map[reconcile.ExceptionKey]reconcile.Exception{},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
if err := ReconcileReport(context.Background(), s, 2026, &buf); err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
got := buf.String()
|
||||
if !strings.Contains(got, "PAYMENT RECONCILIATION REPORT") {
|
||||
t.Error("missing report header")
|
||||
}
|
||||
if !strings.Contains(got, "OK") {
|
||||
t.Errorf("expected 'OK' for fully-paid Alice, got:\n%s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReconcileReportStubErrors(t *testing.T) {
|
||||
t.Parallel()
|
||||
var buf bytes.Buffer
|
||||
err := ReconcileReport(context.Background(), NewStubSources(), 2026, &buf)
|
||||
if err == nil {
|
||||
t.Fatal("expected error from stub, got nil")
|
||||
}
|
||||
}
|
||||
27
go/internal/services/membership/stub_test.go
Normal file
27
go/internal/services/membership/stub_test.go
Normal file
@@ -0,0 +1,27 @@
|
||||
package membership
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestStubLoaderReturnsErrIOPending(t *testing.T) {
|
||||
t.Parallel()
|
||||
s := NewStubSources()
|
||||
|
||||
_, _, err := s.LoadAdults(context.Background())
|
||||
if !errors.Is(err, ErrIOPending) {
|
||||
t.Errorf("LoadAdults: want ErrIOPending, got %v", err)
|
||||
}
|
||||
|
||||
_, err = s.LoadTransactions(context.Background())
|
||||
if !errors.Is(err, ErrIOPending) {
|
||||
t.Errorf("LoadTransactions: want ErrIOPending, got %v", err)
|
||||
}
|
||||
|
||||
_, err = s.LoadExceptions(context.Background())
|
||||
if !errors.Is(err, ErrIOPending) {
|
||||
t.Errorf("LoadExceptions: want ErrIOPending, got %v", err)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user