From 2633ed23fd4bccfb7e3ae7b7623dfb283f2997c3 Mon Sep 17 00:00:00 2001
From: mohitdeuex <105265192+mohitdeuex@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:09:41 +0530
Subject: [PATCH] Fix slack issue (#7185)

* Fixed issue with testCases not posted in slack

* Return empty string in case of faling to build url
---
 .../catalog/jdbi3/TestCaseRepository.java      | 18 ++++++------------
 .../resources/dqtests/TestCaseResource.java    |  2 +-
 .../catalog/util/ChangeEventParser.java        |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TestCaseRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TestCaseRepository.java
index e1ef2f25423..b589fddcae3 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TestCaseRepository.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TestCaseRepository.java
@@ -10,11 +10,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 import org.jdbi.v3.sqlobject.transaction.Transaction;
 import org.openmetadata.catalog.Entity;
 import org.openmetadata.catalog.EntityInterface;
 import org.openmetadata.catalog.exception.EntityNotFoundException;
-import org.openmetadata.catalog.resources.dqtests.TestSuiteResource;
 import org.openmetadata.catalog.resources.feeds.MessageParser;
 import org.openmetadata.catalog.test.TestCaseParameter;
 import org.openmetadata.catalog.test.TestCaseParameterValue;
@@ -35,19 +35,13 @@ import org.openmetadata.catalog.util.RestUtil;
 import org.openmetadata.catalog.util.ResultList;
 
 public class TestCaseRepository extends EntityRepository<TestCase> {
+  public static final String COLLECTION_PATH = "/v1/testCase";
   private static final String UPDATE_FIELDS = "owner,entityLink,testSuite,testDefinition";
   private static final String PATCH_FIELDS = "owner,entityLink,testSuite,testDefinition";
   public static final String TESTCASE_RESULT_EXTENSION = "testCase.testCaseResult";
 
   public TestCaseRepository(CollectionDAO dao) {
-    super(
-        TestSuiteResource.COLLECTION_PATH,
-        TEST_CASE,
-        TestCase.class,
-        dao.testCaseDAO(),
-        dao,
-        PATCH_FIELDS,
-        UPDATE_FIELDS);
+    super(COLLECTION_PATH, TEST_CASE, TestCase.class, dao.testCaseDAO(), dao, PATCH_FIELDS, UPDATE_FIELDS);
   }
 
   @Override
@@ -129,7 +123,8 @@ public class TestCaseRepository extends EntityRepository<TestCase> {
   }
 
   @Transaction
-  public RestUtil.PutResponse<?> addTestCaseResult(String fqn, TestCaseResult testCaseResult) throws IOException {
+  public RestUtil.PutResponse<?> addTestCaseResult(UriInfo uriInfo, String fqn, TestCaseResult testCaseResult)
+      throws IOException {
     // Validate the request content
     TestCase testCase = dao.findEntityByName(fqn);
 
@@ -158,11 +153,10 @@ public class TestCaseRepository extends EntityRepository<TestCase> {
               JsonUtils.pojoToJson(testCaseResult));
       setFields(testCase, EntityUtil.Fields.EMPTY_FIELDS);
     }
-
     setFields(testCase, new EntityUtil.Fields(allowedFields, "testSuite"));
     ChangeDescription change =
         addTestCaseChangeDescription(testCase.getVersion(), testCaseResult, storedTestCaseResult);
-    ChangeEvent changeEvent = getChangeEvent(testCase, change, entityType, testCase.getVersion());
+    ChangeEvent changeEvent = getChangeEvent(withHref(uriInfo, testCase), change, entityType, testCase.getVersion());
 
     return new RestUtil.PutResponse<>(Response.Status.CREATED, changeEvent, RestUtil.ENTITY_FIELDS_CHANGED);
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dqtests/TestCaseResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dqtests/TestCaseResource.java
index ea22aba43b7..3ce990e7d31 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dqtests/TestCaseResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dqtests/TestCaseResource.java
@@ -441,7 +441,7 @@ public class TestCaseResource extends EntityResource<TestCase, TestCaseRepositor
       @Valid TestCaseResult testCaseResult)
       throws IOException {
     authorizer.authorizeAdmin(securityContext, true);
-    return dao.addTestCaseResult(fqn, testCaseResult).toResponse();
+    return dao.addTestCaseResult(uriInfo, fqn, testCaseResult).toResponse();
   }
 
   @GET
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java
index f678eaeaedf..1b08a0ed989 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java
@@ -170,7 +170,7 @@ public final class ChangeEventParser {
         return String.format("[%s](%s://%s/%s/%s)", fqn, scheme, host, event.getEntityType(), fqn);
       }
     }
-    return urlInstance.toString();
+    return "";
   }
 
   public static SlackMessage buildSlackMessage(ChangeEvent event) {