Updating methods for get() and batchGet() APIs to filter by deleted_ts (#544)

Author: kotkar-pallavi

dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/SQLStatementUtils.java

@@ -118,7 +118,7 @@ public class SQLStatementUtils {
 
   private static final String SQL_GET_ALL_COLUMNS =
       "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = database() AND TABLE_NAME = '%s'";
-      
+
   private static final String SQL_URN_EXIST_TEMPLATE = "SELECT urn FROM %s WHERE urn = '%s' AND deleted_ts IS NULL";
 
   private static final String INSERT_LOCAL_RELATIONSHIP = "INSERT INTO %s (metadata, source, destination, source_type, "
@@ -209,6 +209,8 @@ public static <ASPECT extends RecordTemplate> String createAspectReadSql(@Nonnul
     stringBuilder.append(String.format(sqlTemplate, columnName, tableName, columnName));
     stringBuilder.append(urnList);
     stringBuilder.append(RIGHT_PARENTHESIS);
+    stringBuilder.append(" AND ");
+    stringBuilder.append(DELETED_TS_IS_NULL_CHECK);
     return stringBuilder.toString();
   }
 

dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/utils/SQLStatementUtilsTest.java

@@ -102,14 +102,16 @@ public void testCreateAspectReadSql() {
         "SELECT urn, a_aspectfoo, lastmodifiedon, lastmodifiedby "
             + "FROM metadata_entity_foo "
             + "WHERE JSON_EXTRACT(a_aspectfoo, '$.gma_deleted') IS NULL "
-            + "AND urn IN ('urn:li:foo:1', 'urn:li:foo:2')";
+            + "AND urn IN ('urn:li:foo:1', 'urn:li:foo:2') "
+            + "AND deleted_ts IS NULL";
     assertEquals(SQLStatementUtils.createAspectReadSql(AspectFoo.class, set, false, false), expectedSql);
 
     //test when includedSoftDeleted is true
     expectedSql =
         "SELECT urn, a_aspectfoo, lastmodifiedon, lastmodifiedby "
             + "FROM metadata_entity_foo "
-            + "WHERE urn IN ('urn:li:foo:1', 'urn:li:foo:2')";
+            + "WHERE urn IN ('urn:li:foo:1', 'urn:li:foo:2') "
+            + "AND deleted_ts IS NULL";
     assertEquals(SQLStatementUtils.createAspectReadSql(AspectFoo.class, set, true, false), expectedSql);
   }