feat: ES-141 remove unused methods

Author: matiasdaloia

backend/repository/mocks/mock_ScanossSettingsRepository.go

@@ -34,7 +34,6 @@ type ScanossSettingsRepository interface {
 	ClearAllFilters() error
 	GetSettings() *entities.SettingsFile
 	GetDeclaredPurls() []string
-	MatchesScanningSkipPattern(path string) bool
 	CommitStagedSkipPatterns() error
 	DiscardStagedSkipPatterns() error
 	GetEffectiveSkipPatterns() []string

backend/repository/scanoss_settings_repository.go

@@ -232,34 +232,6 @@ func extractPurlsFromBom(componentFilters []entities.ComponentFilter) []string {
 	return extractedPurls
 }
 
-func (r *ScanossSettingsJsonRepository) MatchesScanningSkipPattern(path string) bool {
-	patterns := r.getScanningSkipPatterns()
-
-	var matchers []gitignore.Pattern
-	for _, pattern := range patterns {
-		matcher := gitignore.ParsePattern(pattern, nil)
-		matchers = append(matchers, matcher)
-	}
-
-	ps := gitignore.NewMatcher(matchers)
-
-	isDir := false
-	fileInfo, err := os.Stat(path)
-	if err != nil {
-		log.Debug().Err(err).Msgf("Error checking if path is directory: %s", path)
-	} else {
-		isDir = fileInfo.IsDir()
-	}
-
-	pathParts := strings.Split(path, "/")
-	return ps.Match(pathParts, isDir)
-}
-
-func (r *ScanossSettingsJsonRepository) getScanningSkipPatterns() []string {
-	sf := r.GetSettings()
-	return append(r.defaultSkipPatterns, sf.Settings.Skip.Patterns.Scanning...)
-}
-
 func (r *ScanossSettingsJsonRepository) generateDefaultSkipPatterns() []string {
 	defaultSkipPatterns := make([]string, 0, len(entities.DefaultSkippedDirExtensions)+len(entities.DefaultSkippedExtensions)+len(entities.DefaultSkippedDirs)+len(entities.DefaultSkippedFiles))
 

backend/repository/scanoss_settings_repository_json_impl.go

@@ -116,7 +116,7 @@ func (s *TreeServiceImpl) buildTree(path string, node *entities.TreeNode) error
 				childNode.WorkflowState = calculateFolderWorkflowState(childNode.Children)
 				childNode.ScanningSkipState = s.calculateFolderScanningSkipState(childNode)
 			} else {
-				childNode.ScanningSkipState = s.calculateScanningSkipState(absPath)
+				childNode.ScanningSkipState = s.calculateScanningSkipState(resultRelativePath)
 			}
 
 			childrenChan <- childNode
@@ -145,17 +145,15 @@ func (s *TreeServiceImpl) buildTree(path string, node *entities.TreeNode) error
 	return nil
 }
 
-func (s *TreeServiceImpl) calculateScanningSkipState(absPath string) entities.SkipState {
-	if s.scanossSettingsRepo.MatchesEffectiveScanningSkipPattern(absPath) {
+func (s *TreeServiceImpl) calculateScanningSkipState(path string) entities.SkipState {
+	if s.scanossSettingsRepo.MatchesEffectiveScanningSkipPattern(path) {
 		return entities.SkipStateExcluded
 	}
 	return entities.SkipStateIncluded
 }
 
 func (s *TreeServiceImpl) calculateFolderScanningSkipState(node entities.TreeNode) entities.SkipState {
-	absPath := filepath.Join(config.GetInstance().GetScanRoot(), node.Path)
-
-	if s.scanossSettingsRepo.MatchesEffectiveScanningSkipPattern(absPath) {
+	if s.scanossSettingsRepo.MatchesEffectiveScanningSkipPattern(node.Path) {
 		return entities.SkipStateExcluded
 	}
 

backend/service/tree_service_impl.go

@@ -95,7 +95,7 @@ func TestGetTree(t *testing.T) {
 	defer unpatch() // Restore original config after test
 
 	mockScanossSettingsRepository := repositoryMocks.NewMockScanossSettingsRepository(t)
-	mockScanossSettingsRepository.EXPECT().MatchesScanningSkipPattern(mock.AnythingOfType("string")).Return(false).Times(7)
+	mockScanossSettingsRepository.EXPECT().MatchesEffectiveScanningSkipPattern(mock.AnythingOfType("string")).Return(false).Times(7)
 
 	mockResultService := mocks.NewMockResultService(t)
 	mockResultService.EXPECT().GetByPath(mock.AnythingOfType("string")).Return(entities.ResultDTO{}).Times(7)