Fixed task data to parse properly to list

bekk · Sep 1, 2023 · 5d3c608 · 5d3c608
1 parent 6132ce8
commit 5d3c608
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/db-scheduler-ui-frontend/src/assets/icons/RepeatIcon.tsx b/db-scheduler-ui-frontend/src/assets/icons/RepeatIcon.tsx
@@ -31,4 +31,5 @@ export const RepeatIcon = createIcon({
         strokeWidth="32"
       />
     </svg>
+  ),
 });
diff --git a/db-scheduler-ui-frontend/src/components/TaskCard.tsx b/db-scheduler-ui-frontend/src/components/TaskCard.tsx
@@ -41,7 +41,7 @@ const TaskCard: React.FC<TaskCardProps> = ({
       <TaskAccordionItem
         lastSuccess={lastSuccess && lastSuccess[0]}
         lastFailure={lastFailure}
-        taskData={taskData && JSON.parse(taskData)}
+        taskData={taskData}
       />
     </AccordionItem>
   );

diff --git a/db-scheduler-ui-frontend/src/components/TaskDataRow.tsx b/db-scheduler-ui-frontend/src/components/TaskDataRow.tsx
@@ -4,7 +4,9 @@ import React from 'react';
 export const TaskDataRow: React.FC<{ taskData: string | null }> = ({
   taskData,
 }) => {
-  const parsedData = JSON.parse(taskData || 'null');
+  console.log(taskData);
+  const parsedData = JSON.parse(taskData ? taskData[0] : 'null');
+  console.log(parsedData);
   return (
     <>
       {parsedData !== null && (

diff --git a/...cheduler-ui/src/main/java/com/github/bekk/dbscheduleruiapi/controller/TaskController.java b/...cheduler-ui/src/main/java/com/github/bekk/dbscheduleruiapi/controller/TaskController.java
@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
+@CrossOrigin
 @RequestMapping("/api")
 public class TaskController {
     private final TaskLogic taskLogic;

diff --git a/db-scheduler-ui/src/main/java/com/github/bekk/dbscheduleruiapi/model/TaskModel.java b/db-scheduler-ui/src/main/java/com/github/bekk/dbscheduleruiapi/model/TaskModel.java
@@ -1,4 +1,4 @@
-package com.github.bekk.dbscheduleruibackend.model;
+package com.github.bekk.dbscheduleruiapi.model;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -73,7 +73,8 @@ public List<String> getTaskData() {
     public void serializeTaskData(@Nullable List<Object> taskData) {
             System.out.println("TaskData: " + taskData);
             try {
-                this.taskData = Arrays.asList(objectMapper.writeValueAsString(taskData));
+                assert taskData != null;
+                this.taskData = Arrays.asList(objectMapper.writeValueAsString(taskData.get(0)));
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }

diff --git a/db-scheduler-ui/src/main/java/com/github/bekk/dbscheduleruiapi/util/mapper/TaskMapper.java b/db-scheduler-ui/src/main/java/com/github/bekk/dbscheduleruiapi/util/mapper/TaskMapper.java
@@ -1,6 +1,6 @@
-package com.github.bekk.dbscheduleruibackend.util.mapper;
+package com.github.bekk.dbscheduleruiapi.util.mapper;
 
-import com.github.bekk.dbscheduleruibackend.model.TaskModel;
+import com.github.bekk.dbscheduleruiapi.model.TaskModel;
 import com.github.kagkarlsson.scheduler.CurrentlyExecuting;
 import com.github.kagkarlsson.scheduler.ScheduledExecution;
 

diff --git a/example-app/src/main/java/com/github/bekk/exampleapp/ExampleApp.java b/example-app/src/main/java/com/github/bekk/exampleapp/ExampleApp.java
@@ -18,7 +18,9 @@ public CommandLineRunner runAllTasks(Scheduler scheduler) {
         return args -> {
             System.out.println("Running all tasks");
             TaskService taskService = new TaskService(scheduler);
+            System.out.println("TaskService created");
             taskService.runAllTasks();
+            System.out.println("tasks ran");
             };
         }
     }
diff --git a/example-app/src/main/java/com/github/bekk/exampleapp/tasks/SpawnerTask.java b/example-app/src/main/java/com/github/bekk/exampleapp/tasks/SpawnerTask.java
@@ -1,5 +1,6 @@
 package com.github.bekk.exampleapp.tasks;
 
+import com.github.bekk.exampleapp.model.TaskData;
 import com.github.kagkarlsson.scheduler.SchedulerClient;
 import com.github.kagkarlsson.scheduler.task.Task;
 import com.github.kagkarlsson.scheduler.task.helper.Tasks;
@@ -15,15 +16,15 @@ public static Task<?> runSpawner(){
                     final SchedulerClient client = ctx.getSchedulerClient();
                     final long randomUUID = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE;
 
-                    System.out.println("Scheduling spawned executions.");
                     for(int i = 0; i < 5; i++){
-                        client.schedule(runSpawned().instance("spawned " + randomUUID + " loopnr: " + i), Instant.now().plusSeconds(60));
+                        client.schedule(runSpawned().instance("spawned " + randomUUID + " loopnr: " + i,
+                                new TaskData(123,"{data: MASSIVEDATA}")), Instant.now().plusSeconds(60));
                     }
                 });
     }
 
-    public static Task<?> runSpawned (){
-        return Tasks.oneTime("onetime-spawned-task", Void.class)
+    public static Task<TaskData> runSpawned (){
+        return Tasks.oneTime("onetime-spawned-task", TaskData.class)
                 .execute((inst, ctx) -> {
                     System.out.println("Executed spawned task: " + inst.getTaskName()); 
                     try {
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,5 @@ export const RepeatIcon = createIcon({ @@
             strokeWidth="32"
           />
         </svg>
+      ),
     });