SYNCT-30: Changed the audit save method

openmrs · Dec 18, 2017 · 68b17a1 · 68b17a1
1 parent 33671fe
commit 68b17a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/api/src/main/java/org/openmrs/module/sync2/api/dao/impl/SyncAuditDaoImpl.java b/api/src/main/java/org/openmrs/module/sync2/api/dao/impl/SyncAuditDaoImpl.java
@@ -52,24 +52,7 @@ public Long getCountOfMessages() {
     }
 
     public AuditMessage saveItem(AuditMessage auditMessage) {
-        Session session = sessionFactory.getHibernateSessionFactory().openSession();
-        Transaction tx = null;
-        try {
-            tx = session.beginTransaction();
-            session.saveOrUpdate(auditMessage);
-            tx.commit();
-        }
-        catch (Exception ex) {
-            if (tx != null) {
-                tx.rollback();
-            }
-            throw ex;
-        }
-        finally {
-            if (session != null) {
-                session.close();
-            }
-        }
+        getSession().saveOrUpdate(auditMessage);
         return auditMessage;
     }
 

diff --git a/api/src/main/java/org/openmrs/module/sync2/api/impl/SyncRetryServiceImpl.java b/api/src/main/java/org/openmrs/module/sync2/api/impl/SyncRetryServiceImpl.java
@@ -46,10 +46,14 @@ public AuditMessage retryMessage(AuditMessage message) throws APIException {
 
     private AuditMessage retryPush(AuditMessage message) {
         String parentAddress = configuration.getSyncConfiguration().getGeneral().getParentFeedLocation();
+        parentAddress = SyncUtils.getBaseUrl(parentAddress);
+
         Map<String, String> map = new HashMap<>();
         map.put(message.getLinkType(), message.getUsedResourceUrl());
-        message = syncPushService.readDataAndPushToParent(message.getResourceName(), map, parentAddress, message.getAction());
-        return message;
+
+        AuditMessage newMesssage = syncPushService.readDataAndPushToParent(message.getResourceName(), map, parentAddress, message.getAction());
+        syncAuditService.setNextAudit(message, newMesssage);
+        return newMesssage;
     }
 
     private AuditMessage retryPull(AuditMessage message) {