SAK-42887 - Samigo > Restore Assessments > When restoring published d…

…ate, date not updated (sakaiproject#7686)
kusmayady · Dec 17, 2019 · 2081522 · 2081522
1 parent e359353
commit 2081522
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/...es/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueries.java b/...es/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueries.java
@@ -2771,13 +2771,20 @@ public List<PublishedAssessmentData> getPublishedDeletedAssessments(final String
     }
 
     public void restorePublishedAssessment(Long publishedAssessmentId) {
-        final String recoverQuery = "update PublishedAssessmentData set status = :status WHERE publishedAssessmentId = :id";
-        getHibernateTemplate().execute(session -> {
-            Query q = session.createQuery(recoverQuery);
-            q.setInteger("status", AssessmentIfc.ACTIVE_STATUS);
-            q.setLong("id", publishedAssessmentId);
-            return q.executeUpdate();
-        });
+    	PublishedAssessmentData assessment = (PublishedAssessmentData) getHibernateTemplate().load(PublishedAssessmentData.class, publishedAssessmentId);
+    	assessment.setLastModifiedBy(AgentFacade.getAgentString());
+    	assessment.setLastModifiedDate(new Date());
+    	assessment.setStatus(AssessmentIfc.ACTIVE_STATUS);
+    	int retryCount = PersistenceService.getInstance().getPersistenceHelper().getRetryCount();
+    	while (retryCount > 0) {
+    		try {
+    			getHibernateTemplate().update(assessment);
+    			retryCount = 0;
+    		} catch (Exception e) {
+    			log.warn("problem updating asssessment: " + e.getMessage());
+    			retryCount = PersistenceService.getInstance().getPersistenceHelper()
+    					.retryDeadlock(e, retryCount);
+    		}
+    	}
     }
-
 }