use options in the report

This commit is contained in:
2026-07-11 16:28:35 +01:00
parent 1ce8561782
commit 0a657682f6
3 changed files with 32 additions and 9 deletions
+1 -1
View File
@@ -71,7 +71,7 @@ func run(ctx context.Context) error {
} }
eg.Go(func() error { eg.Go(func() error {
return internal.BuildReport(ctx, reader, writer, selector) return internal.BuildReport(ctx, reader, writer, internal.WithSelector(selector))
}) })
err = eg.Wait() err = eg.Wait()
+30 -7
View File
@@ -51,12 +51,35 @@ type ReportWriter interface {
Write(context.Context, ReportItem) error Write(context.Context, ReportItem) error
} }
type optionals struct {
selector Selector
}
func applyOptions(defaults optionals, opts []Option) optionals {
for _, opt := range opts {
opt(&defaults)
}
return defaults
}
type Option func(*optionals)
func WithSelector(s Selector) Option {
return func(o *optionals) {
o.selector = s
}
}
// Selector returns true if a record should be selected for processing, false otherwise. // Selector returns true if a record should be selected for processing, false otherwise.
type Selector func(Record) bool type Selector func(Record) bool
// BuildReport reads records from a RecordReader and, if the record passes the Selector, it is // BuildReport reads records from a RecordReader and, if the record passes the Selector, it is
// processed into the ReportWriter. // processed into the ReportWriter.
func BuildReport(ctx context.Context, reader RecordReader, writer ReportWriter, sel Selector) error { func BuildReport(ctx context.Context, reader RecordReader, writer ReportWriter, options ...Option) error {
optionals := applyOptions(optionals{
selector: Any(),
}, options)
buys := make(map[string]*FillerQueue) buys := make(map[string]*FillerQueue)
var buysCount, sellsCount int64 var buysCount, sellsCount int64
@@ -98,7 +121,7 @@ func BuildReport(ctx context.Context, reader RecordReader, writer ReportWriter,
buys[rec.Symbol()] = buyQueue buys[rec.Symbol()] = buyQueue
} }
err = processRecord(ctx, buyQueue, rec, sel, writer) err = processRecord(ctx, buyQueue, rec, optionals.selector, writer)
if err != nil { if err != nil {
return fmt.Errorf("processing record: %w", err) return fmt.Errorf("processing record: %w", err)
} }
@@ -109,10 +132,6 @@ func BuildReport(ctx context.Context, reader RecordReader, writer ReportWriter,
// processRecord either adds buys to the queue or consumes buys from the queue when processing a // processRecord either adds buys to the queue or consumes buys from the queue when processing a
// sell record. // sell record.
//
// NOTE: Selectors are only applied when processing sell records for performance reasons. It's much
// cheaper to just accumulate buys and only actually inspect any records once a sell happens. This
// avoids potential network requests to for every single record.
func processRecord(ctx context.Context, q *FillerQueue, rec Record, sel Selector, writer ReportWriter) error { func processRecord(ctx context.Context, q *FillerQueue, rec Record, sel Selector, writer ReportWriter) error {
slog.Debug( slog.Debug(
"Report: processing record", "Report: processing record",
@@ -122,6 +141,9 @@ func processRecord(ctx context.Context, q *FillerQueue, rec Record, sel Selector
switch rec.Kind() { switch rec.Kind() {
case KindBuy: case KindBuy:
// Selectors are only applied when processing sell records for performance reasons. It's much
// cheaper to just accumulate buys and only actually inspect any records once a sell happens. This
// avoids potential network requests to for every single record.
q.Push(NewFiller(rec)) q.Push(NewFiller(rec))
case KindSell: case KindSell:
@@ -142,7 +164,8 @@ func processRecord(ctx context.Context, q *FillerQueue, rec Record, sel Selector
return ErrInsufficientBoughtVolume return ErrInsufficientBoughtVolume
} }
// Since we don't apply selectors while processing buys we need to apply them here. // Since we don't apply selectors while processing buys we need to apply them here, befre we
// actually use them.
if !sel(buy) { if !sel(buy) {
continue continue
} }
+1 -1
View File
@@ -43,7 +43,7 @@ func TestBuildReport(t *testing.T) {
Taxes: decimal.Decimal{}, Taxes: decimal.Decimal{},
})).Times(1) })).Times(1)
gotErr := internal.BuildReport(t.Context(), reader, writer, internal.Any()) gotErr := internal.BuildReport(t.Context(), reader, writer)
if gotErr != nil { if gotErr != nil {
t.Fatalf("got unexpected err: %v", gotErr) t.Fatalf("got unexpected err: %v", gotErr)
} }