From c362471b961f941667a1e81a0e637224d11c8572 Mon Sep 17 00:00:00 2001
From: Miroslav Ivanov <miroslavi@vmware.com>
Date: Fri, 20 Oct 2023 15:32:36 +0300
Subject: [PATCH] control-service: fix read deployment job version

Why
The Read Deployment API returns incorrect data.

What
Changed the job version to point to git commit sha instead of deployment
version.

Signed-off-by: Miroslav Ivanov miroslavi@vmware.com
---
 .../vmware/taurus/datajobs/DeploymentModelConverter.java    | 2 +-
 .../com/vmware/taurus/datajobs/ModelApiConverterTest.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/datajobs/DeploymentModelConverter.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/datajobs/DeploymentModelConverter.java
index 673e438cab..f1380a5c49 100644
--- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/datajobs/DeploymentModelConverter.java
+++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/datajobs/DeploymentModelConverter.java
@@ -289,7 +289,7 @@ private static void mergeDeploymentResources(
   public static DataJobDeploymentStatus toJobDeploymentStatus(
       ActualDataJobDeployment actualDataJobDeployment, DataJob job) {
     var deploymentStatus = new DataJobDeploymentStatus();
-    deploymentStatus.setJobVersion(actualDataJobDeployment.getDeploymentVersionSha());
+    deploymentStatus.setJobVersion(actualDataJobDeployment.getGitCommitSha());
     deploymentStatus.setPythonVersion(actualDataJobDeployment.getPythonVersion());
     deploymentStatus.setId(actualDataJobDeployment.getDataJobName());
     deploymentStatus.setEnabled(actualDataJobDeployment.getEnabled());
diff --git a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/datajobs/ModelApiConverterTest.java b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/datajobs/ModelApiConverterTest.java
index b51f5099e5..6572860e3c 100644
--- a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/datajobs/ModelApiConverterTest.java
+++ b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/datajobs/ModelApiConverterTest.java
@@ -22,7 +22,7 @@ public void testToJobDeploymentStatus() {
     var deployment = createActualJobDeployment(job);
     var status = DeploymentModelConverter.toJobDeploymentStatus(deployment, job);
 
-    Assertions.assertEquals("test-sha", status.getJobVersion());
+    Assertions.assertEquals("test-commit-sha", status.getJobVersion());
     Assertions.assertEquals("3.9-secure", status.getPythonVersion());
     Assertions.assertEquals("name", status.getId());
     Assertions.assertEquals(true, status.getEnabled());
@@ -53,13 +53,13 @@ private DataJob createTestJob(String jobName, String teamName) {
 
   private ActualDataJobDeployment createActualJobDeployment(DataJob dataJob) {
     var deployment = new ActualDataJobDeployment();
-    deployment.setGitCommitSha("actualSha");
+    deployment.setGitCommitSha("test-commit-sha");
     deployment.setDataJobName(dataJob.getName());
     deployment.setPythonVersion("3.9-secure");
     deployment.setEnabled(true);
     deployment.setLastDeployedBy("user");
     deployment.setSchedule("sched");
-    deployment.setDeploymentVersionSha("test-sha");
+    deployment.setDeploymentVersionSha("test-deployment-sha");
     deployment.setLastDeployedDate(OffsetDateTime.MIN);
     var resources = new DataJobDeploymentResources();
     resources.setMemoryLimitMi(1);