Update ResultSet to only add new records to list if they don't already exist (#304)

kkajla12 · web-flow · commit a735b9cefd03 · 2024-03-05T15:20:27.000-08:00
diff --git a/pkg/authz/query/resultset.go b/pkg/authz/query/resultset.go
@@ -56,7 +56,8 @@ func (rs *ResultSet) Add(objectType string, objectId string, warrant warrant.War
 		next:       nil,
 	}
 
-	if existingRes, exists := rs.m[key(objectType, objectId)]; !exists || (existingRes.IsImplicit && !isImplicit) {
+	existingRes, exists := rs.m[key(objectType, objectId)]
+	if !exists {
 		// Add warrant to list
 		if rs.head == nil {
 			rs.head = newNode
@@ -67,7 +68,9 @@ func (rs *ResultSet) Add(objectType string, objectId string, warrant warrant.War
 		}
 
 		rs.tail = newNode
+	}
 
+	if !exists || (existingRes.IsImplicit && !isImplicit) {
 		// Add result node to map for O(1) lookups
 		rs.m[key(objectType, objectId)] = newNode
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ func (rs *ResultSet) Add(objectType string, objectId string, warrant warrant.War`
`56`	`56`	`next: nil,`
`57`	`57`	`}`
`58`	`58`
`59`		`- if existingRes, exists := rs.m[key(objectType, objectId)]; !exists \|\| (existingRes.IsImplicit && !isImplicit) {`
	`59`	`+ existingRes, exists := rs.m[key(objectType, objectId)]`
	`60`	`+ if !exists {`
`60`	`61`	`// Add warrant to list`
`61`	`62`	`if rs.head == nil {`
`62`	`63`	`rs.head = newNode`
`@@ -67,7 +68,9 @@ func (rs *ResultSet) Add(objectType string, objectId string, warrant warrant.War`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`rs.tail = newNode`
	`71`	`+ }`
`70`	`72`
	`73`	`+ if !exists \|\| (existingRes.IsImplicit && !isImplicit) {`
`71`	`74`	`// Add result node to map for O(1) lookups`
`72`	`75`	`rs.m[key(objectType, objectId)] = newNode`
`73`	`76`	`}`