reorganize repository package

cmd/server/main.go

@@ -12,7 +12,7 @@ import (
 	"github.com/nadmax/nexq/internal/api"
 	"github.com/nadmax/nexq/internal/middleware"
 	"github.com/nadmax/nexq/internal/queue"
-	"github.com/nadmax/nexq/internal/repository"
+	"github.com/nadmax/nexq/internal/repository/postgres"
 )
 
 func main() {
@@ -26,7 +26,7 @@ func main() {
 		log.Fatal("POSTGRES_DSN is required")
 	}
 
-	repo, err := repository.NewPostgresTaskRepository(postgresDSN)
+	repo, err := postgres.NewPostgresTaskRepository(postgresDSN)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/worker/main.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/nadmax/nexq/internal/queue"
-	"github.com/nadmax/nexq/internal/repository"
+	"github.com/nadmax/nexq/internal/repository/postgres"
 	"github.com/nadmax/nexq/internal/task"
 	"github.com/nadmax/nexq/internal/worker"
 	"github.com/nadmax/nexq/internal/worker/handlers"
@@ -28,7 +28,7 @@ func main() {
 		log.Fatal("POSTGRES_DSN is required")
 	}
 
-	repo, err := repository.NewPostgresTaskRepository(postgresDSN)
+	repo, err := postgres.NewPostgresTaskRepository(postgresDSN)
 	if err != nil {
 		log.Fatal(err)
 	}

codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "**/mocks/**"

internal/api/handlers_test.go

@@ -11,7 +11,8 @@ import (
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/nadmax/nexq/internal/queue"
-	"github.com/nadmax/nexq/internal/repository"
+	"github.com/nadmax/nexq/internal/repository/mocks"
+	"github.com/nadmax/nexq/internal/repository/models"
 	"github.com/nadmax/nexq/internal/task"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -29,11 +30,11 @@ func setupTestAPI(t *testing.T) (*API, *queue.Queue, *miniredis.Miniredis) {
 	return api, q, mr
 }
 
-func setupTestAPIWithMockRepo(t *testing.T) (*API, *queue.Queue, *repository.MockPostgresRepository, *miniredis.Miniredis) {
+func setupTestAPIWithMockRepo(t *testing.T) (*API, *queue.Queue, *mocks.MockPostgresRepository, *miniredis.Miniredis) {
 	mr, err := miniredis.Run()
 	require.NoError(t, err)
 
-	mockRepo := repository.NewMockPostgresRepository()
+	mockRepo := mocks.NewMockPostgresRepository()
 	q, err := queue.NewQueue(mr.Addr(), mockRepo)
 	require.NoError(t, err)
 
@@ -639,7 +640,7 @@ func TestHistoryStatsWithMockRepo(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.TaskStats = []repository.TaskStats{
+	mockRepo.TaskStats = []models.TaskStats{
 		{
 			Type:          "send_email",
 			Status:        "completed",
@@ -658,7 +659,7 @@ func TestHistoryStatsWithMockRepo(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, w.Code)
 
-	var stats []repository.TaskStats
+	var stats []models.TaskStats
 	err := json.NewDecoder(w.Body).Decode(&stats)
 	require.NoError(t, err)
 	assert.Len(t, stats, 1)
@@ -686,7 +687,7 @@ func TestHandleRecentHistory_Success(t *testing.T) {
 
 	duration1 := 250
 	duration2 := 150
-	mockRepo.RecentTasks = []repository.RecentTask{
+	mockRepo.RecentTasks = []models.RecentTask{
 		{
 			TaskID:     "task-1",
 			Type:       "send_email",
@@ -710,7 +711,7 @@ func TestHandleRecentHistory_Success(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, w.Code)
 
-	var tasks []repository.RecentTask
+	var tasks []models.RecentTask
 	err := json.NewDecoder(w.Body).Decode(&tasks)
 	require.NoError(t, err)
 	assert.Len(t, tasks, 2)
@@ -722,23 +723,22 @@ func TestHandleRecentHistory_WithLimit(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.RecentTasks = []repository.RecentTask{}
+	mockRepo.RecentTasks = []models.RecentTask{}
 
 	w := httptest.NewRecorder()
 	r := httptest.NewRequest(http.MethodGet, "/api/history/recent?limit=50", nil)
 
 	api.handleRecentHistory(w, r)
 
 	assert.Equal(t, http.StatusOK, w.Code)
-	// The limit is passed to the repository method, which uses it internally
 }
 
 func TestHandleRecentHistory_InvalidLimit(t *testing.T) {
 	api, q, mockRepo, mr := setupTestAPIWithMockRepo(t)
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.RecentTasks = []repository.RecentTask{}
+	mockRepo.RecentTasks = []models.RecentTask{}
 
 	w := httptest.NewRecorder()
 	r := httptest.NewRequest(http.MethodGet, "/api/history/recent?limit=invalid", nil)
@@ -805,7 +805,7 @@ func TestHandleTaskHistory_Success(t *testing.T) {
 	defer func() { _ = q.Close() }()
 
 	taskID := "task-123"
-	mockRepo.ExecutionLog = []repository.LogExecutionCall{
+	mockRepo.ExecutionLog = []mocks.LogExecutionCall{
 		{
 			TaskID:        taskID,
 			AttemptNumber: 1,
@@ -910,7 +910,7 @@ func TestHandleTasksByType_Success(t *testing.T) {
 	taskType := "send_email"
 	duration1 := 200
 	duration2 := 300
-	mockRepo.RecentTasks = []repository.RecentTask{
+	mockRepo.RecentTasks = []models.RecentTask{
 		{
 			TaskID:     "task-1",
 			Type:       taskType,
@@ -934,7 +934,7 @@ func TestHandleTasksByType_Success(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, w.Code)
 
-	var tasks []repository.RecentTask
+	var tasks []models.RecentTask
 	err := json.NewDecoder(w.Body).Decode(&tasks)
 	require.NoError(t, err)
 	assert.Len(t, tasks, 2)
@@ -946,7 +946,7 @@ func TestHandleTasksByType_WithLimit(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.RecentTasks = []repository.RecentTask{}
+	mockRepo.RecentTasks = []models.RecentTask{}
 
 	w := httptest.NewRecorder()
 	r := httptest.NewRequest(http.MethodGet, "/api/history/type/send_email?limit=25", nil)

internal/dashboard/dashboard_test.go

@@ -8,7 +8,8 @@ import (
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/nadmax/nexq/internal/queue"
-	"github.com/nadmax/nexq/internal/repository"
+	"github.com/nadmax/nexq/internal/repository/mocks"
+	"github.com/nadmax/nexq/internal/repository/models"
 	"github.com/nadmax/nexq/internal/task"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -26,11 +27,11 @@ func setupTestDashboard(t *testing.T) (*Dashboard, *queue.Queue, *miniredis.Mini
 	return dash, q, mr
 }
 
-func setupTestDashboardWithMockRepo(t *testing.T) (*Dashboard, *queue.Queue, *repository.MockPostgresRepository, *miniredis.Miniredis) {
+func setupTestDashboardWithMockRepo(t *testing.T) (*Dashboard, *queue.Queue, *mocks.MockPostgresRepository, *miniredis.Miniredis) {
 	mr, err := miniredis.Run()
 	require.NoError(t, err)
 
-	mockRepo := repository.NewMockPostgresRepository()
+	mockRepo := mocks.NewMockPostgresRepository()
 	q, err := queue.NewQueue(mr.Addr(), mockRepo)
 	require.NoError(t, err)
 
@@ -491,7 +492,7 @@ func TestGetStatsWithRepository(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.TaskStats = []repository.TaskStats{
+	mockRepo.TaskStats = []models.TaskStats{
 		{
 			Type:          "send_email",
 			Status:        "completed",
@@ -539,7 +540,7 @@ func TestGetRecentTasksWithRepository(t *testing.T) {
 	defer func() { _ = q.Close() }()
 
 	now := time.Now()
-	mockRepo.RecentTasks = []repository.RecentTask{
+	mockRepo.RecentTasks = []models.RecentTask{
 		{
 			TaskID:      "task-1",
 			Type:        "send_email",
@@ -612,7 +613,7 @@ func TestGetStatsWithCompletedTasks(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.TaskStats = []repository.TaskStats{
+	mockRepo.TaskStats = []models.TaskStats{
 		{
 			Type:          "send_email",
 			Status:        "completed",
@@ -639,7 +640,7 @@ func TestGetRecentTasksWithVariedStatuses(t *testing.T) {
 
 	now := time.Now()
 
-	mockRepo.RecentTasks = []repository.RecentTask{
+	mockRepo.RecentTasks = []models.RecentTask{
 		{
 			TaskID:      "completed-task",
 			Type:        "test_task",
@@ -685,8 +686,7 @@ func TestGetStatsPerformanceMetrics(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	// Setup performance data
-	mockRepo.TaskStats = []repository.TaskStats{
+	mockRepo.TaskStats = []models.TaskStats{
 		{
 			Type:          "fast_task",
 			Status:        "completed",
@@ -727,7 +727,7 @@ func TestGetRecentTasksOrdering(t *testing.T) {
 
 	now := time.Now()
 
-	mockRepo.RecentTasks = []repository.RecentTask{
+	mockRepo.RecentTasks = []models.RecentTask{
 		{
 			TaskID:    "newest",
 			Type:      "test",
@@ -761,7 +761,7 @@ func TestGetStatsWithRetryMetrics(t *testing.T) {
 	defer mr.Close()
 	defer func() { _ = q.Close() }()
 
-	mockRepo.TaskStats = []repository.TaskStats{
+	mockRepo.TaskStats = []models.TaskStats{
 		{
 			Type:          "reliable_task",
 			Status:        "completed",
@@ -793,7 +793,7 @@ func TestGetRecentTasksWithFailureReasons(t *testing.T) {
 
 	now := time.Now()
 
-	mockRepo.RecentTasks = []repository.RecentTask{
+	mockRepo.RecentTasks = []models.RecentTask{
 		{
 			TaskID:        "failed-1",
 			Type:          "test",

internal/queue/queue_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis/v2"
-	"github.com/nadmax/nexq/internal/repository"
+	"github.com/nadmax/nexq/internal/repository/mocks"
 	"github.com/nadmax/nexq/internal/task"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -21,11 +21,11 @@ func setupTestQueue(t *testing.T) (*Queue, *miniredis.Miniredis) {
 	return q, mr
 }
 
-func setupTestQueueWithMockRepo(t *testing.T) (*Queue, *repository.MockPostgresRepository, *miniredis.Miniredis) {
+func setupTestQueueWithMockRepo(t *testing.T) (*Queue, *mocks.MockPostgresRepository, *miniredis.Miniredis) {
 	mr, err := miniredis.Run()
 	require.NoError(t, err)
 
-	mockRepo := repository.NewMockPostgresRepository()
+	mockRepo := mocks.NewMockPostgresRepository()
 	q, err := NewQueue(mr.Addr(), mockRepo)
 	require.NoError(t, err)
 

internal/repository/mock_postgres.go → internal/repository/mocks/task_repository.go

@@ -1,10 +1,12 @@
-package repository
+// Package mocks provides mock implementations of repository interfaces for use in tests.
+package mocks
 
 import (
 	"context"
 	"fmt"
 	"sync"
 
+	"github.com/nadmax/nexq/internal/repository/models"
 	"github.com/nadmax/nexq/internal/task"
 )
 
@@ -20,8 +22,8 @@ type MockPostgresRepository struct {
 	LogExecutionCalls     []LogExecutionCall
 	Tasks                 map[string]*task.Task
 	ExecutionLog          []LogExecutionCall
-	TaskStats             []TaskStats
-	RecentTasks           []RecentTask
+	TaskStats             []models.TaskStats
+	RecentTasks           []models.RecentTask
 	GetTaskError          error
 	SaveTaskError         error
 	CompleteTaskError     error
@@ -74,8 +76,8 @@ func NewMockPostgresRepository() *MockPostgresRepository {
 	return &MockPostgresRepository{
 		Tasks:        make(map[string]*task.Task),
 		ExecutionLog: make([]LogExecutionCall, 0),
-		TaskStats:    make([]TaskStats, 0),
-		RecentTasks:  make([]RecentTask, 0),
+		TaskStats:    make([]models.TaskStats, 0),
+		RecentTasks:  make([]models.RecentTask, 0),
 	}
 }
 
@@ -233,7 +235,7 @@ func (m *MockPostgresRepository) LogExecution(ctx context.Context, taskID string
 	return nil
 }
 
-func (m *MockPostgresRepository) GetTaskStats(ctx context.Context, hours int) ([]TaskStats, error) {
+func (m *MockPostgresRepository) GetTaskStats(ctx context.Context, hours int) ([]models.TaskStats, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -244,7 +246,7 @@ func (m *MockPostgresRepository) GetTaskStats(ctx context.Context, hours int) ([
 	return m.TaskStats, nil
 }
 
-func (m *MockPostgresRepository) GetRecentTasks(ctx context.Context, limit int) ([]RecentTask, error) {
+func (m *MockPostgresRepository) GetRecentTasks(ctx context.Context, limit int) ([]models.RecentTask, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -259,15 +261,15 @@ func (m *MockPostgresRepository) GetRecentTasks(ctx context.Context, limit int)
 	return m.RecentTasks, nil
 }
 
-func (m *MockPostgresRepository) GetTasksByType(ctx context.Context, taskType string, limit int) ([]RecentTask, error) {
+func (m *MockPostgresRepository) GetTasksByType(ctx context.Context, taskType string, limit int) ([]models.RecentTask, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
 	if m.GetTasksByTypeError != nil {
 		return nil, m.GetTasksByTypeError
 	}
 
-	var filtered []RecentTask
+	var filtered []models.RecentTask
 	for _, task := range m.RecentTasks {
 		if task.Type == taskType {
 			filtered = append(filtered, task)

internal/repository/models/task.go

@@ -0,0 +1,25 @@
+// Package models contains data structures used by the task repository layer.
+package models
+
+import "time"
+
+type TaskStats struct {
+	Type          string  `json:"type"`
+	Status        string  `json:"status"`
+	Count         int     `json:"count"`
+	AvgDurationMs float64 `json:"avg_duration_ms"`
+	MaxDurationMs int     `json:"max_duration_ms"`
+	MinDurationMs int     `json:"min_duration_ms"`
+	AvgRetries    float64 `json:"avg_retries"`
+}
+
+type RecentTask struct {
+	TaskID        string     `json:"task_id"`
+	Type          string     `json:"type"`
+	Status        string     `json:"status"`
+	CreatedAt     time.Time  `json:"created_at"`
+	CompletedAt   *time.Time `json:"completed_at,omitempty"`
+	DurationMs    *int       `json:"duration_ms,omitempty"`
+	RetryCount    int        `json:"retry_count"`
+	FailureReason string     `json:"failure_reason,omitempty"`
+}