SAK-33492 Assignment move asn.new.asignment event to after its fully …

…initialized (sakaiproject#5108)
JackyCheungBoy · Dec 11, 2017 · 7be4ec7 · 7be4ec7
1 parent 2076a3b
commit 7be4ec7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
@@ -690,9 +690,10 @@ public Assignment addAssignment(String context) throws PermissionException {
 
         log.debug("Created new assignment {}", assignment.getId());
 
-        String reference = AssignmentReferenceReckoner.reckoner().assignment(assignment).reckon().getReference();
-        // event for tracking
-        eventTrackingService.post(eventTrackingService.newEvent(AssignmentConstants.EVENT_ADD_ASSIGNMENT, reference, true));
+        // String reference = AssignmentReferenceReckoner.reckoner().assignment(assignment).reckon().getReference();
+        // AssignmentAction#post_save_assignment contains the logic for adding a new assignment
+        // the event should come at the end of that logic, eventually that logic should be moved here
+        // eventTrackingService.post(eventTrackingService.newEvent(AssignmentConstants.EVENT_ADD_ASSIGNMENT, reference, true));
 
         return assignment;
     }

diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -7465,11 +7465,13 @@ private void post_save_assignment(RunData data, String postOrSave) {
         }
 
         Assignment a;
+        boolean newAssignment = false;
         // if there is no assignmentId
         if (StringUtils.isBlank(assignmentId)) {
             //  create a new assignment
             try {
                 a = assignmentService.addAssignment(siteId);
+                newAssignment = true;
             } catch (PermissionException e) {
                 log.warn("Could not create new assignment for site: {}, {}", siteId, e.getMessage());
                 addAlert(state, rb.getFormattedMessage("youarenot_editAssignment", siteId));
@@ -7846,6 +7848,10 @@ private void post_save_assignment(RunData data, String postOrSave) {
                     }
                 }
             }
+            if (newAssignment) {
+                // post new assignment event since it is fully initialized by now
+                eventTrackingService.post(eventTrackingService.newEvent(AssignmentConstants.EVENT_ADD_ASSIGNMENT, assignmentReference, true));
+            }
         }
     }