Skip to content
Snippets Groups Projects
Commit fb21bb97 authored by Johan de Klerk's avatar Johan de Klerk
Browse files

Deeper object changes for audit events

parent b9faf8ef
No related branches found
No related tags found
No related merge requests found
...@@ -38,27 +38,7 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{}, ...@@ -38,27 +38,7 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{},
// 0 = Object // 0 = Object
// 1 = field // 1 = field
objectKey := ToSnakeCase(change.Path[0]) ChildObjectChanges(changes, change.Path[0], change.Path[1], change.From, change.To)
field := ToSnakeCase(change.Path[1])
existingObject, present := changes[objectKey]
if present {
if object, ok := existingObject.(map[string]interface{}); ok {
object[field] = FieldChange{
From: change.From,
To: change.To,
}
changes[objectKey] = object
}
} else {
fieldChange := map[string]interface{}{
field: FieldChange{
From: change.From,
To: change.To,
},
}
changes[objectKey] = fieldChange
}
} else if len(change.Path) == 3 { } else if len(change.Path) == 3 {
// Array of objects // Array of objects
...@@ -69,6 +49,13 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{}, ...@@ -69,6 +49,13 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{},
objectKey := ToSnakeCase(change.Path[0]) objectKey := ToSnakeCase(change.Path[0])
indexString := change.Path[1] indexString := change.Path[1]
if !string_utils.IsNumericString(indexString) {
// Not an array, but an deeper nested object
ChildObjectChanges(changes, change.Path[len(change.Path)-2], change.Path[len(change.Path)-1], change.From, change.To)
continue
}
index, _ := string_utils.StringToInt64(indexString) index, _ := string_utils.StringToInt64(indexString)
field := ToSnakeCase(change.Path[2]) field := ToSnakeCase(change.Path[2])
...@@ -111,6 +98,30 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{}, ...@@ -111,6 +98,30 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{},
return changes, nil return changes, nil
} }
func ChildObjectChanges(changes map[string]interface{}, objectPath string, fieldPath string, changeFrom interface{}, changeTo interface{}) {
objectKey := ToSnakeCase(objectPath)
field := ToSnakeCase(fieldPath)
existingObject, present := changes[objectKey]
if present {
if object, ok := existingObject.(map[string]interface{}); ok {
object[field] = FieldChange{
From: changeFrom,
To: changeTo,
}
changes[objectKey] = object
}
} else {
fieldChange := map[string]interface{}{
field: FieldChange{
From: changeFrom,
To: changeTo,
},
}
changes[objectKey] = fieldChange
}
}
// GetAllChanges Returns the diff, structured in json, recursively // GetAllChanges Returns the diff, structured in json, recursively
// Be warned, here be dragons. Debug this first to understand how it works // Be warned, here be dragons. Debug this first to understand how it works
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment