Merge pull request #397 from iExecBlockchainComputing/feature/computing-tasks-endpoint

Feature/computing tasks endpoint

Author: james-toussaint

src/main/java/com/iexec/core/worker/WorkerController.java

@@ -165,13 +165,13 @@ public ResponseEntity<PublicConfiguration> getPublicConfiguration() {
     }
 
 
-    @GetMapping(path = "/workers/currenttasks")
-    public ResponseEntity<List<String>> getTasksInProgress(@RequestHeader("Authorization") String bearerToken) {
+    @GetMapping(path = "/workers/computing")
+    public ResponseEntity<List<String>> getComputingTasks(@RequestHeader("Authorization") String bearerToken) {
         String workerWalletAddress = jwtTokenProvider.getWalletAddressFromBearerToken(bearerToken);
         if (workerWalletAddress.isEmpty()) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED.value()).build();
         }
-        return ok(workerService.getChainTaskIds(workerWalletAddress));
+        return ok(workerService.getComputingTaskIds(workerWalletAddress));
     }
 
 }

src/main/java/com/iexec/core/worker/WorkerService.java

@@ -137,6 +137,15 @@ public List<String> getChainTaskIds(String walletAddress) {
         return Collections.emptyList();
     }
 
+    public List<String> getComputingTaskIds(String walletAddress) {
+        Optional<Worker> optional = workerRepository.findByWalletAddress(walletAddress);
+        if (optional.isPresent()) {
+            Worker worker = optional.get();
+            return worker.getComputingChainTaskIds();
+        }
+        return Collections.emptyList();
+    }
+
     public Optional<Worker> removeChainTaskIdFromWorker(String chainTaskId, String walletAddress) {
         Optional<Worker> optional = workerRepository.findByWalletAddress(walletAddress);
         if (optional.isPresent()) {

src/test/java/com/iexec/core/worker/WorkerControllerTests.java

@@ -250,9 +250,9 @@ public void shouldGetTasksInProgress() {
         List<String> list = List.of("t1", "t2");
         when(jwtTokenProvider.getWalletAddressFromBearerToken(TOKEN))
                 .thenReturn(WALLET);
-        when(workerService.getChainTaskIds(WALLET)).thenReturn(list);
+        when(workerService.getComputingTaskIds(WALLET)).thenReturn(list);
         ResponseEntity<List<String>> response =
-                workerController.getTasksInProgress(TOKEN);
+                workerController.getComputingTasks(TOKEN);
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
         assertThat(response.getBody()).isEqualTo(list);
     }
@@ -261,7 +261,7 @@ public void shouldGetTasksInProgress() {
     public void shouldNotGetTasksInProgressSinceUnauthorized() {
         when(jwtTokenProvider.getWalletAddressFromBearerToken(TOKEN)).thenReturn("");
         ResponseEntity<List<String>> response =
-                workerController.getTasksInProgress(TOKEN);
+                workerController.getComputingTasks(TOKEN);
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
     }
 

src/test/java/com/iexec/core/worker/WorkerServiceTests.java

@@ -305,6 +305,28 @@ public void shouldGetEmptyChainTaskIdListSinceWorkerNotFound() {
         when(workerRepository.findByWalletAddress(wallet)).thenReturn(Optional.empty());
         assertThat(workerService.getChainTaskIds(wallet)).isEmpty();
     }
+
+    // Computing task IDs
+
+    @Test
+    public void shouldGetComputingTaskIds() {
+        String wallet = "wallet";
+        List<String> list = List.of("t1", "t1");
+        Worker worker = Worker.builder()
+                .computingChainTaskIds(list)
+                .build();
+        when(workerRepository.findByWalletAddress(wallet)).thenReturn(Optional.of(worker));
+
+        assertThat(workerService.getComputingTaskIds(wallet)).isEqualTo(list);
+    }
+
+    @Test
+    public void shouldNotGetComputingTaskIdsSinceNoWorker() {
+        String wallet = "wallet";
+        when(workerRepository.findByWalletAddress(wallet)).thenReturn(Optional.empty());
+
+        assertThat(workerService.getComputingTaskIds(wallet)).isEmpty();
+    }
 
     // removeChainTaskIdFromWorker