Story/cite 237 - Sync job list needs to be filterable by group and jobs should deletable

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java

@@ -19,4 +19,6 @@ public interface ISyncJobManager {
 
     void cancelJob(String jobId);
 
+    void deleteJob(String jobId);
+
 }

citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java

@@ -89,4 +89,19 @@ public void cancelJob(String jobId) {
             jobRepo.save(job);
         }
     }
+
+    @Override
+    public void deleteJob(String jobId) {
+        Optional<GroupSyncJob> jobOptional = jobRepo.findById(jobId);
+        if (jobOptional.isPresent()) {
+            GroupSyncJob job = currentJobs.get(jobOptional.get().getGroupId());
+            if (job == null) {
+                job = jobOptional.get();
+            }
+//            job.setStatus(JobStatus.CANCELED);
+            job.setFinishedOn(OffsetDateTime.now());
+            jobRepo.delete(job);
+        }
+
+    }
 }

citesphere/src/main/java/edu/asu/diging/citesphere/web/DeleteSyncJobController.java

@@ -0,0 +1,21 @@
+package edu.asu.diging.citesphere.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import edu.asu.diging.citesphere.core.service.jobs.ISyncJobManager;
+
+@Controller
+public class DeleteSyncJobController {
+    @Autowired
+    private ISyncJobManager syncManager;
+
+    @RequestMapping(value = "/auth/jobs/sync/{jobId}/delete", method=RequestMethod.POST)
+    public String delete(@PathVariable String jobId) {
+        syncManager.deleteJob(jobId);        
+        return "redirect:/auth/jobs/sync/list";
+    }
+}

citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html

@@ -34,6 +34,7 @@ <h1>Jobs</h1>
 <th>Finished On</th>
 <th></th>
 <th></th>
+<th></th>
 </tr>
     <tr th:each="job:${jobs}"> 
         <td>[[${job.id}]]</td>
@@ -59,6 +60,14 @@ <h1>Jobs</h1>
 	            </button>
             </form>
         </td>
+        <td>
+            <form th:if="${#strings.equals(job.status,'DONE') or #strings.equals(job.status,'CANCELED')}" 
+                    th:action="@{|/auth/jobs/sync/${job.id}/delete|}" th:method="DELETE">
+	            <button type="submit" style="margin: -10px;" class="btn-link" title="Mark job as deleted">
+	               <i style="color: #303540; font-size: 14px" class="icon-trash" ></i>
+	            </button>
+            </form>
+        </td>
     </tr>
 </table>
 

citesphere/src/test/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManagerTest.java

@@ -0,0 +1,102 @@
+package edu.asu.diging.citesphere.core.service.jobs.impl;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.data.domain.PageRequest;
+
+import edu.asu.diging.citesphere.core.model.jobs.impl.GroupSyncJob;
+import edu.asu.diging.citesphere.core.repository.jobs.GroupSyncJobRepository;
+import edu.asu.diging.citesphere.core.service.ICitationManager;
+import edu.asu.diging.citesphere.model.bib.ICitationGroup;
+import edu.asu.diging.citesphere.model.bib.impl.CitationGroup;
+import edu.asu.diging.citesphere.user.impl.User;
+
+public class SyncJobManagerTest {
+
+    @InjectMocks
+    private SyncJobManager managerToTest;
+
+    @Mock
+    private GroupSyncJobRepository jobRepo;
+
+    @Mock
+    private ICitationManager citationManager;
+
+    private int page;
+    private int pageSize;
+    private List<ICitationGroup> citationGroupList;
+    private ICitationGroup citationGroup1;
+    private ICitationGroup citationGroup2;
+    private List<GroupSyncJob> groupSyncJobList;
+    private GroupSyncJob groupSyncJob1;
+    private GroupSyncJob groupSyncJob2;
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        managerToTest.init();
+        new User();
+        page = 1;
+        pageSize = 10;
+        PageRequest.of(page, pageSize);
+
+        citationGroup1 = new CitationGroup();
+        citationGroup1.setGroupId(1L);
+        citationGroup2 = new CitationGroup();
+        groupSyncJob1 = new GroupSyncJob();
+        groupSyncJob2 = new GroupSyncJob();
+
+        citationGroupList = new ArrayList<>();
+        citationGroupList.add(citationGroup1);
+        citationGroupList.add(citationGroup2);
+
+        groupSyncJobList = new ArrayList<>();
+        groupSyncJobList.add(groupSyncJob1);
+        groupSyncJobList.add(groupSyncJob2);
+
+        new ArrayList<>();
+
+        new ArrayList<>();
+    }
+
+    @Test
+    public void test_deleteJob_success() {
+        groupSyncJob1.setId("job1");
+        groupSyncJob1.setGroupId(String.valueOf(citationGroup1.getGroupId()));
+
+        when(jobRepo.findById("job1")).thenReturn(Optional.of(groupSyncJob1));
+
+        managerToTest.addJob(groupSyncJob1);
+
+        managerToTest.deleteJob("job1");
+
+        verify(jobRepo, times(1)).delete(groupSyncJob1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test_deleteJob_failed() {
+        groupSyncJob1.setId("job1");
+        groupSyncJob1.setGroupId(String.valueOf(citationGroup1.getGroupId()));
+
+        when(jobRepo.findById("job1")).thenReturn(Optional.of(groupSyncJob1));
+
+        doThrow(new IllegalArgumentException("entity is null"))
+            .when(jobRepo).delete(Mockito.any(GroupSyncJob.class));
+
+        managerToTest.deleteJob("job1");
+    }
+
+
+}