fix a bug that local relationship query does not exclude soft deleted relationships (#334)

Author: yangyangv2

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

@@ -245,15 +245,15 @@ private String buildFindRelationshipSQL(@Nullable final String destTableName, @N
       sqlBuilder.append("INNER JOIN ").append(sourceTableName).append(" st ON st.urn=rt.source ");
     }
 
+    sqlBuilder.append("WHERE deleted_ts is NULL");
     String whereClause = SQLStatementUtils.whereClause(SUPPORTED_CONDITIONS,
         new Pair<>(sourceEntityFilter, "st"),
         new Pair<>(destinationEntityFilter, "dt"),
         new Pair<>(relationshipFilter, "rt"));
 
     if (whereClause != null) {
-      sqlBuilder.append("WHERE ").append(whereClause);
+      sqlBuilder.append(" AND ").append(whereClause);
     }
-
     return sqlBuilder.toString();
   }
 }

dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/localrelationship/EbeanLocalRelationshipQueryDAOTest.java

@@ -11,9 +11,12 @@
 import com.linkedin.metadata.dao.EbeanLocalRelationshipQueryDAO;
 import com.linkedin.metadata.dao.EbeanLocalRelationshipWriterDAO;
 import com.linkedin.metadata.dao.IEbeanLocalAccess;
+import com.linkedin.metadata.dao.internal.BaseGraphWriterDAO;
 import com.linkedin.metadata.dao.scsi.EmptyPathExtractor;
 import com.linkedin.metadata.dao.utils.EBeanDAOUtils;
 import com.linkedin.metadata.dao.utils.EmbeddedMariaInstance;
+import com.linkedin.metadata.dao.utils.SQLSchemaUtils;
+import com.linkedin.metadata.dao.utils.SQLStatementUtils;
 import com.linkedin.metadata.query.AspectField;
 import com.linkedin.metadata.query.Condition;
 import com.linkedin.metadata.query.LocalRelationshipCriterion;
@@ -38,6 +41,7 @@
 import com.linkedin.testing.urn.FooUrn;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import io.ebean.SqlUpdate;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -156,6 +160,25 @@ public void testFindOneRelationship() throws Exception {
     Set<FooUrn> actual = reportsToAlice.stream().map(reportsTo -> makeFooUrn(reportsTo.getSource().toString())).collect(Collectors.toSet());
     Set<FooUrn> expected = ImmutableSet.of(jack, bob);
     assertEquals(actual, expected);
+
+    // Soft (set delete_ts = now()) Delete Jack reports-to ALice relationship
+    SqlUpdate deletionSQL = _server.createSqlUpdate(
+        SQLStatementUtils.deleteLocaRelationshipSQL(SQLSchemaUtils.getRelationshipTableName(jackReportsToAlice),
+            BaseGraphWriterDAO.RemovalOption.REMOVE_ALL_EDGES_FROM_SOURCE));
+    deletionSQL.setParameter("source", jack.toString());
+    deletionSQL.execute();
+
+    reportsToAlice = _localRelationshipQueryDAO.findRelationships(FooSnapshot.class,
+        new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()), FooSnapshot.class, filter,
+        ReportsTo.class, new LocalRelationshipFilter().setCriteria(new LocalRelationshipCriterionArray()), 0, 10);
+
+    // Expect: only bob reports to Alice
+    assertEquals(reportsToAlice.size(), 1);
+    actual = reportsToAlice.stream()
+        .map(reportsTo -> makeFooUrn(reportsTo.getSource().toString()))
+        .collect(Collectors.toSet());
+    expected = ImmutableSet.of(bob);
+    assertEquals(actual, expected);
   }
 
   @Test