Fixed checking for fields that are new in the post document and got a…

…udit hook to the point that we *could* do something with the data.. it doesn't do anything still

src/main/java/com/redhat/lightblue/hook/audit/AuditHook.java

@@ -1,7 +1,6 @@
 package com.redhat.lightblue.hook.audit;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.redhat.lightblue.config.LightblueFactory;
 import com.redhat.lightblue.crud.Operation;
 import com.redhat.lightblue.hooks.CRUDHook;
 import com.redhat.lightblue.hooks.HookDoc;
@@ -46,7 +45,6 @@ public void processHook(EntityMetadata md, HookConfiguration cfg, List<HookDoc>
         }
         AuditHookConfiguration auditConfig = (AuditHookConfiguration) cfg;
 
-        LightblueFactory factory = LightblueFactory.getInstance();
         try {
             Error.push(auditConfig.getEntityName());
             Error.push(auditConfig.getVersion());
@@ -55,6 +53,7 @@ public void processHook(EntityMetadata md, HookConfiguration cfg, List<HookDoc>
             for (HookDoc hd : processedDocuments) {
                 // find if each field changed
                 JsonNodeCursor preCursor = hd.getPreDoc().cursor();
+                JsonNodeCursor postCursor = hd.getPostDoc().cursor();
 
                 // record to hold changes
                 Map<Path, AuditData> audits = new HashMap<>();
@@ -67,9 +66,10 @@ public void processHook(EntityMetadata md, HookConfiguration cfg, List<HookDoc>
                         // non-container node, check if it changed
                         String preValue = node.asText();
                         // if operation is delete, post value doesn't exist.
-                        String postValue = hd.getOperation() == Operation.DELETE ? null : hd.getPostDoc().get(path).asText();
+                        JsonNode postNode = hd.getPostDoc().get(path);
+                        String postValue = hd.getOperation() == Operation.DELETE || postNode == null ? null : postNode.asText();
 
-                        if ((preValue != null && preValue.equals(postValue))
+                        if ((preValue != null && !preValue.equals(postValue))
                                 || (preValue == null && postValue != null)) {
                             // something changed! audit it..
                             AuditData ad = new AuditData();
@@ -82,6 +82,35 @@ public void processHook(EntityMetadata md, HookConfiguration cfg, List<HookDoc>
                     // else continue processing
                 }
 
+                while (postCursor.next()) {
+                    Path path = postCursor.getCurrentPath();
+                    JsonNode node = postCursor.getCurrentNode();
+
+                    // shortcut, don't check if we have an audit for the path already
+                    if (!audits.containsKey(path) && node.isValueNode()) {
+                        // non-container node, check if it changed
+                        JsonNode preNode = hd.getPreDoc().get(path);
+                        String preValue = preNode == null ? null : preNode.asText();
+                        String postValue = node.asText();
+
+                        if ((preValue != null && !preValue.equals(postValue))
+                                || (preValue == null && postValue != null)) {
+                            // something changed! audit it..
+                            AuditData ad = new AuditData();
+                            ad.path = path;
+                            ad.pre = preValue;
+                            ad.post = postValue;
+                            audits.put(path, ad);
+                        }
+                    }
+                    // else continue processing
+                }
+
+                // if there's nothing to audit, stop
+                if (audits.isEmpty()) {
+                    return;
+                }
+
                 List<JsonNode> identifyingNodes = new ArrayList<>();
 
                 if (!audits.isEmpty()) {
@@ -133,6 +162,8 @@ public void processHook(EntityMetadata md, HookConfiguration cfg, List<HookDoc>
 
                     // and close it
                     buff.append("]}");
+
+                    // TODO do something with this...
                 }
             }
         } finally {

src/test/java/com/redhat/lightblue/hook/audit/CountryAuditHookTest.java

@@ -188,4 +188,37 @@ public void noMissingIdentifyingFields() throws Exception {
         // process hook
         hook.processHook(em, config, processedDocuments);
     }
+
+    /**
+     * Check side effect when there is a difference between pre and post documents.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void differentPreAndPost() throws Exception {
+        String jsonSchemaString = FileUtil.readFile(COUNTRY_METADATA_FILENAME);
+        EntityMetadata em = parser.parseEntityMetadata(json(jsonSchemaString));
+
+        // create hook configuration
+        AuditHookConfiguration config = new AuditHookConfiguration(em.getName(), em.getVersion().getValue());
+
+        // ------------------------------------------------------------
+        // mock up document data
+        List<HookDoc> processedDocuments = new ArrayList<>();
+
+        // need a json node for pre and post data.  will create together to make easier
+        JsonNode pre = json(FileUtil.readFile(getClass().getSimpleName() + "-differentPreAndPost-pre.json"));
+        JsonNode post = json(FileUtil.readFile(getClass().getSimpleName() + "-differentPreAndPost-post.json"));
+
+        HookDoc hd = new HookDoc(em, new JsonDoc(pre), new JsonDoc(post), Operation.UPDATE);
+
+        processedDocuments.add(hd);
+        // ------------------------------------------------------------
+
+        // create hook
+        AuditHook hook = new AuditHook();
+
+        // process hook
+        hook.processHook(em, config, processedDocuments);
+    }
 }

src/test/resources/CountryAuditHookTest-differentPreAndPost-post.json

@@ -0,0 +1,6 @@
+{
+    "name": "United States of America",
+    "iso2Code": "US",
+    "iso3Code": "USA",
+    "optionalField": "changed"
+}

src/test/resources/CountryAuditHookTest-differentPreAndPost-pre.json

@@ -0,0 +1,5 @@
+{
+    "name": "United States of America",
+    "iso2Code": "US",
+    "iso3Code": "USA"
+}

src/test/resources/CountryAuditHookTest-missingAllIdentifyingFields-post.json

@@ -1,3 +1,4 @@
 {
-    "name": "United States of America"
+    "name": "United States of America",
+    "optionalField": "changed"
 }

src/test/resources/CountryAuditHookTest-missingOneIdentifyingField-post.json

@@ -1,4 +1,5 @@
 {
     "name": "United States of America",
-    "iso2Code": "US"
+    "iso2Code": "US",
+    "optionalField": "changed"
 }

src/test/resources/CountryAuditHookTest-noMissingIdentifyingFields-post.json

@@ -1,5 +1,6 @@
 {
     "name": "United States of America",
     "iso2Code": "US",
-    "iso3Code": "USA"
+    "iso3Code": "USA",
+    "optionalField": "changed"
 }

src/test/resources/metadata/country.json

@@ -54,6 +54,9 @@
                 "constraints": {
                     "identity": true
                 }
+            },
+            "optionalField": {
+                "type": "string"
             }
         }
     }