Feature: get & detele user sample task

Author: RandallDW

backend/src/main/java/com/bulletjournal/templates/controller/WorkflowController.java

@@ -44,6 +44,8 @@ public class WorkflowController {
     public static final String CATEGORY_STEPS_ROUTE = "/api/categories/{categoryId}/steps";
     public static final String SUBSCRIBED_CATEGORIES_ROUTE = "/api/subscribedCategories";
     public static final String AUDIT_SAMPLE_TASK_ROUTE = "/api/sampleTasks/{sampleTaskId}/audit";
+    public static final String USER_SAMPLE_TASKS_ROUTE = "/api/sampleTasks/userSampleTasks";
+    public static final String REMOVE_USER_SAMPLE_TASK_ROUTE = "/api/sampleTasks/{sampleTaskId}/removeUserSampleTask";
 
     @Autowired
     private SampleTaskDaoJpa sampleTaskDaoJpa;
@@ -72,6 +74,9 @@ public class WorkflowController {
     @Autowired
     private UserClient userClient;
 
+    @Autowired
+    private UserSampleTaskDaoJpa userSampleTaskDaoJpa;
+
     private static final Gson GSON = new Gson();
 
     @GetMapping(SUBSCRIBED_CATEGORIES_ROUTE)
@@ -359,6 +364,26 @@ public SampleTask auditSampleTask(@NotNull @PathVariable Long sampleTaskId,
         return this.sampleTaskDaoJpa.auditSampleTask(sampleTaskId, auditSampleTaskParams).toPresentationModel();
     }
 
+    @GetMapping(USER_SAMPLE_TASKS_ROUTE)
+    public List<SampleTask> getUserSampleTasks() {
+        String requester = MDC.get(UserClient.USER_NAME_KEY);
+        List<UserSampleTask> userSampleTasks =  userSampleTaskDaoJpa.getUserSampleTaskByUserName(requester);
+
+        List<SampleTask> sampleTasks = new ArrayList<>();
+        for (UserSampleTask userSampleTask: userSampleTasks) {
+           sampleTasks.add(userSampleTask.getSampleTask().toPresentationModel());
+        }
+
+        return sampleTasks;
+    }
+
+    @DeleteMapping(REMOVE_USER_SAMPLE_TASK_ROUTE)
+    public void removeUserSampleTask(@NotNull @PathVariable Long sampleTaskId) {
+        String requester = MDC.get(UserClient.USER_NAME_KEY);
+        boolean isRemoved = this.userSampleTaskDaoJpa.removeUserSampleTask(requester, sampleTaskId);
+        System.out.println(isRemoved);
+    }
+
     private void validateRequester() {
         String requester = MDC.get(UserClient.USER_NAME_KEY);
 

backend/src/main/java/com/bulletjournal/templates/repository/UserSampleTaskDaoJpa.java

@@ -1,5 +1,6 @@
 package com.bulletjournal.templates.repository;
 
+import com.bulletjournal.exceptions.ResourceNotFoundException;
 import com.bulletjournal.repository.UserDaoJpa;
 import com.bulletjournal.repository.models.User;
 import com.bulletjournal.templates.repository.model.UserSampleTask;
@@ -38,4 +39,14 @@ public List<UserSampleTask> getUserSampleTaskByUserName(String username) {
   public boolean checkExist(UserSampleTaskKey userSampleTaskKey) {
     return userSampleTaskRepository.existsById(userSampleTaskKey);
   }
+
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public boolean removeUserSampleTask(String requester, Long sampleTaskId) {
+    User user = this.userDaoJpa.getByName(requester);
+    UserSampleTaskKey userSampleTaskKey = new UserSampleTaskKey(user.getId(), sampleTaskId);
+    UserSampleTask userSampleTask = this.userSampleTaskRepository.findById(userSampleTaskKey)
+            .orElseThrow(() -> new ResourceNotFoundException("UserSampleTask not found"));
+    this.userSampleTaskRepository.delete(userSampleTask);
+    return !this.userSampleTaskRepository.findById(userSampleTaskKey).isPresent();
+  }
 }