Simplify workers and fix metrics

internal/controller/worker/worker.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
+	"git.vakhrushev.me/av/transcriber/internal/contract"
 	"git.vakhrushev.me/av/transcriber/internal/metrics"
-	"git.vakhrushev.me/av/transcriber/internal/service"
 )
 
 // Worker представляет базовый интерфейс для всех воркеров
@@ -16,22 +16,20 @@ type Worker interface {
 	Name() string
 }
 
-// ConversionWorker обрабатывает задачи конвертации
-type ConversionWorker struct {
-	transcribeService *service.TranscribeService
+type CallbackWorker struct {
+	name string
+	f    func() error
 }
 
-func NewConversionWorker(transcribeService *service.TranscribeService) *ConversionWorker {
-	return &ConversionWorker{
-		transcribeService: transcribeService,
-	}
+func NewCallbackWorker(name string, f func() error) *CallbackWorker {
+	return &CallbackWorker{name, f}
 }
 
-func (w *ConversionWorker) Name() string {
-	return "ConversionWorker"
+func (w *CallbackWorker) Name() string {
+	return w.name
 }
 
-func (w *ConversionWorker) Start(ctx context.Context) {
+func (w *CallbackWorker) Start(ctx context.Context) {
 	log.Printf("%s started", w.Name())
 
 	for {
@@ -40,93 +38,12 @@ func (w *ConversionWorker) Start(ctx context.Context) {
 			log.Printf("%s received shutdown signal", w.Name())
 			return
 		default:
-			err := w.transcribeService.FindAndRunConversionJob()
-			metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc()
-			if err != nil {
-				log.Printf("%s error: %v", w.Name(), err)
-			}
-
-			// Ждем 1 секунду перед следующей итерацией
-			select {
-			case <-ctx.Done():
-				log.Printf("%s received shutdown signal during sleep", w.Name())
-				return
-			case <-time.After(1 * time.Second):
-				// Продолжаем работу
-			}
-		}
-	}
-}
-
-// TranscribeWorker обрабатывает задачи транскрипции
-type TranscribeWorker struct {
-	transcribeService *service.TranscribeService
-}
-
-func NewTranscribeWorker(transcribeService *service.TranscribeService) *TranscribeWorker {
-	return &TranscribeWorker{
-		transcribeService: transcribeService,
-	}
-}
-
-func (w *TranscribeWorker) Name() string {
-	return "TranscribeWorker"
-}
-
-func (w *TranscribeWorker) Start(ctx context.Context) {
-	log.Printf("%s started", w.Name())
-
-	for {
-		select {
-		case <-ctx.Done():
-			log.Printf("%s received shutdown signal", w.Name())
-			return
-		default:
-			err := w.transcribeService.FindAndRunTranscribeJob()
-			metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc()
-			if err != nil {
-				log.Printf("%s error: %v", w.Name(), err)
-			}
-
-			// Ждем 1 секунду перед следующей итерацией
-			select {
-			case <-ctx.Done():
-				log.Printf("%s received shutdown signal during sleep", w.Name())
-				return
-			case <-time.After(1 * time.Second):
-				// Продолжаем работу
-			}
-		}
-	}
-}
-
-// CheckWorker обрабатывает задачи проверки статуса распознавания
-type CheckWorker struct {
-	transcribeService *service.TranscribeService
-}
-
-func NewCheckWorker(transcribeService *service.TranscribeService) *CheckWorker {
-	return &CheckWorker{
-		transcribeService: transcribeService,
-	}
-}
-
-func (w *CheckWorker) Name() string {
-	return "CheckWorker"
-}
-
-func (w *CheckWorker) Start(ctx context.Context) {
-	log.Printf("%s started", w.Name())
-
-	for {
-		select {
-		case <-ctx.Done():
-			log.Printf("%s received shutdown signal", w.Name())
-			return
-		default:
-			err := w.transcribeService.FindAndRunTranscribeCheckJob()
-			metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc()
-			if err != nil {
+			err := w.f()
+			_, isNoop := err.(*contract.NoopJobError)
+			if !isNoop {
+				metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc()
+			}
+			if err != nil && !isNoop {
 				log.Printf("%s error: %v", w.Name(), err)
 			}