test fixed

Signed-off-by: daveaugustus <[email protected]>

Author: daveaugustus

components/ingest-service/storage/db_test.go

@@ -23,8 +23,8 @@ func TestInsertReindexRequestSuccess(t *testing.T) {
 
 	createdAt := time.Now()
 
-	query := `INSERT INTO reindex_requests(request_id, status, created_at, last_updated) VALUES ($1, $2, $3, $4);`
-	mock.ExpectExec(query).WithArgs(sqlmock.AnyArg(), "running", createdAt, createdAt).WillReturnResult(sqlmock.NewResult(1, 1))
+	query := `INSERT INTO reindex_requests(status, created_at, last_updated) VALUES ($1, $2, $3) RETURNING id;`
+	mock.ExpectQuery(query).WithArgs("running", createdAt, createdAt).WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1))
 
 	requestID, err := db.InsertReindexRequest("running", createdAt)
 	assert.NoError(t, err)
@@ -42,11 +42,11 @@ func TestInsertReindexRequestFailure(t *testing.T) {
 
 	createdAt := time.Now()
 
-	query := `INSERT INTO reindex_requests(request_id, status, created_at, last_updated) VALUES ($1, $2, $3, $4);`
-	mock.ExpectExec(query).WithArgs(sqlmock.AnyArg(), "running", createdAt, createdAt).WillReturnError(fmt.Errorf("insert error"))
+	query := `INSERT INTO reindex_requests(status, created_at, last_updated) VALUES ($1, $2, $3) RETURNING id;`
+	mock.ExpectQuery(query).WithArgs("running", createdAt, createdAt).WillReturnError(fmt.Errorf("insert error"))
 
 	_, err = db.InsertReindexRequest("running", createdAt)
-	assert.Equal(t, "insert error", err.Error())
+	assert.Equal(t, "failed to insert reindex request: insert error", err.Error())
 }
 
 func TestUpdateReindexRequestSuccess(t *testing.T) {
@@ -60,7 +60,7 @@ func TestUpdateReindexRequestSuccess(t *testing.T) {
 
 	updatedAt := time.Now()
 
-	query := `UPDATE reindex_requests SET status = $1, last_updated = $2 WHERE request_id = $3;`
+	query := `UPDATE reindex_requests SET status = $1, last_updated = $2 WHERE id = $3;`
 	mock.ExpectExec(query).WithArgs("completed", updatedAt, 1).WillReturnResult(sqlmock.NewResult(1, 1))
 
 	err = db.UpdateReindexRequest(1, "completed", updatedAt)
@@ -78,91 +78,13 @@ func TestUpdateReindexRequestFailure(t *testing.T) {
 
 	updatedAt := time.Now()
 
-	query := `UPDATE reindex_requests SET status = $1, last_updated = $2 WHERE request_id = $3;`
+	query := `UPDATE reindex_requests SET status = $1, last_updated = $2 WHERE id = $3;`
 	mock.ExpectExec(query).WithArgs("completed", updatedAt, 1).WillReturnError(fmt.Errorf("update error"))
 
 	err = db.UpdateReindexRequest(1, "completed", updatedAt)
 	assert.Equal(t, "update error", err.Error())
 }
 
-func TestInsertReindexRequestDetailedSuccess(t *testing.T) {
-	dbConn, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
-	assert.NoError(t, err)
-	defer dbConn.Close()
-
-	db := &storage.DB{
-		DbMap: &gorp.DbMap{Db: dbConn, Dialect: gorp.PostgresDialect{}},
-	}
-
-	detail := storage.ReindexRequestDetailed{
-		RequestID:   1,
-		Index:       "index1",
-		FromVersion: "1.0",
-		ToVersion:   "2.0",
-		Stage:       []storage.StageDetail{{Stage: "stage1", Status: "running", UpdatedAt: time.Now()}},
-		OsTaskID:    "task1",
-		Heartbeat:   time.Now(),
-		HavingAlias: true,
-		AliasList:   "alias1,alias2",
-		CreatedAt:   time.Now(),
-		UpdatedAt:   time.Now(),
-	}
-
-	stageJSON, err := json.Marshal(detail.Stage)
-	assert.NoError(t, err)
-
-	// Mock the query to fetch existing stages
-	selectQuery := `SELECT stage FROM reindex_request_detailed WHERE request_id = $1 AND index = $2 ORDER BY updated_at DESC LIMIT 1`
-	mock.ExpectQuery(selectQuery).WithArgs(detail.RequestID, detail.Index).
-		WillReturnRows(sqlmock.NewRows([]string{"stage"}).AddRow(`[]`))
-
-	// Mock the insert query
-	query := `INSERT INTO reindex_request_detailed(request_id, index, from_version, to_version, stage, os_task_id, heartbeat, having_alias, alias_list, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11);`
-	mock.ExpectExec(query).WithArgs(detail.RequestID, detail.Index, detail.FromVersion, detail.ToVersion, stageJSON, detail.OsTaskID, sqlmock.AnyArg(), detail.HavingAlias, detail.AliasList, sqlmock.AnyArg(), sqlmock.AnyArg()).WillReturnResult(sqlmock.NewResult(1, 1))
-
-	err = db.InsertReindexRequestDetailed(detail, detail.CreatedAt)
-	assert.NoError(t, err)
-}
-
-func TestInsertReindexRequestDetailedFailure(t *testing.T) {
-	dbConn, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
-	assert.NoError(t, err)
-	defer dbConn.Close()
-
-	db := &storage.DB{
-		DbMap: &gorp.DbMap{Db: dbConn, Dialect: gorp.PostgresDialect{}},
-	}
-
-	detail := storage.ReindexRequestDetailed{
-		RequestID:   1,
-		Index:       "index1",
-		FromVersion: "1.0",
-		ToVersion:   "2.0",
-		Stage:       []storage.StageDetail{{Stage: "stage1", Status: "running", UpdatedAt: time.Now()}},
-		OsTaskID:    "task1",
-		Heartbeat:   time.Now(),
-		HavingAlias: true,
-		AliasList:   "alias1,alias2",
-		CreatedAt:   time.Now(),
-		UpdatedAt:   time.Now(),
-	}
-
-	stageJSON, err := json.Marshal(detail.Stage)
-	assert.NoError(t, err)
-
-	// Mock the query to fetch existing stages
-	selectQuery := `SELECT stage FROM reindex_request_detailed WHERE request_id = $1 AND index = $2 ORDER BY updated_at DESC LIMIT 1`
-	mock.ExpectQuery(selectQuery).WithArgs(detail.RequestID, detail.Index).
-		WillReturnRows(sqlmock.NewRows([]string{"stage"}).AddRow(`[]`))
-
-	// Mock the insert query to return an error
-	query := `INSERT INTO reindex_request_detailed(request_id, index, from_version, to_version, stage, os_task_id, heartbeat, having_alias, alias_list, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11);`
-	mock.ExpectExec(query).WithArgs(detail.RequestID, detail.Index, detail.FromVersion, detail.ToVersion, stageJSON, detail.OsTaskID, sqlmock.AnyArg(), detail.HavingAlias, detail.AliasList, sqlmock.AnyArg(), sqlmock.AnyArg()).WillReturnError(fmt.Errorf("insert error"))
-
-	err = db.InsertReindexRequestDetailed(detail, detail.CreatedAt)
-	assert.Equal(t, "insert error", err.Error())
-}
-
 func TestDeleteReindexRequestSuccess(t *testing.T) {
 	dbConn, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
 	assert.NoError(t, err)
@@ -172,7 +94,7 @@ func TestDeleteReindexRequestSuccess(t *testing.T) {
 		DbMap: &gorp.DbMap{Db: dbConn, Dialect: gorp.PostgresDialect{}},
 	}
 
-	query := `DELETE FROM reindex_requests WHERE request_id = $1;`
+	query := `DELETE FROM reindex_requests WHERE id = $1;`
 	mock.ExpectExec(query).WithArgs(1).WillReturnResult(sqlmock.NewResult(1, 1))
 
 	err = db.DeleteReindexRequest(1)
@@ -188,45 +110,13 @@ func TestDeleteReindexRequestFailure(t *testing.T) {
 		DbMap: &gorp.DbMap{Db: dbConn, Dialect: gorp.PostgresDialect{}},
 	}
 
-	query := `DELETE FROM reindex_requests WHERE request_id = $1;`
+	query := `DELETE FROM reindex_requests WHERE id = $1;`
 	mock.ExpectExec(query).WithArgs(1).WillReturnError(fmt.Errorf("delete error"))
 
 	err = db.DeleteReindexRequest(1)
 	assert.Equal(t, "delete error", err.Error())
 }
 
-func TestDeleteReindexRequestDetailSuccess(t *testing.T) {
-	dbConn, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
-	assert.NoError(t, err)
-	defer dbConn.Close()
-
-	db := &storage.DB{
-		DbMap: &gorp.DbMap{Db: dbConn, Dialect: gorp.PostgresDialect{}},
-	}
-
-	query := `DELETE FROM reindex_request_detailed WHERE id = $1;`
-	mock.ExpectExec(query).WithArgs(1).WillReturnResult(sqlmock.NewResult(1, 1))
-
-	err = db.DeleteReindexRequestDetail(1)
-	assert.NoError(t, err)
-}
-
-func TestDeleteReindexRequestDetailFailure(t *testing.T) {
-	dbConn, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
-	assert.NoError(t, err)
-	defer dbConn.Close()
-
-	db := &storage.DB{
-		DbMap: &gorp.DbMap{Db: dbConn, Dialect: gorp.PostgresDialect{}},
-	}
-
-	query := `DELETE FROM reindex_request_detailed WHERE id = $1;`
-	mock.ExpectExec(query).WithArgs(1).WillReturnError(fmt.Errorf("delete error"))
-
-	err = db.DeleteReindexRequestDetail(1)
-	assert.Equal(t, "delete error", err.Error())
-}
-
 func TestGetReindexStatusSuccess(t *testing.T) {
 	dbConn, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
 	assert.NoError(t, err)
@@ -242,8 +132,8 @@ func TestGetReindexStatusSuccess(t *testing.T) {
 	heartbeat := time.Now()
 
 	// Mock the reindex_requests table query
-	requestQuery := `SELECT request_id, status, created_at, last_updated FROM reindex_requests WHERE request_id = $1 ORDER BY last_updated DESC LIMIT 1;`
-	requestColumns := []string{"request_id", "status", "created_at", "last_updated"}
+	requestQuery := `SELECT id, status, created_at, last_updated FROM reindex_requests WHERE id = $1 ORDER BY last_updated DESC LIMIT 1;`
+	requestColumns := []string{"id", "status", "created_at", "last_updated"}
 	mock.ExpectQuery(requestQuery).WithArgs(requestID).
 		WillReturnRows(sqlmock.NewRows(requestColumns).AddRow(requestID, "completed", createdAt, updatedAt))
 
@@ -281,7 +171,7 @@ func TestGetReindexStatusFailure(t *testing.T) {
 	requestID := 1
 
 	// Mock the reindex_requests table query to return an error
-	requestQuery := `SELECT request_id, status, created_at, last_updated FROM reindex_requests WHERE request_id = $1 ORDER BY last_updated DESC LIMIT 1;`
+	requestQuery := `SELECT id, status, created_at, last_updated FROM reindex_requests WHERE id = $1 ORDER BY last_updated DESC LIMIT 1;`
 	mock.ExpectQuery(requestQuery).WithArgs(requestID).WillReturnError(fmt.Errorf("query error"))
 
 	// Call the function
@@ -306,8 +196,8 @@ func TestGetReindexStatusNoDetails(t *testing.T) {
 	updatedAt := time.Now()
 
 	// Mock the reindex_requests table query
-	requestQuery := `SELECT request_id, status, created_at, last_updated FROM reindex_requests WHERE request_id = $1 ORDER BY last_updated DESC LIMIT 1;`
-	requestColumns := []string{"request_id", "status", "created_at", "last_updated"}
+	requestQuery := `SELECT id, status, created_at, last_updated FROM reindex_requests WHERE id = $1 ORDER BY last_updated DESC LIMIT 1;`
+	requestColumns := []string{"id", "status", "created_at", "last_updated"}
 	mock.ExpectQuery(requestQuery).WithArgs(requestID).
 		WillReturnRows(sqlmock.NewRows(requestColumns).AddRow(requestID, "completed", createdAt, updatedAt))