refactor: pleasing the sonarqube

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Sep 13, 2022 · e54ae95 · e54ae95
1 parent b192408
commit e54ae95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/pkg/crud/list.go b/pkg/crud/list.go
@@ -20,6 +20,10 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
+func listLogger(pathname string) logger.Provider {
+	return logger.WithField("fn", "crud.list").WithField("item", pathname)
+}
+
 func (a App) list(ctx context.Context, request provider.Request, message renderer.Message, item absto.Item, files []absto.Item) (renderer.Page, error) {
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "list", trace.WithAttributes(attribute.String("item", item.Pathname)))
 	defer end()
@@ -32,7 +36,7 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 
 		directoryAggregate, err = a.exifApp.GetAggregateFor(ctx, item)
 		if err != nil && !absto.IsNotExist(err) {
-			logger.WithField("fn", "crud.list").WithField("item", item.Pathname).Error("get aggregate: %s", err)
+			listLogger(item.Pathname).Error("get aggregate: %s", err)
 		}
 	})
 
@@ -42,7 +46,7 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 
 		aggregates, err = a.exifApp.ListAggregateFor(ctx, files...)
 		if err != nil {
-			logger.WithField("fn", "crud.list").WithField("item", item.Pathname).Error("list exifs: %s", err)
+			listLogger(item.Pathname).Error("list exifs: %s", err)
 		}
 	})
 
@@ -55,7 +59,7 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 
 		thumbnails, err = a.thumbnailApp.ListDir(ctx, item)
 		if err != nil {
-			logger.WithField("fn", "crud.list").WithField("item", item.Pathname).Error("list thumbnail: %s", err)
+			listLogger(item.Pathname).Error("list thumbnail: %s", err)
 			return
 		}
 	}()

diff --git a/pkg/exif/aggregate.go b/pkg/exif/aggregate.go
@@ -38,7 +38,7 @@ func (a App) ListExifFor(ctx context.Context, items ...absto.Item) (map[string]e
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "list_exif")
 	defer end()
 
-	exifs, err := a.exifCacheApp.List(ctx, onExifError, items...)
+	exifs, err := a.exifCacheApp.List(ctx, onListError, items...)
 	if err != nil {
 		return nil, fmt.Errorf("list: %w", err)
 	}
@@ -70,7 +70,7 @@ func (a App) ListAggregateFor(ctx context.Context, items ...absto.Item) (map[str
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "list_aggregate")
 	defer end()
 
-	exifs, err := a.aggregateCacheApp.List(ctx, onAggregateError, items...)
+	exifs, err := a.aggregateCacheApp.List(ctx, onListError, items...)
 	if err != nil {
 		return nil, fmt.Errorf("list: %w", err)
 	}

diff --git a/pkg/exif/error.go b/pkg/exif/error.go
@@ -7,15 +7,7 @@ import (
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 )
 
-func onExifError(item absto.Item, err error) bool {
-	if !absto.IsNotExist(err) && !errors.Is(err, errInvalidItemType) {
-		logger.WithField("item", item.Pathname).Error("load exif: %s", item.Pathname, err)
-	}
-
-	return true
-}
-
-func onAggregateError(item absto.Item, err error) bool {
+func onListError(item absto.Item, err error) bool {
 	if !absto.IsNotExist(err) && !errors.Is(err, errInvalidItemType) {
 		logger.WithField("item", item.Pathname).Error("load exif: %s", item.Pathname, err)
 	}