drsybren/Flamenco
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: use api.JobStatus in persistence layer as well

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-02-24 11:54:35 +01:00
parent 7e776167bb
commit 7420177209
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/manager/persistence/jobs.go
View File

@ -36,10 +36,10 @@ type Job struct {
gorm.Model
UUID string `gorm:"type:char(36);not null;unique;index"`
Name string `gorm:"type:varchar(64);not null"`
JobType string `gorm:"type:varchar(32);not null"`
Priority int `gorm:"type:smallint;not null"`
Status string `gorm:"type:varchar(32);not null"` // See JobStatusXxxx consts in openapi_types.gen.go
Name string `gorm:"type:varchar(64);not null"`
JobType string `gorm:"type:varchar(32);not null"`
Priority int `gorm:"type:smallint;not null"`
Status api.JobStatus `gorm:"type:varchar(32);not null"`
Settings StringInterfaceMap `gorm:"type:jsonb"`
Metadata StringStringMap `gorm:"type:jsonb"`
@ -119,7 +119,7 @@ func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.Au
UUID: authoredJob.JobID,
Name: authoredJob.Name,
JobType: authoredJob.JobType,
Status: string(authoredJob.Status),
Status: authoredJob.Status,
Priority: authoredJob.Priority,
Settings: StringInterfaceMap(authoredJob.Settings),
Metadata: StringStringMap(authoredJob.Metadata),

2
internal/manager/persistence/jobs_test.go
View File

@ -105,7 +105,7 @@ func TestStoreAuthoredJob(t *testing.T) {
assert.Equal(t, job.Name, fetchedJob.Name)
assert.Equal(t, job.JobType, fetchedJob.JobType)
assert.Equal(t, job.Priority, fetchedJob.Priority)
assert.Equal(t, string(api.JobStatusUnderConstruction), fetchedJob.Status)
assert.Equal(t, api.JobStatusUnderConstruction, fetchedJob.Status)
assert.EqualValues(t, map[string]interface{}(job.Settings), fetchedJob.Settings)
assert.EqualValues(t, map[string]string(job.Metadata), fetchedJob.Metadata)

2
internal/manager/persistence/task_scheduler_test.go
View File

@ -181,7 +181,7 @@ func constructTestJob(
assert.NoError(t, err)
// Queue the job.
dbJob.Status = string(api.JobStatusQueued)
dbJob.Status = api.JobStatusQueued
err = db.SaveJobStatus(ctx, dbJob)
assert.NoError(t, err)