Mercurial > gemma
diff pkg/controllers/importqueue.go @ 2795:241e7f05a538
/api/imports/{id} result now also contains the 'enqueued' time.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 25 Mar 2019 12:48:00 +0100 |
| parents | 0f467af6bf5c |
| children | 972400e56e4a |
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go Mon Mar 25 12:39:54 2019 +0100 +++ b/pkg/controllers/importqueue.go Mon Mar 25 12:48:00 2019 +0100 @@ -65,8 +65,8 @@ SELECT enqueued FROM import.imports WHERE ` - selectImportSummaySQL = ` -SELECT summary FROM import.imports WHERE id = $1` + selectImportSummarySQL = ` +SELECT summary, enqueued FROM import.imports WHERE id = $1` selectHasNoRunningImportSQL = ` SELECT true FROM import.imports @@ -374,7 +374,11 @@ // Check if he have such a import job first. var summary sql.NullString - err = conn.QueryRowContext(ctx, selectImportSummaySQL, id).Scan(&summary) + var enqueued time.Time + err = conn.QueryRowContext(ctx, selectImportSummarySQL, id).Scan( + &summary, + &enqueued, + ) switch { case err == sql.ErrNoRows: err = JSONError{ @@ -418,11 +422,13 @@ jr = JSONResult{ Result: struct { - Summary interface{} `json:"summary,omitempty"` - Entries []*models.ImportLogEntry `json:"entries"` + Enqueued models.ImportTime `json:"enqueued"` + Summary interface{} `json:"summary,omitempty"` + Entries []*models.ImportLogEntry `json:"entries"` }{ - Summary: sum, - Entries: entries, + Enqueued: models.ImportTime{enqueued}, + Summary: sum, + Entries: entries, }, } return