chore: stabilize lint and verify builds

backend/providers/job/config.go

@@ -45,15 +45,16 @@ const (
 )
 
 // queueConfig returns a river.QueueConfig map built from QueueWorkers or defaults.
-func (c *Config) queueConfig() map[string]river.QueueConfig {
+func (config *Config) queueConfig() map[string]river.QueueConfig {
 	cfg := map[string]river.QueueConfig{}
-	if c == nil || len(c.QueueWorkers) == 0 {
+	if config == nil || len(config.QueueWorkers) == 0 {
 		cfg[QueueHigh] = river.QueueConfig{MaxWorkers: 10}
 		cfg[QueueDefault] = river.QueueConfig{MaxWorkers: 10}
 		cfg[QueueLow] = river.QueueConfig{MaxWorkers: 10}
+
 		return cfg
 	}
-	for name, n := range c.QueueWorkers {
+	for name, n := range config.QueueWorkers {
 		if n <= 0 {
 			n = 1
 		}
@@ -63,5 +64,6 @@ func (c *Config) queueConfig() map[string]river.QueueConfig {
 	if _, ok := cfg[QueueDefault]; !ok {
 		cfg[QueueDefault] = river.QueueConfig{MaxWorkers: 10}
 	}
+
 	return cfg
 }

backend/providers/job/provider.go

@@ -15,7 +15,7 @@ import (
 	"github.com/riverqueue/river/riverdriver/riverpgxv5"
 	"github.com/riverqueue/river/rivertype"
 	"github.com/samber/lo"
-	log "github.com/sirupsen/logrus"
+	logrus "github.com/sirupsen/logrus"
 	"go.ipao.vip/atom/container"
 	"go.ipao.vip/atom/contracts"
 	"go.ipao.vip/atom/opt"
@@ -27,6 +27,7 @@ func Provide(opts ...opt.Option) error {
 	if err := o.UnmarshalConfig(&config); err != nil {
 		return err
 	}
+
 	return container.Container.Provide(func(ctx context.Context, dbConf *postgres.Config) (*Job, error) {
 		workers := river.NewWorkers()
 
@@ -79,7 +80,7 @@ func (q *Job) Close() {
 	}
 
 	if err := q.client.StopAndCancel(q.ctx); err != nil {
-		log.Errorf("Failed to stop and cancel client: %s", err)
+		logrus.Errorf("Failed to stop and cancel client: %s", err)
 	}
 	// clear references
 	q.l.Lock()
@@ -87,22 +88,22 @@ func (q *Job) Close() {
 	q.l.Unlock()
 }
 
-func (q *Job) Client() (*river.Client[pgx.Tx], error) {
-	q.l.Lock()
-	defer q.l.Unlock()
+func (jobProvider *Job) Client() (*river.Client[pgx.Tx], error) {
+	jobProvider.l.Lock()
+	defer jobProvider.l.Unlock()
 
-	if q.client == nil {
+	if jobProvider.client == nil {
 		var err error
-		q.client, err = river.NewClient(q.driver, &river.Config{
-			Workers: q.Workers,
-			Queues:  q.conf.queueConfig(),
+		jobProvider.client, err = river.NewClient(jobProvider.driver, &river.Config{
+			Workers: jobProvider.Workers,
+			Queues:  jobProvider.conf.queueConfig(),
 		})
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	return q.client, nil
+	return jobProvider.client, nil
 }
 
 func (q *Job) Start(ctx context.Context) error {
@@ -136,6 +137,7 @@ func (q *Job) AddPeriodicJobs(job contracts.CronJob) error {
 			return err
 		}
 	}
+
 	return nil
 }
 
@@ -160,19 +162,20 @@ func (q *Job) AddPeriodicJob(job contracts.CronJobArg) error {
 	return nil
 }
 
-func (q *Job) Cancel(id string) error {
-	client, err := q.Client()
+func (jobProvider *Job) Cancel(id string) error {
+	client, err := jobProvider.Client()
 	if err != nil {
 		return err
 	}
 
-	q.l.Lock()
-	defer q.l.Unlock()
+	jobProvider.l.Lock()
+	defer jobProvider.l.Unlock()
 
-	if h, ok := q.periodicJobs[id]; ok {
-		client.PeriodicJobs().Remove(h)
-		delete(q.periodicJobs, id)
+	if handle, ok := jobProvider.periodicJobs[id]; ok {
+		client.PeriodicJobs().Remove(handle)
+		delete(jobProvider.periodicJobs, id)
 	}
+
 	return nil
 }
 
@@ -187,21 +190,23 @@ func (q *Job) CancelContext(ctx context.Context, id string) error {
 	if h, ok := q.periodicJobs[id]; ok {
 		client.PeriodicJobs().Remove(h)
 		delete(q.periodicJobs, id)
+
 		return nil
 	}
 
 	return nil
 }
 
-func (q *Job) Add(job contracts.JobArgs) error {
-	client, err := q.Client()
+func (jobProvider *Job) Add(job contracts.JobArgs) error {
+	client, err := jobProvider.Client()
 	if err != nil {
 		return err
 	}
 
-	q.l.Lock()
-	defer q.l.Unlock()
+	jobProvider.l.Lock()
+	defer jobProvider.l.Unlock()
+
+	_, err = client.Insert(jobProvider.ctx, job, lo.ToPtr(job.InsertOpts()))
 
-	_, err = client.Insert(q.ctx, job, lo.ToPtr(job.InsertOpts()))
 	return err
 }