Merge pull request #2949 from IBM/issue-2471

Audit record for PUTs should not always use "Update" #2471
LinuxForHealth · Nov 8, 2021 · 3422fc6 · 3422fc6
2 parents d0156f4 + a7440c9
commit 3422fc6
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/fhir-server/src/main/java/com/ibm/fhir/server/util/RestAuditLogger.java b/fhir-server/src/main/java/com/ibm/fhir/server/util/RestAuditLogger.java
@@ -119,13 +119,17 @@ public static void logUpdate(HttpServletRequest request, Resource oldResource, R
 
         AuditLogService auditLogSvc = AuditLogServiceFactory.getService();
         if (auditLogSvc.isEnabled()) {
-            AuditLogEntry entry = initLogEntry(AuditLogEventType.FHIR_UPDATE);
-            populateAuditLogEntry(entry, request, updatedResource, startTime, endTime, responseStatus);
-
-            entry.getContext().setAction("U");
-            entry.setDescription("FHIR Update request");
-
-            auditLogSvc.logEntry(entry);
+            if (oldResource == null) {
+                // #2471 -  Audit record for PUTs should not always use "Update"
+                // If the oldResource is null, it doesn't exist and is actually treated as a CREATE.
+                RestAuditLogger.logCreate(request, updatedResource, startTime, endTime, responseStatus);
+            } else {
+                AuditLogEntry entry = initLogEntry(AuditLogEventType.FHIR_UPDATE);
+                populateAuditLogEntry(entry, request, updatedResource, startTime, endTime, responseStatus);
+                entry.getContext().setAction("U");
+                entry.setDescription("FHIR Update request");
+                auditLogSvc.logEntry(entry);
+            }
         }
         log.exiting(CLASSNAME, METHODNAME);
     }