From 3fb0b63e675afaed0937a129f1ee0dffec43ad42 Mon Sep 17 00:00:00 2001
From: Michael Burman <michael.burman@datastax.com>
Date: Wed, 20 Sep 2023 11:31:06 +0300
Subject: [PATCH] Correctly serialize and deserialize the statusChanges field

---
 .../java/com/datastax/mgmtapi/NodeOpsProvider.java | 14 ++++++++++++--
 .../com/datastax/mgmtapi/resources/models/Job.java | 14 +++++++++++---
 .../datastax/mgmtapi/K8OperatorResourcesTest.java  |  8 +++++++-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
index eb74e3e9..c2d1ab31 100644
--- a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
+++ b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
@@ -23,6 +23,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
+import com.google.common.collect.Lists;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -79,8 +80,8 @@ public synchronized void unregister() {
   }
 
   @Rpc(name = "jobStatus")
-  public Map<String, String> getJobStatus(@RpcParam(name = "job_id") String jobId) {
-    Map<String, String> resultMap = new HashMap<>();
+  public Map<String, Object> getJobStatus(@RpcParam(name = "job_id") String jobId) {
+    Map<String, Object> resultMap = new HashMap<>();
     Job jobWithId = service.getJobWithId(jobId);
     if (jobWithId == null) {
       return resultMap;
@@ -93,6 +94,15 @@ public Map<String, String> getJobStatus(@RpcParam(name = "job_id") String jobId)
     if (jobWithId.getStatus() == Job.JobStatus.ERROR) {
       resultMap.put("error", jobWithId.getError().getLocalizedMessage());
     }
+    List<List<String>> statusChanges = new ArrayList<>();
+    for (Job.StatusChange statusChange : jobWithId.getStatusChanges()) {
+      statusChanges.add(
+          Lists.newArrayList(
+              statusChange.getStatus().name(),
+              Long.valueOf(statusChange.getChangeTime()).toString(),
+              statusChange.getMessage()));
+    }
+    resultMap.put("status_changes", statusChanges);
 
     return resultMap;
   }
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java
index d2ead968..9c82ac34 100644
--- a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java
@@ -6,7 +6,9 @@
 package com.datastax.mgmtapi.resources.models;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.io.Serializable;
 import java.util.List;
 
@@ -35,7 +37,9 @@ public enum JobStatus {
   @JsonProperty(value = "error")
   private String error;
 
-  public class StatusChange {
+  @JsonFormat(shape = JsonFormat.Shape.ARRAY)
+  @JsonPropertyOrder({"status", "change_time", "message"})
+  public static class StatusChange {
     @JsonProperty(value = "status")
     String status;
 
@@ -45,8 +49,12 @@ public class StatusChange {
     @JsonProperty(value = "message")
     String message;
 
-    public StatusChange(String type, String message) {
-      changeTime = System.currentTimeMillis();
+    @JsonCreator
+    public StatusChange(
+        @JsonProperty(value = "status") String type,
+        @JsonProperty(value = "change_time") String time,
+        @JsonProperty(value = "message") String message) {
+      changeTime = Long.parseLong(time);
       status = type;
       this.message = message;
     }
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java b/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java
index ba3dddfc..f0e1443f 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java
@@ -585,13 +585,17 @@ public void testJobStatus() throws Exception {
 
     when(mockResultSet.one()).thenReturn(mockRow);
 
-    Map<String, String> jobDetailsRow = new HashMap<>();
+    Map<String, Object> jobDetailsRow = new HashMap<>();
     jobDetailsRow.put("id", "0fe65b47-98c2-47d8-9c3c-5810c9988e10");
     jobDetailsRow.put("type", "CLEANUP");
     jobDetailsRow.put("status", "COMPLETED");
     jobDetailsRow.put("submit_time", String.valueOf(System.currentTimeMillis()));
     jobDetailsRow.put("end_time", String.valueOf(System.currentTimeMillis()));
 
+    List<List<String>> statusChanges = new ArrayList<>();
+    statusChanges.add(Lists.newArrayList("SUCCESS", "1695183696663", "No message"));
+    jobDetailsRow.put("status_changes", statusChanges);
+
     when(mockRow.getObject(0)).thenReturn(jobDetailsRow);
 
     MockHttpResponse response =
@@ -609,6 +613,8 @@ public void testJobStatus() throws Exception {
     assertEquals("0fe65b47-98c2-47d8-9c3c-5810c9988e10", jobDetails.getJobId());
     assertEquals("COMPLETED", jobDetails.getStatus().toString());
     assertEquals("CLEANUP", jobDetails.getJobType());
+    assertEquals(1, jobDetails.getStatusChanges().size());
+    assertEquals("SUCCESS", jobDetails.getStatusChanges().get(0).getStatus());
   }
 
   @Test