Refactor project structure
This commit is contained in:
@@ -5,19 +5,19 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"git.vakhrushev.me/av/transcriber/internal/repo"
|
||||
"git.vakhrushev.me/av/transcriber/internal/service/transcribe"
|
||||
"git.vakhrushev.me/av/transcriber/internal/contract"
|
||||
"git.vakhrushev.me/av/transcriber/internal/service"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
const baseStorageDir = "data/files"
|
||||
|
||||
type TranscribeHandler struct {
|
||||
jobRepo repo.TranscriptJobRepository
|
||||
trsService *transcribe.TranscribeService
|
||||
jobRepo contract.TranscriptJobRepository
|
||||
trsService *service.TranscribeService
|
||||
}
|
||||
|
||||
func NewTranscribeHandler(jobRepo repo.TranscriptJobRepository, trsService *transcribe.TranscribeService) *TranscribeHandler {
|
||||
func NewTranscribeHandler(jobRepo contract.TranscriptJobRepository, trsService *service.TranscribeService) *TranscribeHandler {
|
||||
return &TranscribeHandler{jobRepo: jobRepo, trsService: trsService}
|
||||
}
|
||||
|
||||
|
@@ -15,9 +15,9 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.vakhrushev.me/av/transcriber/internal/adapter/sqlite"
|
||||
"git.vakhrushev.me/av/transcriber/internal/entity"
|
||||
"git.vakhrushev.me/av/transcriber/internal/repo/sqlite"
|
||||
"git.vakhrushev.me/av/transcriber/internal/service/transcribe"
|
||||
"git.vakhrushev.me/av/transcriber/internal/service"
|
||||
"github.com/doug-martin/goqu/v9"
|
||||
_ "github.com/doug-martin/goqu/v9/dialect/sqlite3"
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -56,7 +56,7 @@ func setupTestRouter(t *testing.T) (*gin.Engine, *TranscribeHandler) {
|
||||
fileRepo := sqlite.NewFileRepository(db, gq)
|
||||
jobRepo := sqlite.NewTranscriptJobRepository(db, gq)
|
||||
|
||||
trsService := transcribe.NewTranscribeService(jobRepo, fileRepo)
|
||||
trsService := service.NewTranscribeService(jobRepo, fileRepo)
|
||||
|
||||
handler := NewTranscribeHandler(jobRepo, trsService)
|
||||
|
||||
|
@@ -5,7 +5,7 @@ import (
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"git.vakhrushev.me/av/transcriber/internal/service/transcribe"
|
||||
"git.vakhrushev.me/av/transcriber/internal/service"
|
||||
)
|
||||
|
||||
// Worker представляет базовый интерфейс для всех воркеров
|
||||
@@ -16,10 +16,10 @@ type Worker interface {
|
||||
|
||||
// ConversionWorker обрабатывает задачи конвертации
|
||||
type ConversionWorker struct {
|
||||
transcribeService *transcribe.TranscribeService
|
||||
transcribeService *service.TranscribeService
|
||||
}
|
||||
|
||||
func NewConversionWorker(transcribeService *transcribe.TranscribeService) *ConversionWorker {
|
||||
func NewConversionWorker(transcribeService *service.TranscribeService) *ConversionWorker {
|
||||
return &ConversionWorker{
|
||||
transcribeService: transcribeService,
|
||||
}
|
||||
@@ -57,10 +57,10 @@ func (w *ConversionWorker) Start(ctx context.Context) {
|
||||
|
||||
// TranscribeWorker обрабатывает задачи транскрипции
|
||||
type TranscribeWorker struct {
|
||||
transcribeService *transcribe.TranscribeService
|
||||
transcribeService *service.TranscribeService
|
||||
}
|
||||
|
||||
func NewTranscribeWorker(transcribeService *transcribe.TranscribeService) *TranscribeWorker {
|
||||
func NewTranscribeWorker(transcribeService *service.TranscribeService) *TranscribeWorker {
|
||||
return &TranscribeWorker{
|
||||
transcribeService: transcribeService,
|
||||
}
|
||||
@@ -98,10 +98,10 @@ func (w *TranscribeWorker) Start(ctx context.Context) {
|
||||
|
||||
// CheckWorker обрабатывает задачи проверки статуса распознавания
|
||||
type CheckWorker struct {
|
||||
transcribeService *transcribe.TranscribeService
|
||||
transcribeService *service.TranscribeService
|
||||
}
|
||||
|
||||
func NewCheckWorker(transcribeService *transcribe.TranscribeService) *CheckWorker {
|
||||
func NewCheckWorker(transcribeService *service.TranscribeService) *CheckWorker {
|
||||
return &CheckWorker{
|
||||
transcribeService: transcribeService,
|
||||
}
|
||||
|
Reference in New Issue
Block a user