GlueOps/autoglue
1
0
Fork 0
mirror of https://github.com/GlueOps/autoglue.git synced 2026-02-13 21:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: jobs api

Browse Source
This commit is contained in:
allanice001
2025-09-23 13:40:20 +01:00
parent a59550bd96
commit 4d4fda17ca
3 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
internal/handlers/jobs/jobs.go
View File

@@ -17,15 +17,20 @@ import (
)
type JobListItem struct {
ID string `json:"id"`
QueueName string `json:"queue_name"`
Status string `json:"status"`
RetryCount int `json:"retry_count"`
MaxRetry int `json:"max_retry"`
ScheduledAt time.Time `json:"scheduled_at"`
StartedAt *time.Time `json:"started_at,omitempty"`
UpdatedAt time.Time `json:"updated_at"`
LastError *string `json:"last_error,omitempty"`
ID string `json:"id"`
QueueName string `json:"queue_name"`
Status string `json:"status"`
RetryCount int `json:"retry_count"`
MaxRetry int `json:"max_retry"`
ScheduledAt time.Time `json:"scheduled_at"`
StartedAt *time.Time `json:"started_at,omitempty"`
UpdatedAt time.Time `json:"updated_at"`
LastError *string `json:"last_error,omitempty"`
ResultStatus string `json:"result_status"`
Processed int `json:"processed"`
Ready int `json:"ready"`
Failed int `json:"failed"`
ElapsedMs int `json:"elapsed_ms"`
}
type EnqueueReq struct {
@@ -127,7 +132,14 @@ func GetActive(w http.ResponseWriter, r *http.Request) {
var rows []JobListItem
err := db.DB.Model(&models.Job{}).
Select("id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error").
Select(`
id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error,
COALESCE(result->>'status','') AS result_status,
COALESCE((result->>'processed')::int, 0) AS processed,
COALESCE((result->>'ready')::int, 0) AS ready,
COALESCE((result->>'failed')::int, 0) AS failed,
COALESCE((result->>'elapsed_ms')::int, 0) AS elapsed_ms
`).
Where("status = ?", "running").
Order("started_at DESC NULLS LAST, updated_at DESC").
Limit(limit).
@@ -160,7 +172,14 @@ func GetFailures(w http.ResponseWriter, r *http.Request) {
var rows []JobListItem
err := db.DB.Model(&models.Job{}).
Select("id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error").
Select(`
id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error,
COALESCE(result->>'status','') AS result_status,
COALESCE((result->>'processed')::int, 0) AS processed,
COALESCE((result->>'ready')::int, 0) AS ready,
COALESCE((result->>'failed')::int, 0) AS failed,
COALESCE((result->>'elapsed_ms')::int, 0) AS elapsed_ms
`).
Where("status = ?", "failed").
Order("updated_at DESC").
Limit(limit).