Merge pull request #1179 from b2ihealthcare/issue/SO-5826-mrcm-bug-fixes

fix(mrcm): Include unapproved attributes in search for applicable types
b2ihealthcare · Jun 26, 2023 · 659fe63 · 659fe63
2 parents 909c633 + 956cb45
commit 659fe63
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...store/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequest.java b/...store/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequest.java
@@ -17,6 +17,7 @@
 
 import static com.b2international.index.revision.Revision.Fields.ID;
 import static com.b2international.snowowl.snomed.common.SnomedConstants.Concepts.CONCEPT_MODEL_DATA_ATTRIBUTE;
+import static com.b2international.snowowl.snomed.common.SnomedConstants.Concepts.UNAPPROVED_ATTRIBUTE;
 import static com.b2international.snowowl.snomed.common.SnomedConstants.Concepts.CONCEPT_MODEL_OBJECT_ATTRIBUTE;
 import static com.b2international.snowowl.snomed.datastore.index.entry.SnomedRefSetMemberIndexEntry.Fields.MRCM_RULE_REFSET_ID;
 
@@ -93,10 +94,10 @@ public SnomedReferenceSetMembers doExecute(BranchContext context) {
 			eclConstraint = String.format("<%s", CONCEPT_MODEL_DATA_ATTRIBUTE);
 			break;
 		case OBJECT: 
-			eclConstraint = String.format("<%s", CONCEPT_MODEL_OBJECT_ATTRIBUTE);
+			eclConstraint = String.format("<%s OR <%s", CONCEPT_MODEL_OBJECT_ATTRIBUTE, UNAPPROVED_ATTRIBUTE);
 			break;
 		case ALL: 
-			eclConstraint = String.format("<%s OR <%s", CONCEPT_MODEL_OBJECT_ATTRIBUTE, CONCEPT_MODEL_DATA_ATTRIBUTE );
+			eclConstraint = String.format("<%s OR <%s OR <%s", CONCEPT_MODEL_OBJECT_ATTRIBUTE, UNAPPROVED_ATTRIBUTE, CONCEPT_MODEL_DATA_ATTRIBUTE);
 			break;
 		default: 
 			eclConstraint = Ecl.ANY;