refactor logging and filters

cmd/cli/commands/dimensiondispatcher.go

@@ -4,27 +4,28 @@ import (
 	"context"
 	"strings"
 
+	"git.loyso.art/frx/eway/internal/dimension"
 	"git.loyso.art/frx/eway/internal/entity"
-	"git.loyso.art/frx/eway/internal/matcher"
+
 	"github.com/rs/zerolog"
 )
 
 type dimensionDispatcher struct {
-	heigth matcher.Unit
-	width  matcher.Unit
-	length matcher.Unit
+	m *dimension.Matcher
 }
 
 func (d dimensionDispatcher) isDimensionParam(value string) bool {
-	return d.heigth.Match(value) || d.width.Match(value) || d.length.Match(value)
+	return d.m.Match(value) != dimension.MatchResultMiss
 }
 
 func (d dimensionDispatcher) dispatch(ctx context.Context, key, value string, in *entity.GoodsItemSize) (updated bool) {
-	if !d.isDimensionParam(key) {
+	matchResult := d.m.Match(key)
+	if matchResult == dimension.MatchResultMiss {
 		return false
 	}
 
 	log := zerolog.Ctx(ctx).With().Str("key", key).Str("value", value).Logger()
+
 	if strings.Contains(value, "/") {
 		dimensionValues := strings.Split(value, "/")
 		for _, dv := range dimensionValues {
@@ -39,40 +40,17 @@ func (d dimensionDispatcher) dispatch(ctx context.Context, key, value string, in
 
 		out = out.AdjustTo(entity.DimensionKindCentimeter)
 
-		updated = true
-		switch {
-		case d.heigth.Match(key):
+		switch matchResult {
+		case dimension.MatchResultHeight:
 			in.Height = out
-		case d.width.Match(key):
-			in.Width = out
-		case d.length.Match(key):
+		case dimension.MatchResultLength:
 			in.Length = out
-		default:
-			log.Error().Str("key", key).Msg("unable to find proper matcher")
-			updated = false
+		case dimension.MatchResultWidth:
+			in.Width = out
+		case dimension.MatchResultDepth:
+			in.UnmatchedDepth = out
 		}
 	}
 
-	return updated
-}
-
-func makeDefaultDimensionDispatcher() dimensionDispatcher {
-	h := matcher.NewRadix(matcher.RadixCaseInsensitive())
-	h.Register("Высота")
-	h.Register("Высота/*")
-
-	w := matcher.NewRadix(matcher.RadixCaseInsensitive())
-	w.Register("Ширина")
-	w.Register("Ширина/*")
-
-	l := matcher.NewRadix(matcher.RadixCaseInsensitive())
-	l.Register("Длина")
-	l.Register("Длина/*")
-	l.Register("Общ. длина")
-
-	return dimensionDispatcher{
-		heigth: h,
-		width:  w,
-		length: l,
-	}
+	return true
 }