diff --git a/cmd/server/tests/scanner_integration_test.go b/cmd/server/tests/scanner_integration_test.go new file mode 100644 index 0000000..31a2547 --- /dev/null +++ b/cmd/server/tests/scanner_integration_test.go @@ -0,0 +1,233 @@ +package main + +import ( + "bytes" + "encoding/json" + "fmt" + "net/http" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" +) + +type ScannerIntegrationTestSuite struct { + suite.Suite + setup *TestServerSetup +} + +func (s *ScannerIntegrationTestSuite) SetupSuite() { + s.setup = setupTestServer(s.T()) +} + +func (s *ScannerIntegrationTestSuite) TearDownSuite() { + s.setup.Close() +} + +func (s *ScannerIntegrationTestSuite) TestScanProgress_TracksStatistics() { + token := s.setup.Token + + createLibReq := map[string]interface{}{ + "name": "Scan Test Library", + "description": "Test library for scan progress", + "type": "ebooks", + } + createLibBody, _ := json.Marshal(createLibReq) + createLibURL := s.setup.Server.URL + "/api/libraries" + createLibReqHTTP, _ := http.NewRequest("POST", createLibURL, bytes.NewBuffer(createLibBody)) + createLibReqHTTP.Header.Set("Content-Type", "application/json") + createLibReqHTTP.Header.Set("Authorization", "Bearer "+token) + + client := &http.Client{} + createLibResp, err := client.Do(createLibReqHTTP) + require.NoError(s.T(), err) + require.Equal(s.T(), http.StatusCreated, createLibResp.StatusCode) + + var createLibResponse map[string]interface{} + json.NewDecoder(createLibResp.Body).Decode(&createLibResponse) + createLibResp.Body.Close() + + libraryID, ok := createLibResponse["id"].(string) + require.True(s.T(), ok, "library_id should be string") + require.NotEmpty(s.T(), libraryID, "library_id should not be empty") + + folderURL := fmt.Sprintf("%s/api/libraries/%s/folders", s.setup.Server.URL, libraryID) + folderReq := map[string]interface{}{ + "folder_path": "/app/uploads", + } + folderBody, _ := json.Marshal(folderReq) + req, _ := http.NewRequest("POST", folderURL, bytes.NewBuffer(folderBody)) + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Authorization", "Bearer "+token) + + resp, err := client.Do(req) + require.NoError(s.T(), err) + resp.Body.Close() + require.Equal(s.T(), http.StatusCreated, resp.StatusCode, "Folder creation should succeed") + + scanURL := fmt.Sprintf("%s/api/libraries/%s/scan", s.setup.Server.URL, libraryID) + scanReq, _ := http.NewRequest("POST", scanURL, nil) + scanReq.Header.Set("Authorization", "Bearer "+token) + + scanResp, err := client.Do(scanReq) + require.NoError(s.T(), err) + require.Equal(s.T(), http.StatusAccepted, scanResp.StatusCode) + + var scanResponse map[string]interface{} + err = json.NewDecoder(scanResp.Body).Decode(&scanResponse) + require.NoError(s.T(), err) + scanResp.Body.Close() + + jobID, ok := scanResponse["job_id"].(string) + require.True(s.T(), ok, "job_id should be string") + require.NotEmpty(s.T(), jobID, "job_id should not be empty") + + var lastProgress float64 + var lastFilesScanned, lastNewItems, lastErrors int + + for i := 0; i < 30; i++ { + time.Sleep(1 * time.Second) + + statusURL := fmt.Sprintf("%s/api/scanner/status/%s", s.setup.Server.URL, jobID) + statusReq, _ := http.NewRequest("GET", statusURL, nil) + statusReq.Header.Set("Authorization", "Bearer "+token) + + statusResp, err := client.Do(statusReq) + require.NoError(s.T(), err) + + var status map[string]interface{} + err = json.NewDecoder(statusResp.Body).Decode(&status) + statusResp.Body.Close() + require.NoError(s.T(), err) + + assert.Contains(s.T(), status, "files_scanned") + assert.Contains(s.T(), status, "new_items") + assert.Contains(s.T(), status, "errors") + + progressFloat, ok := status["progress"].(float64) + require.True(s.T(), ok, "progress should be float64") + progress := progressFloat + + filesScannedFloat, ok := status["files_scanned"].(float64) + require.True(s.T(), ok, "files_scanned should be float64") + filesScanned := int(filesScannedFloat) + + newItemsFloat, ok := status["new_items"].(float64) + require.True(s.T(), ok, "new_items should be float64") + newItems := int(newItemsFloat) + + errorsFloat, ok := status["errors"].(float64) + require.True(s.T(), ok, "errors should be float64") + errors := int(errorsFloat) + + assert.GreaterOrEqual(s.T(), progress, lastProgress) + lastProgress = progress + + assert.GreaterOrEqual(s.T(), filesScanned, lastFilesScanned) + lastFilesScanned = filesScanned + + assert.GreaterOrEqual(s.T(), newItems, lastNewItems) + assert.GreaterOrEqual(s.T(), errors, lastErrors) + + if status["status"] == "completed" || status["status"] == "failed" { + break + } + } + + assert.Equal(s.T(), 1.0, lastProgress) + assert.GreaterOrEqual(s.T(), lastFilesScanned, 0) +} + +func (s *ScannerIntegrationTestSuite) TestScanProgress_BatchingWorks() { + token := s.setup.Token + + createLibReq := map[string]interface{}{ + "name": "Batch Test Library", + "description": "Test library for batching", + "type": "ebooks", + } + createLibBody, _ := json.Marshal(createLibReq) + createLibURL := s.setup.Server.URL + "/api/libraries" + createLibReqHTTP, _ := http.NewRequest("POST", createLibURL, bytes.NewBuffer(createLibBody)) + createLibReqHTTP.Header.Set("Content-Type", "application/json") + createLibReqHTTP.Header.Set("Authorization", "Bearer "+token) + + client := &http.Client{} + createLibResp, err := client.Do(createLibReqHTTP) + require.NoError(s.T(), err) + + var createLibResponse map[string]interface{} + json.NewDecoder(createLibResp.Body).Decode(&createLibResponse) + createLibResp.Body.Close() + + libraryID, ok := createLibResponse["id"].(string) + require.True(s.T(), ok, "library_id should be string") + require.NotEmpty(s.T(), libraryID, "library_id should not be empty") + + folderURL := fmt.Sprintf("%s/api/libraries/%s/folders", s.setup.Server.URL, libraryID) + folderReq := map[string]interface{}{ + "folder_path": "/app/uploads", + } + folderBody, _ := json.Marshal(folderReq) + req, _ := http.NewRequest("POST", folderURL, bytes.NewBuffer(folderBody)) + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Authorization", "Bearer "+token) + + resp, err := client.Do(req) + require.NoError(s.T(), err) + resp.Body.Close() + + scanURL := fmt.Sprintf("%s/api/libraries/%s/scan", s.setup.Server.URL, libraryID) + scanReq, _ := http.NewRequest("POST", scanURL, nil) + scanReq.Header.Set("Authorization", "Bearer "+token) + + scanResp, err := client.Do(scanReq) + require.NoError(s.T(), err) + + var scanResponse map[string]interface{} + json.NewDecoder(scanResp.Body).Decode(&scanResponse) + scanResp.Body.Close() + + jobID, ok := scanResponse["job_id"].(string) + require.True(s.T(), ok, "job_id should be string") + require.NotEmpty(s.T(), jobID, "job_id should not be empty") + + updateCount := 0 + previousFilesScanned := -1 + + for i := 0; i < 20; i++ { + time.Sleep(500 * time.Millisecond) + + statusURL := fmt.Sprintf("%s/api/scanner/status/%s", s.setup.Server.URL, jobID) + statusReq, _ := http.NewRequest("GET", statusURL, nil) + statusReq.Header.Set("Authorization", "Bearer "+token) + + statusResp, _ := client.Do(statusReq) + + var status map[string]interface{} + err = json.NewDecoder(statusResp.Body).Decode(&status) + require.NoError(s.T(), err) + statusResp.Body.Close() + + filesScannedFloat, ok := status["files_scanned"].(float64) + require.True(s.T(), ok, "files_scanned should be float64") + filesScanned := int(filesScannedFloat) + + if filesScanned != previousFilesScanned { + updateCount++ + previousFilesScanned = filesScanned + } + + if status["status"] == "completed" || status["status"] == "failed" { + break + } + } + + assert.Less(s.T(), updateCount, 50) +} + +func TestScannerIntegrationTestSuite(t *testing.T) { + suite.Run(t, new(ScannerIntegrationTestSuite)) +} diff --git a/internal/services/worker_test.go b/internal/services/worker_test.go index fd362fd..86f5031 100644 --- a/internal/services/worker_test.go +++ b/internal/services/worker_test.go @@ -339,3 +339,81 @@ func TestWorker_ConcurrentJobProcessing(t *testing.T) { assert.Equal(t, jobCount, resultCount) } + +func TestWorker_JobResult_HasStatsFields(t *testing.T) { + worker := NewWorker(1) + defer worker.Shutdown() + + jobID := "test-job-stats" + + worker.mu.Lock() + worker.results[jobID] = &JobResult{ + JobID: jobID, + Status: JobStatusCompleted, + Progress: 1.0, + FilesScanned: 42, + NewItems: 5, + Errors: 1, + } + worker.mu.Unlock() + + result, exists := worker.GetJobStatus(jobID) + require.True(t, exists, "Job result should exist") + require.NotNil(t, result, "Result should not be nil") + + assert.Equal(t, jobID, result.JobID) + assert.Equal(t, JobStatusCompleted, result.Status) + assert.Equal(t, 1.0, result.Progress) + assert.Equal(t, 42, result.FilesScanned, "FilesScanned should be 42") + assert.Equal(t, 5, result.NewItems, "NewItems should be 5") + assert.Equal(t, 1, result.Errors, "Errors should be 1") +} + +func TestWorker_ProgressCallback_UpdatesJobResult(t *testing.T) { + worker := NewWorker(1) + defer worker.Shutdown() + + job := &Job{ + ID: "test-progress", + Type: JobTypeScan, + Status: JobStatusRunning, + Context: nil, + } + + job.ProgressCallback = func(progress float64, filesScanned, newItems, errors int) { + worker.mu.Lock() + defer worker.mu.Unlock() + + if result, exists := worker.results[job.ID]; exists { + result.Progress = progress + result.FilesScanned = filesScanned + result.NewItems = newItems + result.Errors = errors + } + } + + worker.mu.Lock() + worker.results[job.ID] = &JobResult{ + JobID: job.ID, + Status: JobStatusRunning, + } + worker.mu.Unlock() + + job.UpdateProgress(0.5, 10, 2, 0) + + result, exists := worker.GetJobStatus(job.ID) + require.True(t, exists) + assert.Equal(t, 0.5, result.Progress) + assert.Equal(t, 10, result.FilesScanned) + assert.Equal(t, 2, result.NewItems) + assert.Equal(t, 0, result.Errors) + + job.UpdateProgress(1.0, 20, 5, 1) + + result, exists = worker.GetJobStatus(job.ID) + require.True(t, exists) + assert.Equal(t, 1.0, result.Progress) + assert.Equal(t, 20, result.FilesScanned) + assert.Equal(t, 5, result.NewItems) + assert.Equal(t, 1, result.Errors) +}