update DeleteArtifact method to accept transaction parameter and adjust related mocks

Signed-off-by: rafi <refaei.shikho@hotmail.com>

Author: refoo0

database/repositories/artifact_repository.go

@@ -54,15 +54,21 @@ func (r *artifactRepository) ReadArtifact(name string, assetVersionName string,
 	return artifact, err
 }
 
-func (r *artifactRepository) DeleteArtifact(assetID uuid.UUID, assetVersionName string, artifactName string) error {
-	err := r.db.Where("artifact_name = ? AND asset_version_name = ? AND asset_id = ?", artifactName, assetVersionName, assetID).Delete(&models.Artifact{}).Error
+func (r *artifactRepository) DeleteArtifact(tx *gorm.DB, assetID uuid.UUID, assetVersionName string, artifactName string) error {
+
+	db := r.db
+	if tx != nil {
+		db = tx
+	}
+
+	err := db.Where("artifact_name = ? AND asset_version_name = ? AND asset_id = ?", artifactName, assetVersionName, assetID).Delete(&models.Artifact{}).Error
 	if err != nil {
 		return err
 	}
 
 	r.FireAndForget(func() {
 		sql := CleanupOrphanedRecordsSQL
-		err = r.db.Exec(sql).Error
+		err = db.Exec(sql).Error
 		if err != nil {
 			slog.Error("Failed to clean up orphaned records after deleting artifact", "err", err)
 		}

mocks/mock_ArtifactRepository.go

@@ -87,7 +87,7 @@ func (s *ArtifactService) DeleteArtifact(assetID uuid.UUID, assetVersionName str
 		}
 
 		// Delete the artifact record itself
-		err = s.artifactRepository.DeleteArtifact(assetID, assetVersionName, artifactName)
+		err = s.artifactRepository.DeleteArtifact(tx, assetID, assetVersionName, artifactName)
 		if err != nil {
 			slog.Error("failed to delete artifact record", "assetID", assetID, "assetVersionName", assetVersionName, "artifactName", artifactName, "error", err)
 			return err

services/artifact_service.go

@@ -135,7 +135,7 @@ type ArtifactRepository interface {
 	utils.Repository[string, models.Artifact, DB]
 	GetByAssetIDAndAssetVersionName(assetID uuid.UUID, assetVersionName string) ([]models.Artifact, error)
 	ReadArtifact(name string, assetVersionName string, assetID uuid.UUID) (models.Artifact, error)
-	DeleteArtifact(assetID uuid.UUID, assetVersionName string, artifactName string) error
+	DeleteArtifact(tx DB, assetID uuid.UUID, assetVersionName string, artifactName string) error
 	GetAllArtifactAffectedByDependencyVuln(tx DB, vulnID string) ([]models.Artifact, error)
 	GetByAssetVersions(assetID uuid.UUID, assetVersionNames []string) ([]models.Artifact, error)
 }

shared/common_interfaces.go

@@ -3,7 +3,6 @@ package tests
 import (
 	"net/http/httptest"
 	"testing"
-	"time"
 
 	"github.com/l3montree-dev/devguard/database/models"
 	"github.com/l3montree-dev/devguard/dtos"
@@ -124,9 +123,6 @@ func TestArtifactControllerDeleteArtifact(t *testing.T) {
 			err := f.App.ArtifactController.DeleteArtifact(ctx)
 			assert.NoError(t, err)
 
-			// Wait for Fire and Forget to complete
-			time.Sleep(500 * time.Millisecond)
-
 			// Verify artifact was deleted
 			var deletedArtifact models.Artifact
 			err = f.DB.First(&deletedArtifact, "artifact_name = ? AND asset_id = ?", artifact1.ArtifactName, asset.ID).Error
@@ -271,9 +267,6 @@ func TestArtifactControllerDeleteArtifact(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Equal(t, 200, rec.Code)
 
-			// Wait for async operations to complete
-			time.Sleep(500 * time.Millisecond)
-
 			// Verify artifact was deleted
 			var deletedArtifact models.Artifact
 			err = f.DB.First(&deletedArtifact, "artifact_name = ? AND asset_id = ?", artifactSingle.ArtifactName, asset.ID).Error
@@ -348,9 +341,6 @@ func TestArtifactControllerDeleteArtifact(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Equal(t, 200, rec.Code)
 
-			// Wait for async operations to complete
-			time.Sleep(500 * time.Millisecond)
-
 			// Verify artifact1 was deleted
 			var deletedArtifact models.Artifact
 			err = f.DB.First(&deletedArtifact, "artifact_name = ? AND asset_id = ?", artifactMulti1.ArtifactName, asset.ID).Error