From 20ebe70d9e673b4c2a76333858a9fa2c32e5af45 Mon Sep 17 00:00:00 2001
From: Pere Miquel Brull <peremiquelbrull@gmail.com>
Date: Fri, 9 Jun 2023 14:06:55 +0200
Subject: [PATCH] Update test conn definition on initialize (#11940)

---
 .../TestConnectionDefinitionRepository.java      | 16 ++++++++++++++--
 .../TestConnectionDefinitionResource.java        | 13 +++++--------
 .../TestConnectionDefinitionResourceTest.java    |  4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java
index 53a7ad9332c..a6f6a4a0fec 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestConnectionDefinitionRepository.java
@@ -16,7 +16,7 @@ import org.openmetadata.service.util.EntityUtil;
 */
 public class TestConnectionDefinitionRepository extends EntityRepository<TestConnectionDefinition> {
 
-  private static final String UPDATE_FIELDS = "";
+  private static final String UPDATE_FIELDS = "steps";
   private static final String PATCH_FIELDS = "";
 
   public TestConnectionDefinitionRepository(CollectionDAO dao) {
@@ -72,6 +72,18 @@ public class TestConnectionDefinitionRepository extends EntityRepository<TestCon
   @Override
   public EntityUpdater getUpdater(
       TestConnectionDefinition original, TestConnectionDefinition updated, Operation operation) {
-    return null;
+    return new TestConnectionDefinitionUpdater(original, updated, operation);
+  }
+
+  public class TestConnectionDefinitionUpdater extends EntityUpdater {
+    public TestConnectionDefinitionUpdater(
+        TestConnectionDefinition original, TestConnectionDefinition updated, Operation operation) {
+      super(original, updated, operation);
+    }
+
+    @Override
+    public void entitySpecificUpdate() throws IOException {
+      recordChange("steps", original.getSteps(), updated.getSteps(), true);
+    }
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResource.java
index bf4bcb3402a..4f4be81f4d9 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResource.java
@@ -37,7 +37,6 @@ import org.openmetadata.service.jdbi3.TestConnectionDefinitionRepository;
 import org.openmetadata.service.resources.Collection;
 import org.openmetadata.service.resources.EntityResource;
 import org.openmetadata.service.security.Authorizer;
-import org.openmetadata.service.util.EntityUtil;
 import org.openmetadata.service.util.RestUtil;
 import org.openmetadata.service.util.ResultList;
 
@@ -70,13 +69,12 @@ public class TestConnectionDefinitionResource
     List<TestConnectionDefinition> testConnectionDefinitions =
         repository.getEntitiesFromSeedData(".*json/data/testConnections/.*\\.json$");
 
-    for (TestConnectionDefinition testConnectionDefinition :
-        repository.listAll(EntityUtil.Fields.EMPTY_FIELDS, new ListFilter(Include.ALL))) {
-      repository.delete(ADMIN_USER_NAME, testConnectionDefinition.getId(), true, true);
-    }
-
     for (TestConnectionDefinition testConnectionDefinition : testConnectionDefinitions) {
-      repository.initializeEntity(testConnectionDefinition);
+      repository.prepareInternal(testConnectionDefinition);
+      testConnectionDefinition.setId(UUID.randomUUID());
+      testConnectionDefinition.setUpdatedBy(ADMIN_USER_NAME);
+      testConnectionDefinition.setUpdatedAt(System.currentTimeMillis());
+      repository.createOrUpdate(null, testConnectionDefinition);
     }
   }
 
@@ -84,7 +82,6 @@ public class TestConnectionDefinitionResource
     /* Required for serde */
   }
 
-  // TODO remove the list method?
   @GET
   @Operation(
       operationId = "listTestConnectionDefinitions",
diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResourceTest.java
index 31b51661ce0..536cf01554d 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResourceTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/connections/TestConnectionDefinitionResourceTest.java
@@ -37,9 +37,9 @@ public class TestConnectionDefinitionResourceTest extends OpenMetadataApplicatio
   @Test
   public void test_list_test_connection_definition() throws HttpResponseException {
     WebTarget target = listResource();
-    ResultList mysqlTest = TestUtils.get(target, ResultList.class, ADMIN_AUTH_HEADERS);
+    ResultList testConnectionDefinitions = TestUtils.get(target, ResultList.class, ADMIN_AUTH_HEADERS);
     // we get 10 as it's the default paging size
-    assertEquals(mysqlTest.getData().size(), 10);
+    assertEquals(testConnectionDefinitions.getData().size(), 10);
   }
 
   protected final WebTarget getResourceByName(String name) {