SAK-48482: Home-Tasks Widget: If student changes priority on an assig…

…nment task, link to assignment is gone (sakaiproject#11543) * SAK-48482: Home-Tasks Widget: If student changes priority on an assignment task, link to assignment is gone * Update webapi/src/main/java/org/sakaiproject/webapi/controllers/TasksController.java * Remove blank lines at the end of classes --------- Co-authored-by: Adrian Fish <[email protected]>
lmphatsi · May 8, 2023 · 0dcc7c5 · 0dcc7c5
1 parent 350a564
commit 0dcc7c5
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/webapi/src/main/java/org/sakaiproject/webapi/controllers/TasksController.java b/webapi/src/main/java/org/sakaiproject/webapi/controllers/TasksController.java
@@ -100,12 +100,7 @@ public Map<String, Object> getTasks() throws UserNotDefinedException {
         data.put("tasks", taskService.getAllTasksForCurrentUser()
             .stream().map(bean -> {
                 try {
-                    Site site = siteService.getSite(bean.getSiteId());
-                    bean.setSiteTitle(site.getTitle());
-                    if (StringUtils.isNotBlank(bean.getReference()) && !bean.getReference().startsWith("/user/")) {
-                        entityManager.getUrl(bean.getReference(), Entity.UrlType.PORTAL).ifPresent(u -> bean.setUrl(u));	
-                    }
-                    bean.setTaskAssignedTo(getTaskAssignedDescription(bean.getTaskId(), site));
+                    updateUserTaskAdapterBean(bean);
                 } catch (IdUnusedException e) {
                     log.warn("No site for id {}", bean.getSiteId());
                 }
@@ -245,17 +240,15 @@ public UserTaskAdapterBean updateTask(@RequestBody UserTaskAdapterBean taskTrans
 
         checkSakaiSession();
 
-        UserTaskAdapterBean result = UserTaskAdapterBean.from(taskService.saveUserTask(taskTransfer));
-        if (!StringUtils.isEmpty(taskTransfer.getSiteId())) {
+        UserTaskAdapterBean bean = UserTaskAdapterBean.from(taskService.saveUserTask(taskTransfer));
+        if (!StringUtils.isEmpty(bean.getSiteId())) {
             try {
-                Site site = siteService.getSite(taskTransfer.getSiteId());
-                result.setSiteTitle(site.getTitle());
-                result.setTaskAssignedTo(getTaskAssignedDescription(taskTransfer.getTaskId(), site));
+                updateUserTaskAdapterBean(bean);
             } catch (IdUnusedException e) {
                 log.error(e.getMessage(), e);
             }
         }        
-        return result;
+        return bean;
     }
 
     @DeleteMapping("/tasks/{userTaskId}")
@@ -286,4 +279,20 @@ private String getTaskAssignedDescription(Long taskId, Site site) {
         return result;
     }
 
+    /**
+     * This method updates a UserTaskAdapterBean object.
+     *
+     * @param bean the UserTaskAdapterBean object to update
+     * @throws IdUnusedException if the specified site ID is invalid
+     */
+    private void updateUserTaskAdapterBean(UserTaskAdapterBean bean) throws IdUnusedException {
+
+        Site site = siteService.getSite(bean.getSiteId());
+
+        bean.setSiteTitle(site.getTitle());
+        if (StringUtils.isNotBlank(bean.getReference()) && !bean.getReference().startsWith("/user/")) {
+            entityManager.getUrl(bean.getReference(), Entity.UrlType.PORTAL).ifPresent(u -> bean.setUrl(u));
+        }
+        bean.setTaskAssignedTo(getTaskAssignedDescription(bean.getTaskId(), site));
+    }
 }