From e263edf574ae645894014d3cb086143349fb8e10 Mon Sep 17 00:00:00 2001
From: Jordi Martin <jordimartin@gmail.com>
Date: Wed, 10 Apr 2024 16:55:05 +0200
Subject: [PATCH 1/2] Fixed the regression problem on JSON compartor (#166)

Co-authored-by: Jordi Martin <jordi.martin@signaturit.com>
---
 pkg/match/payload/json_comparator.go      | 29 ++++++++++-------------
 pkg/match/payload/json_comparator_test.go |  1 +
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkg/match/payload/json_comparator.go b/pkg/match/payload/json_comparator.go
index b4f4b73..07f19ed 100644
--- a/pkg/match/payload/json_comparator.go
+++ b/pkg/match/payload/json_comparator.go
@@ -3,10 +3,11 @@ package payload
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/jmartin82/mmock/v3/internal/config/logger"
 	"reflect"
 	"regexp"
 	"strings"
+
+	"github.com/jmartin82/mmock/v3/internal/config/logger"
 )
 
 var log = logger.Log
@@ -22,7 +23,7 @@ func isArray(s string) bool {
 func (jc *JSONComparator) doCompareJSONRegexUnmarshaled(patterns, values map[string]interface{}) bool {
 	var matches bool
 	matches = jc.match(patterns, values)
-	if !matches{
+	if !matches {
 		log.Debugf("values: %v don't match: %v", values, patterns)
 	}
 	return matches
@@ -63,8 +64,8 @@ func (jc *JSONComparator) doCompareArrayRegexUnmarshaled(patterns, values []map[
 
 	for i := 0; i < len(patterns); i++ {
 		if !jc.match(patterns[i], values[i]) {
-				log.Debugf("value %v doesn't match %v",
-					values[i], patterns[i])
+			log.Debugf("value %v doesn't match %v",
+				values[i], patterns[i])
 			return false
 		}
 	}
@@ -93,7 +94,7 @@ func (jc *JSONComparator) match(p, v map[string]interface{}) bool {
 			patternType = reflect.ValueOf(pattern).Kind()
 
 			if valueType == reflect.Map && patternType == reflect.Map {
-					log.Debugf("recursing into map %v", field)
+				log.Debugf("recursing into map %v", field)
 
 				result = jc.doCompareJSONRegexUnmarshaled(
 					pattern.(map[string]interface{}),
@@ -105,13 +106,13 @@ func (jc *JSONComparator) match(p, v map[string]interface{}) bool {
 			} else if (valueType == reflect.Array || valueType == reflect.Slice) &&
 				(patternType == reflect.Array || patternType == reflect.Slice) {
 
-					log.Debugf("recursing into array %v", field)
+				log.Debugf("recursing into array %v", field)
 				valueJsonBytes, err1 := json.Marshal(value)
 				patternJsonBytes, err2 := json.Marshal(pattern)
 
 				if err1 != nil || err2 != nil {
-						log.Errorf("value %v raised %v and pattern %v raised %v",
-							value, err1, pattern, err2)
+					log.Errorf("value %v raised %v and pattern %v raised %v",
+						value, err1, pattern, err2)
 					return false
 				}
 
@@ -121,15 +122,9 @@ func (jc *JSONComparator) match(p, v map[string]interface{}) bool {
 				if !result {
 					return false
 				}
-			} else {
-				var eql bool
-				eql = reflect.DeepEqual(pattern, value)
-
-				if !eql {
-						log.Debugf("value %v doesn't DeepEqual %v", value, pattern)
-				}
-
-				return eql
+			} else if eql := reflect.DeepEqual(pattern, value); !eql {
+				log.Debugf("value %v doesn't DeepEqual %v", value, pattern)
+				return false
 			}
 		}
 		matched, err := regexp.MatchString(str, fmt.Sprint(value))
diff --git a/pkg/match/payload/json_comparator_test.go b/pkg/match/payload/json_comparator_test.go
index e7c5af1..f028373 100644
--- a/pkg/match/payload/json_comparator_test.go
+++ b/pkg/match/payload/json_comparator_test.go
@@ -24,6 +24,7 @@ func TestJSONComparator_Compare(t *testing.T) {
 		{"Test different arrays", args{"[{\"name\":\"john\",\"age\":30}]", "[{\"age\":30,\"name\":\"bob\"}]"}, false},
 		{"Test different format", args{"{\"name\":\"bob\",\"age\":30}", "{\"name\" : \"bob\"\n,\"age\" : 30}"}, true},
 		{"Test different values", args{"{\"name\":\"bobs\",\"age\":30}", "{\"name\":\"bob\",\"age\":30}"}, false},
+		{"Test different values - Regression JSON check", args{"{\"age\":30,\"name\":\"Name 1\"}", "{\"age\":30,\"name\":\"Name 2\"}"}, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

From 66005a54eb3b80c0756e7662f1fd2bdadffac35b Mon Sep 17 00:00:00 2001
From: Jordi Martin <jordi.martin@signaturit.com>
Date: Wed, 10 Apr 2024 23:12:01 +0200
Subject: [PATCH 2/2] Ajust release scripts

---
 .gitignore      | 1 +
 .goreleaser.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4eb401b..1b5b177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ coverage.txt
 dist
 .vscode
 .idea
+.github/token
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 84920cc..2bb24fc 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -72,4 +72,4 @@ changelog:
       - typo
       - rollback
 env_files:
-  github_token: .github
\ No newline at end of file
+  github_token: .github/token
\ No newline at end of file