SAK-48038 CLONE - Forums - Error when grading a forum if the gradebook item was deleted (sakaiproject#11020)

Author: jesusmmp

msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java

@@ -127,6 +127,7 @@
 import org.sakaiproject.exception.InUseException;
 import org.sakaiproject.exception.PermissionException;
 import org.sakaiproject.portal.util.PortalUtils;
+import org.sakaiproject.grading.api.AssessmentNotFoundException;
 import org.sakaiproject.grading.api.Assignment;
 import org.sakaiproject.grading.api.GradeDefinition;
 import org.sakaiproject.grading.api.GradeType;
@@ -4470,13 +4471,36 @@ private String processDfMsgGrdHelper(String userId, String msgAssignmentName) {
       selectedForum.setGradeAssign(forumDefaultAssignment);
     }
 
-    if (selAssignmentName != null) {
-      setUpGradeInformation(gradebookUid, selAssignmentName, userId);
-    } else {
-      // this is the "Select a gradebook item" selection
-      allowedToGradeItem = false;
-      selGBItemRestricted = true;
-    }
+
+
+    try {
+    	if (selAssignmentName != null) {
+    		setUpGradeInformation(gradebookUid, selAssignmentName, userId);
+    	} else {
+    		// this is the "Select a gradebook item" selection
+    		allowedToGradeItem = false;
+    		selGBItemRestricted = true;
+    	}
+    	}catch (AssessmentNotFoundException e) {
+    		if (msgAssignmentName !=null && msgAssignmentName.trim().length()>0) {
+    			Message msg = selectedMessage.getMessage();
+    			msg.setGradeAssignmentName(null);
+    			msg = forumManager.saveMessage(msg);
+    			selectedMessage.setMessage(msg);
+    		} else if (topicDefaultAssignment != null && topicDefaultAssignment.trim().length() > 0) {
+    			DiscussionTopic dt = selectedTopic.getTopic();
+    			dt.setDefaultAssignName(null);
+    			dt = forumManager.saveTopic(dt);
+    			selectedTopic.setTopic(dt);
+    		} else if (forumDefaultAssignment != null && forumDefaultAssignment.trim().length() > 0) {
+    			DiscussionForum df = selectedForum.getForum();
+    			df.setDefaultAssignName(null);
+    			df = forumManager.saveForum(df);
+    			selectedForum.setForum(df);
+    		}
+    		allowedToGradeItem = false;
+    		selGBItemRestricted = true;
+    	}
 
     return GRADE_MESSAGE;
   }

msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/DiscussionMessageBean.java

@@ -624,4 +624,8 @@ private UIPermissionsManager getUIPermissionsManager()
 	public int getWordCount() {
 		return new StringTokenizer(message.getBody()).countTokens();
 	}
+
+	public void setMessage(Message message) {
+		this.message = message;
+	}
 }

msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumStatisticsBean.java

@@ -2835,7 +2835,7 @@ public void setDefaultSelectedAssign(){
 					Assignment assignment = getGradingService().getAssignmentByNameOrId(toolManager.getCurrentPlacement().getContext(), defaultAssignName);
 					setDefaultSelectedAssign(assignment.getName());
 				} catch (Exception ex) {
-					log.error("MessageForumStatisticsBean - setDefaultSelectedAssign: " + ex);
+					log.warn("MessageForumStatisticsBean - setDefaultSelectedAssign: " + ex);
 				}
 			}
 		}