Use stringer for "enums" (#2144)

FerretDB · Mar 10, 2023 · 6082cbd · 6082cbd
1 parent 3e2a5ae
commit 6082cbd
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 20 deletions.
diff --git a/internal/handlers/common/update.go b/internal/handlers/common/update.go
@@ -260,19 +260,15 @@ func processRenameFieldExpression(doc *types.Document, update *types.Document) (
 		sourcePath, err := types.NewPathFromString(key)
 		if err != nil {
 			var pathErr *types.DocumentPathError
-
-			if errors.As(err, &pathErr) {
-				switch pathErr.Code() {
-				case types.ErrDocumentPathEmptyKey:
-					return false, commonerrors.NewWriteErrorMsg(
-						commonerrors.ErrEmptyName,
-						fmt.Sprintf("Cannot apply $rename to a value of non-numeric type. "+
-							"{_id: %s} has the field '%s' of non-numeric type object",
-							must.NotFail(doc.Get("_id")),
-							key,
-						),
-					)
-				}
+			if errors.As(err, &pathErr) && pathErr.Code() == types.ErrDocumentPathEmptyKey {
+				return false, commonerrors.NewWriteErrorMsg(
+					commonerrors.ErrEmptyName,
+					fmt.Sprintf("Cannot apply $rename to a value of non-numeric type. "+
+						"{_id: %s} has the field '%s' of non-numeric type object",
+						must.NotFail(doc.Get("_id")),
+						key,
+					),
+				)
 			}
 		}
 
@@ -289,13 +285,11 @@ func processRenameFieldExpression(doc *types.Document, update *types.Document) (
 				panic("getByPath returned error with invalid type")
 			}
 
-			switch dpe.Code() {
-			case types.ErrDocumentPathKeyNotFound,
-				types.ErrDocumentPathIndexOutOfBound:
+			if dpe.Code() == types.ErrDocumentPathKeyNotFound || dpe.Code() == types.ErrDocumentPathIndexOutOfBound {
 				continue
-			default:
-				return changed, commonerrors.NewWriteErrorMsg(commonerrors.ErrUnsuitableValueType, dpe.Error())
 			}
+
+			return changed, commonerrors.NewWriteErrorMsg(commonerrors.ErrUnsuitableValueType, dpe.Error())
 		}
 
 		// Remove old document

diff --git a/internal/types/document_validation.go b/internal/types/document_validation.go
@@ -24,12 +24,16 @@ import (
 	"github.com/FerretDB/FerretDB/internal/util/must"
 )
 
+//go:generate ../../bin/stringer -linecomment -type ValidationErrorCode
+
 // ValidationErrorCode represents ValidationData error code.
 type ValidationErrorCode int
 
 const (
+	_ ValidationErrorCode = iota
+
 	// ErrValidation indicates that document is invalid.
-	ErrValidation ValidationErrorCode = iota + 1
+	ErrValidation
 
 	// ErrWrongIDType indicates that _id field is invalid.
 	ErrWrongIDType

diff --git a/internal/types/documentpatherrorcode_string.go b/internal/types/documentpatherrorcode_string.go
diff --git a/internal/types/path.go b/internal/types/path.go
@@ -27,20 +27,29 @@ import (
 	"github.com/FerretDB/FerretDB/internal/util/must"
 )
 
+//go:generate ../../bin/stringer -linecomment -type DocumentPathErrorCode
+
 // DocumentPathErrorCode represents DocumentPathError error code.
 type DocumentPathErrorCode int
 
 const (
+	_ DocumentPathErrorCode = iota
+
 	// ErrDocumentPathKeyNotFound indicates that key was not found in document.
-	ErrDocumentPathKeyNotFound = iota + 1
+	ErrDocumentPathKeyNotFound
+
 	// ErrDocumentPathCannotAccess indicates that path couldn't be accessed.
 	ErrDocumentPathCannotAccess
+
 	// ErrDocumentPathArrayInvalidIndex indicates that provided array index is invalid.
 	ErrDocumentPathArrayInvalidIndex
+
 	// ErrDocumentPathIndexOutOfBound indicates that provided array index is out of bound.
 	ErrDocumentPathIndexOutOfBound
+
 	// ErrDocumentPathCannotCreateField indicates that it's impossible to create a specific field.
 	ErrDocumentPathCannotCreateField
+
 	// ErrDocumentPathEmptyKey indicates that provided path contains empty key.
 	ErrDocumentPathEmptyKey
 )

diff --git a/internal/types/validationerrorcode_string.go b/internal/types/validationerrorcode_string.go