Merge pull request #260 from codecrafters-io/optimistic-locking-bugfix

Formatting Bugfix: `DataTypeAssertion`

Author: UdeshyaDhungana

go.mod

@@ -7,6 +7,7 @@ toolchain go1.24.2
 require (
 	github.com/codecrafters-io/tester-utils v0.4.15
 	github.com/dustin/go-humanize v1.0.1
+	github.com/fatih/color v1.18.0
 	github.com/hdt3213/rdb v1.2.0
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/pretty v1.2.1
@@ -16,7 +17,6 @@ require (
 require (
 	github.com/creack/pty v1.1.24 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.18.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect

internal/resp_assertions/data_type_assertion.go

@@ -11,22 +11,41 @@ type DataTypeAssertion struct {
 }
 
 func (a DataTypeAssertion) Run(value resp_value.Value) error {
-	dataTypeHint := ""
+	if value.Type == a.ExpectedType {
+		return nil
+	}
 
-	switch a.ExpectedType {
+	expectedDataTypeHint := a.getDataTypeHint(a.ExpectedType)
+	receivedDataTypeHint := a.getDataTypeHint(value.Type)
+
+	// Spacing
+	if expectedDataTypeHint != "" {
+		expectedDataTypeHint = fmt.Sprintf(" (%s)", expectedDataTypeHint)
+	}
+
+	if receivedDataTypeHint != "" {
+		receivedDataTypeHint = fmt.Sprintf(" (%s)", receivedDataTypeHint)
+	}
+
+	return fmt.Errorf(
+		"Expected %s%s, found %s%s",
+		a.ExpectedType, expectedDataTypeHint,
+		value.Type, receivedDataTypeHint,
+	)
+}
+
+func (a DataTypeAssertion) getDataTypeHint(dataType string) string {
+	dataTypeHint := ""
+	switch dataType {
 	case resp_value.NIL:
 		dataTypeHint = "$-1\r\n"
 	case resp_value.NIL_ARRAY:
 		dataTypeHint = "*-1\r\n"
 	}
 
-	// Spacing
 	if dataTypeHint != "" {
-		dataTypeHint = " " + dataTypeHint
+		dataTypeHint = FormatWithoutQuotes(dataTypeHint)
 	}
 
-	if value.Type != a.ExpectedType {
-		return fmt.Errorf("Expected %s%s, found %s", a.ExpectedType, dataTypeHint, value.Type)
-	}
-	return nil
+	return dataTypeHint
 }

internal/resp_assertions/utils.go

@@ -1,6 +1,9 @@
 package resp_assertions
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/fatih/color"
 )
 
@@ -17,3 +20,8 @@ func BuildExpectedVsReceivedErrorMessage(expectedValue string, receivedValue str
 	errorMsg += " \"" + receivedValue + "\""
 	return errorMsg
 }
+
+func FormatWithoutQuotes(input string) string {
+	formattedString := fmt.Sprintf("%q", input)
+	return strings.Trim(formattedString, "\"")
+}