Merge pull request #128 from ioito/hotfix/qx-duplicate-remove

fix: avoid remove duplicate db resource

util/compare/compare.go

@@ -107,6 +107,7 @@ func CompareSetsFunc(cs SCompareSet, removed interface{}, commonDB interface{},
 
 	errs := make([]error, 0)
 	newExtSetArray := make([]valueElement, 0)
+	duplicateMap := map[string]bool{}
 	for k, idx := range dupCheck {
 		if len(idx) > 1 {
 			if !storeDup {
@@ -119,6 +120,7 @@ func CompareSetsFunc(cs SCompareSet, removed interface{}, commonDB interface{},
 					dupArrays.Index(i).Set(extSetArray[idx[i]].value)
 				}
 				dupValue.SetMapIndex(reflect.ValueOf(k), dupArrays)
+				duplicateMap[k] = true
 			}
 		} else {
 			newExtSetArray = append(newExtSetArray, extSetArray[idx[0]])
@@ -151,7 +153,7 @@ func CompareSetsFunc(cs SCompareSet, removed interface{}, commonDB interface{},
 				i += 1
 				j += 1
 			} else if cmp < 0 {
-				if len(dbSetArray[i].key) > 0 {
+				if _, ok := duplicateMap[dbSetArray[i].key]; !ok && len(dbSetArray[i].key) > 0 {
 					newVal := reflect.Append(removedValue, dbSetArray[i].value)
 					removedValue.Set(newVal)
 				}
@@ -166,7 +168,7 @@ func CompareSetsFunc(cs SCompareSet, removed interface{}, commonDB interface{},
 			addedValue.Set(newVal)
 			j += 1
 		} else if j >= len(extSetArray) {
-			if len(dbSetArray[i].key) > 0 {
+			if _, ok := duplicateMap[dbSetArray[i].key]; !ok && len(dbSetArray[i].key) > 0 {
 				newVal := reflect.Append(removedValue, dbSetArray[i].value)
 				removedValue.Set(newVal)
 			}

util/compare/compare_test.go

@@ -111,6 +111,27 @@ func TestCompareSets2(t *testing.T) {
 			added:      []string{"6"},
 			duplicated: []string{"7"},
 		},
+		{
+			db: []LocalRes{
+				{Name: "1", ExternalId: ""},
+				{Name: "2", ExternalId: "2"},
+				{Name: "3", ExternalId: "3"},
+				{Name: "4", ExternalId: "4"},
+				{Name: "5", ExternalId: "5"},
+				{Name: "7", ExternalId: "7"},
+			},
+			remote: []RemoteRes{
+				{Name: "2", GlobalId: "2"},
+				{Name: "4", GlobalId: "4"},
+				{Name: "6", GlobalId: "6"},
+				{Name: "7-1", GlobalId: "7"},
+				{Name: "7-2", GlobalId: "7"},
+			},
+			common:     []string{"2", "4"},
+			removed:    []string{"3", "5"},
+			added:      []string{"6"},
+			duplicated: []string{"7"},
+		},
 	}
 	for _, d := range data {
 		removed := []LocalRes{}