Merge pull request #49 from dserkowski/SYNCT-83

SYNCT-83: Fix audit log saving bugs
openmrs · Jan 9, 2018 · 567ae97 · 567ae97
2 parents 5687adc + 9b4f820
commit 567ae97
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/module/sync2/api/SyncAuditService.java b/api/src/main/java/org/openmrs/module/sync2/api/SyncAuditService.java
@@ -8,6 +8,7 @@
 import org.openmrs.module.sync2.api.model.audit.AuditMessage;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 public interface SyncAuditService extends OpenmrsService {
@@ -25,7 +26,7 @@ public interface SyncAuditService extends OpenmrsService {
     String getPaginatedMessages(Integer page, Integer pageSize, Boolean success, String action, String resourceName) throws APIException;
 
     @Authorized(SyncModuleConfig.SYNC_AUDIT_PRIVILEGE)
-    @Transactional
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     AuditMessage saveAuditMessage(AuditMessage auditMessage) throws APIException;
 
     @Authorized(SyncModuleConfig.SYNC_AUDIT_PRIVILEGE)

diff --git a/api/src/main/java/org/openmrs/module/sync2/api/impl/SyncAuditServiceImpl.java b/api/src/main/java/org/openmrs/module/sync2/api/impl/SyncAuditServiceImpl.java
@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import org.apache.commons.lang3.BooleanUtils;
 import org.openmrs.api.APIException;
 import org.openmrs.api.impl.BaseOpenmrsService;
 import org.openmrs.module.sync2.api.SyncAuditService;
@@ -51,9 +52,9 @@ public String getPaginatedMessages(Integer page, Integer pageSize, Boolean succe
 
     @Override
     public AuditMessage saveAuditMessage(AuditMessage auditMessage) {
-        boolean persistSuccessAudit = auditMessage.getSuccess()
+        boolean persistSuccessAudit = BooleanUtils.isTrue(auditMessage.getSuccess())
                 && configuration.getSyncConfiguration().getGeneral().isPersistSuccessAudit();
-        boolean persistFailureAudit = !auditMessage.getSuccess()
+        boolean persistFailureAudit = BooleanUtils.isFalse(auditMessage.getSuccess())
                 && configuration.getSyncConfiguration().getGeneral().isPersistFailureAudit();
         if (persistFailureAudit || persistSuccessAudit) {
             if (auditMessage.getTimestamp() == null) {

diff --git a/api/src/test/java/org/openmrs/module/sync2/api/impl/SyncAuditServiceImplTest.java b/api/src/test/java/org/openmrs/module/sync2/api/impl/SyncAuditServiceImplTest.java
@@ -143,6 +143,17 @@ public void saveAuditMessage_shouldSaveFailureAudit() {
         Assert.assertEquals(auditMessage, fetched);
     }
 
+    @Test
+    public void saveAuditMessage_shouldNotFailedIfBooleanObjectIsNotSet() {
+        AuditMessage auditMessage = new AuditMessage();
+
+        when(dao.saveItem(any())).thenReturn(auditMessage);
+        when(configurationService.getSyncConfiguration().getGeneral().isPersistSuccessAudit()).thenReturn(false);
+        when(configurationService.getSyncConfiguration().getGeneral().isPersistFailureAudit()).thenReturn(true);
+
+        auditService.saveAuditMessage(auditMessage);
+    }
+
     @Test
     public void saveAuditMessage_shouldNotSaveFailureAudit() {
         AuditMessage auditMessage = new AuditMessage();