fix(relationship): fix bug in extractRelationshipFromAspect (#482)

linkedin · Nov 27, 2024 · 3644f12 · 3644f12
1 parent 783ae91
commit 3644f12
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/EBeanDAOUtils.java b/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/EBeanDAOUtils.java
@@ -405,6 +405,10 @@ public static LocalRelationshipCriterion buildRelationshipFieldCriterion(LocalRe
         } else if (!(obj instanceof List) || ((List) obj).isEmpty() || !(((List) obj).get(0) instanceof RecordTemplate)) {
           return;
         }
+        // filter out all non-primitive, non-relationship, non-list fields
+        if (!(obj instanceof List)) {
+          return;
+        }
         List<RecordTemplate> relationshipsList = (List<RecordTemplate>) obj;
         ModelType modelType = parseModelTypeFromGmaAnnotation(relationshipsList.get(0));
         if (modelType == ModelType.RELATIONSHIP) {

diff --git a/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/utils/EBeanDAOUtilsTest.java b/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/utils/EBeanDAOUtilsTest.java
@@ -645,6 +645,7 @@ public void testExtractRelationshipsFromAspect() throws URISyntaxException {
     //     relationshipFoos -> [foo1, foo2]
     //     relationshipBars -> [bar1]
     //     moreRelationshipFoos -> not present
+    //     nonPrimitiveNonRelationshipField -> commonAspect2
     // }
     // expect:
     // [[foo1, foo2], [bar1]]
@@ -655,7 +656,8 @@ public void testExtractRelationshipsFromAspect() throws URISyntaxException {
         .setRelationshipFoo1(test3)
         // don't set relationshipFoo2 fields
         .setRelationshipFoos(relationshipFoos)
-        .setRelationshipBars(relationshipBars); // don't set moreRelationshipFoos field
+        .setRelationshipBars(relationshipBars) // don't set moreRelationshipFoos field
+        .setNonPrimitiveNonRelationshipField(new CommonAspect());
 
     results = EBeanDAOUtils.extractRelationshipsFromAspect(barWithRelationshipFields);
     assertEquals(2, results.size());

diff --git a/...models/src/main/pegasus/com/linkedin/testing/AnnotatedAspectBarWithRelationshipFields.pdl b/...models/src/main/pegasus/com/linkedin/testing/AnnotatedAspectBarWithRelationshipFields.pdl
@@ -51,4 +51,9 @@ record AnnotatedAspectBarWithRelationshipFields {
    * For unit tests
    */
   moreRelationshipFoos: optional array[AnnotatedRelationshipFoo]
+
+  /**
+   * For unit tests
+   */
+  nonPrimitiveNonRelationshipField: optional CommonAspect
 }