Migrate ingest and API paths to string IDs
This commit is contained in:
@@ -5,14 +5,19 @@ import (
|
||||
"database/sql"
|
||||
|
||||
"reanimator/internal/domain"
|
||||
"reanimator/internal/idgen"
|
||||
)
|
||||
|
||||
type FailureRepository struct {
|
||||
db *sql.DB
|
||||
db *sql.DB
|
||||
idgen *idgen.Generator
|
||||
}
|
||||
|
||||
func NewFailureRepository(db *sql.DB) *FailureRepository {
|
||||
return &FailureRepository{db: db}
|
||||
return &FailureRepository{
|
||||
db: db,
|
||||
idgen: idgen.NewGenerator(db),
|
||||
}
|
||||
}
|
||||
|
||||
func (r *FailureRepository) BeginTx(ctx context.Context) (*sql.Tx, error) {
|
||||
@@ -31,41 +36,49 @@ func execerFor(db *sql.DB, tx *sql.Tx) execer {
|
||||
return db
|
||||
}
|
||||
|
||||
func (r *FailureRepository) Upsert(ctx context.Context, tx *sql.Tx, event domain.FailureEvent) (int64, error) {
|
||||
func (r *FailureRepository) Upsert(ctx context.Context, tx *sql.Tx, event domain.FailureEvent) (string, error) {
|
||||
execer := execerFor(r.db, tx)
|
||||
_, err := execer.ExecContext(ctx,
|
||||
`INSERT INTO failure_events (source, external_id, component_id, asset_id, failure_type, failure_time, details, confidence)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||
|
||||
// Generate ID for new failure events
|
||||
id, err := r.idgen.Generate(ctx, idgen.FailureEvent)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
_, err = execer.ExecContext(ctx,
|
||||
`INSERT INTO failure_events (id, source, external_id, part_id, machine_id, failure_type, failure_time, details, confidence)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
component_id = VALUES(component_id),
|
||||
asset_id = VALUES(asset_id),
|
||||
part_id = VALUES(part_id),
|
||||
machine_id = VALUES(machine_id),
|
||||
failure_type = VALUES(failure_type),
|
||||
failure_time = VALUES(failure_time),
|
||||
details = VALUES(details),
|
||||
confidence = VALUES(confidence)`,
|
||||
id,
|
||||
event.Source,
|
||||
event.ExternalID,
|
||||
event.ComponentID,
|
||||
event.AssetID,
|
||||
event.PartID,
|
||||
event.MachineID,
|
||||
event.FailureType,
|
||||
event.FailureTime,
|
||||
event.Details,
|
||||
event.Confidence,
|
||||
)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return "", err
|
||||
}
|
||||
|
||||
var id int64
|
||||
var resultID string
|
||||
row := execer.QueryRowContext(ctx,
|
||||
`SELECT id FROM failure_events WHERE source = ? AND external_id = ?`,
|
||||
event.Source,
|
||||
event.ExternalID,
|
||||
)
|
||||
if err := row.Scan(&id); err != nil {
|
||||
return 0, err
|
||||
if err := row.Scan(&resultID); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return id, nil
|
||||
return resultID, nil
|
||||
}
|
||||
|
||||
func (r *FailureRepository) ListAll(ctx context.Context, limit int) ([]domain.FailureEvent, error) {
|
||||
@@ -73,9 +86,9 @@ func (r *FailureRepository) ListAll(ctx context.Context, limit int) ([]domain.Fa
|
||||
limit = 200
|
||||
}
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
`SELECT id, source, external_id, component_id, asset_id, failure_type, failure_time, details, confidence, created_at
|
||||
`SELECT id, source, external_id, part_id, machine_id, failure_type, failure_time, details, confidence, created_at
|
||||
FROM failure_events
|
||||
ORDER BY failure_time DESC, id DESC
|
||||
ORDER BY failure_time DESC, created_at DESC
|
||||
LIMIT ?`,
|
||||
limit,
|
||||
)
|
||||
@@ -87,17 +100,17 @@ func (r *FailureRepository) ListAll(ctx context.Context, limit int) ([]domain.Fa
|
||||
items := make([]domain.FailureEvent, 0)
|
||||
for rows.Next() {
|
||||
var event domain.FailureEvent
|
||||
var assetID sql.NullInt64
|
||||
var machineID sql.NullString
|
||||
var details sql.NullString
|
||||
var confidence sql.NullFloat64
|
||||
|
||||
if err := rows.Scan(&event.ID, &event.Source, &event.ExternalID, &event.ComponentID, &assetID, &event.FailureType, &event.FailureTime, &details, &confidence, &event.CreatedAt); err != nil {
|
||||
if err := rows.Scan(&event.ID, &event.Source, &event.ExternalID, &event.PartID, &machineID, &event.FailureType, &event.FailureTime, &details, &confidence, &event.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if assetID.Valid {
|
||||
value := assetID.Int64
|
||||
event.AssetID = &value
|
||||
if machineID.Valid {
|
||||
value := machineID.String
|
||||
event.MachineID = &value
|
||||
}
|
||||
if details.Valid {
|
||||
value := details.String
|
||||
|
||||
Reference in New Issue
Block a user