Unify enrichment tracking and outcome-based status
Make common_tracker_patterns and common_third_parties share one enrichment-tracking model and fix the misleading proboctl status. Both tables now carry the enrichment JSONB provenance payload, an enrichment_attempts counter, and a last_enrichment_attempt_at clock. On common_tracker_patterns the enriched_at done-flag is renamed to last_enrichment_attempt_at and stamped at claim time, so it is truthful to "attempt" rather than "success". A row is considered to have been through the workflow when it carries an enrichment payload, not when a timestamp is set, which lets stale recovery key off the payload being absent with budget remaining, exactly like common_third_parties. The claim path reads the attempt counter and timestamp back via RETURNING so the in-memory receiver matches the database clock instead of a separate app-side time.Now. The enricher builds a per-field provenance payload (description and third-party outcomes plus the mapping attribution) and persists it via UpdateEnrichment, named to mirror the common-third-party sibling. The common pattern enrichment worker gains a max-attempts ceiling so a permanently failing row stops looping. proboctl now shows "enriched" only when every field the last run recorded an outcome for resolved a value, otherwise "partial (X/Y)", replacing the misleading "enriched (no description)" label. Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
@@ -16,8 +16,10 @@ package commontrackerpattern
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"go.gearno.de/kit/pg"
|
||||
@@ -26,6 +28,41 @@ import (
|
||||
"go.probo.inc/probo/pkg/proboctl/cmdutil"
|
||||
)
|
||||
|
||||
// manualEnrichmentPayload builds the enrichment provenance written when an
|
||||
// operator sets a description by hand. It records only the description
|
||||
// outcome (resolved), so the row reads "enriched" and the enrichment
|
||||
// worker leaves it alone, while marking the source as manual for audit.
|
||||
func manualEnrichmentPayload() json.RawMessage {
|
||||
now := time.Now()
|
||||
|
||||
payload := struct {
|
||||
Status string `json:"status"`
|
||||
Source string `json:"source"`
|
||||
AttemptedAt time.Time `json:"attempted_at"`
|
||||
Fields map[string]struct {
|
||||
Status string `json:"status"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
} `json:"fields"`
|
||||
}{
|
||||
Status: "manual",
|
||||
Source: "manual",
|
||||
AttemptedAt: now,
|
||||
Fields: map[string]struct {
|
||||
Status string `json:"status"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}{
|
||||
"description": {Status: "found", UpdatedAt: now},
|
||||
},
|
||||
}
|
||||
|
||||
raw, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return raw
|
||||
}
|
||||
|
||||
func newCmdSetDescription(f *cmdutil.Factory) *cobra.Command {
|
||||
var (
|
||||
flagDescription string
|
||||
@@ -83,7 +120,7 @@ func newCmdSetDescription(f *cmdutil.Factory) *cobra.Command {
|
||||
return fmt.Errorf("cannot load common tracker pattern: %w", err)
|
||||
}
|
||||
|
||||
if err := pattern.SetEnriched(ctx, tx, flagDescription, nil); err != nil {
|
||||
if err := pattern.UpdateEnrichment(ctx, tx, flagDescription, nil, manualEnrichmentPayload()); err != nil {
|
||||
return fmt.Errorf("cannot set common tracker pattern description: %w", err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user