fix(optimize): ensure that optimize generates ECL expressions...

...with FSN labels
b2ihealthcare · Sep 21, 2022 · d11fd38 · d11fd38
1 parent f36bd9e
commit d11fd38
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/...d.datastore/src/com/b2international/snowowl/snomed/core/request/SnomedQueryOptimizer.java b/...d.datastore/src/com/b2international/snowowl/snomed/core/request/SnomedQueryOptimizer.java
@@ -32,6 +32,7 @@
 import com.b2international.snowowl.core.id.IDs;
 import com.b2international.snowowl.core.request.QueryOptimizer;
 import com.b2international.snowowl.snomed.common.SnomedConstants.Concepts;
+import com.b2international.snowowl.snomed.core.SnomedDisplayTermType;
 import com.b2international.snowowl.snomed.core.domain.SnomedConcept;
 import com.b2international.snowowl.snomed.core.domain.SnomedConcepts;
 import com.b2international.snowowl.snomed.datastore.request.SnomedRequests;
@@ -120,7 +121,7 @@ public QueryExpressionDiffs optimize(BranchContext context, Options params) {
 
 			SnomedConcept parent = SnomedRequests.prepareGetConcept(parentId)
 				.setLocales(locales)
-				.setExpand("pt(),descendants(direct:false,limit:0)")
+				.setExpand("fsn(),descendants(direct:false,limit:0)")
 				.build()
 				.execute(context);
 
@@ -134,7 +135,7 @@ public QueryExpressionDiffs optimize(BranchContext context, Options params) {
 
 				// The optimization is a "net win" if we can remove at least two clauses from the original
 				if (remove.size() > 1) {
-					final QueryExpression replacement = new QueryExpression(IDs.base62UUID(), String.format("<%s%s", parent.getId(), getTerm(parent)), false);
+					final QueryExpression replacement = new QueryExpression(IDs.base62UUID(), String.format("<%s", Concept.toConceptString(parentId, SnomedDisplayTermType.FSN.getLabel(parent))), false);
 					final List<QueryExpression> addToInclusion = List.of(replacement);
 					final List<QueryExpression> addToExclusion = List.of();
 
@@ -147,10 +148,6 @@ public QueryExpressionDiffs optimize(BranchContext context, Options params) {
 		return new QueryExpressionDiffs(diffs.build());
 	}
 
-	private String getTerm(SnomedConcept parent) {
-		return parent.getPt() != null ? String.format("|%s|", parent.getPt().getTerm()) : "";
-	}
-
 	private boolean isSingleConceptExpression(LoadingCache<String, ExpressionConstraint> eclCache, String query) {
 		try {
 			final ExpressionConstraint expressionConstraint = eclCache.getUnchecked(query);