SAK-49627 Lessons deleting comments tool should delete comments (saka…

…iproject#12271)
susowrc · Mar 21, 2024 · d502aa7 · d502aa7
1 parent 1b199ba
commit d502aa7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lessonbuilder/api/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDao.java b/lessonbuilder/api/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDao.java
@@ -346,4 +346,5 @@ public class PageData {
 
     public void deleteQuestionResponsesForItem(SimplePageItem item);
 
+    public void deleteCommentsForLessonsItem(SimplePageItem item);
 }
diff --git a/...r/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java b/...r/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java
@@ -1983,7 +1983,7 @@ public void deleteLogForLessonsItem(SimplePageItem item) {
 		}
 	}
 
-  public void deleteQuestionResponsesForItem(SimplePageItem item) {
+	public void deleteQuestionResponsesForItem(SimplePageItem item) {
 		try {
 			DetachedCriteria d = DetachedCriteria.forClass(SimplePageQuestionResponse.class).add(Restrictions.eq("questionId",item.getId()));
 			DetachedCriteria d2 = DetachedCriteria.forClass(SimplePageQuestionResponseTotals.class).add(Restrictions.eq("questionId",item.getId()));
@@ -1992,7 +1992,14 @@ public void deleteQuestionResponsesForItem(SimplePageItem item) {
 		} catch (DataAccessException e) {
 			log.error("Failed to delete SimplePageQuestion responses for item {}: {}", item.getId(), e.toString());
 		}
-
 	}
 
+	public void deleteCommentsForLessonsItem(SimplePageItem item) {
+		try {
+			DetachedCriteria d = DetachedCriteria.forClass(SimplePageComment.class).add(Restrictions.eq("itemId",item.getId()));
+			getHibernateTemplate().deleteAll(getHibernateTemplate().findByCriteria(d));
+		} catch (DataAccessException e) {
+			log.error("Failed to delete SimplePageComments for item {}: {}", item.getId(), e.toString());
+		}
+	}
 }
diff --git a/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java b/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
@@ -2197,6 +2197,11 @@ public String deleteItem(SimplePageItem item, boolean updateSequence) {
 			simplePageToolDao.deleteQuestionResponsesForItem(item);
 		}
 
+		//delete comment entries
+		if(item.getType() == SimplePageItem.COMMENTS) {
+			simplePageToolDao.deleteCommentsForLessonsItem(item);
+		}
+
 		// delete lessonsItem log
 		simplePageToolDao.deleteLogForLessonsItem(item);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -346,4 +346,5 @@ public class PageData {

		public void deleteQuestionResponsesForItem(SimplePageItem item);

		public void deleteCommentsForLessonsItem(SimplePageItem item);
		}