Merge pull request #1325 from b2ihealthcare/issue/mrcm-attribute-type-configurations

Make MRCM type expressions configurable

Author: cmark

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/config/SnomedCoreConfiguration.java

@@ -21,6 +21,7 @@
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * SNOMED CT related application level configuration parameters.
@@ -67,6 +68,9 @@ public class SnomedCoreConfiguration {
 
 	private boolean concreteDomainSupport = false;
 
+	@NotNull
+	private SnomedMrcmConfig mrcmConfiguration = new SnomedMrcmConfig();
+	
 	/**
 	 * @return the number of reasoners that are permitted to run simultaneously.
 	 */
@@ -245,5 +249,15 @@ public void setDatetimeDatatypeRefsetIdentifier(String datetimeDatatypeRefsetIde
 	public long getClassificationCleanUpInterval() {
 		return classificationCleanUpInterval;
 	}
+
+	@JsonProperty("mrcm")
+	public SnomedMrcmConfig getMrcmConfiguration() {
+		return mrcmConfiguration;
+	}
+
+	@JsonProperty("mrcm")
+	public void setMrcmConfiguration(SnomedMrcmConfig mrcmConfiguration) {
+		this.mrcmConfiguration = mrcmConfiguration;
+	}
 
 }

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/config/SnomedMrcmConfig.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 B2i Healthcare, https://b2ihealthcare.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.b2international.snowowl.snomed.datastore.config;
+
+import com.b2international.snowowl.snomed.common.SnomedConstants.Concepts;
+
+/**
+ * @since 9.3.0
+ */
+public class SnomedMrcmConfig {
+	
+	private String allowedDataAttributesExpression = "<" + Concepts.CONCEPT_MODEL_DATA_ATTRIBUTE;
+	private String allowedObjectAttributesExpression = "<" + Concepts.CONCEPT_MODEL_OBJECT_ATTRIBUTE;
+	
+	
+	public String getAllowedDataAttributesExpression() {
+		return allowedDataAttributesExpression;
+	}
+	
+	public void setAllowedDataAttributesExpression(String allowedDataAttributesExpression) {
+		this.allowedDataAttributesExpression = allowedDataAttributesExpression;
+	}
+	
+	public String getAllowedObjectAttributesExpression() {
+		return allowedObjectAttributesExpression;
+	}
+	
+	public void setAllowedObjectAttributesExpression(String allowedObjectAttributesExpression) {
+		this.allowedObjectAttributesExpression = allowedObjectAttributesExpression;
+	}
+	
+}

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequest.java

@@ -16,9 +16,6 @@
 package com.b2international.snowowl.snomed.datastore.request;
 
 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;
 
 import java.util.HashSet;
@@ -29,13 +26,17 @@
 
 import com.b2international.commons.options.Options;
 import com.b2international.snomed.ecl.Ecl;
+import com.b2international.snowowl.core.ApplicationContext;
+import com.b2international.snowowl.core.config.SnowOwlConfiguration;
 import com.b2international.snowowl.core.domain.BranchContext;
 import com.b2international.snowowl.core.request.SearchResourceRequest;
 import com.b2international.snowowl.snomed.common.SnomedRf2Headers;
 import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.SnomedConcept;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedRefSetType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
+import com.b2international.snowowl.snomed.datastore.config.SnomedCoreConfiguration;
+import com.b2international.snowowl.snomed.datastore.config.SnomedMrcmConfig;
 import com.b2international.snowowl.snomed.datastore.index.entry.SnomedConceptDocument;
 
 /**
@@ -89,15 +90,23 @@ public SnomedReferenceSetMembers doExecute(BranchContext context) {
 
 		final String eclConstraint;
 
+		SnomedMrcmConfig mrcmConfiguration = ApplicationContext.getInstance()
+			.getServiceChecked(SnowOwlConfiguration.class)
+			.getModuleConfig(SnomedCoreConfiguration.class)
+			.getMrcmConfiguration();
+		
+		String allowedDataAttributesExpression = mrcmConfiguration.getAllowedDataAttributesExpression();
+		String allowedObjectAttributesExpression = mrcmConfiguration.getAllowedObjectAttributesExpression();
+		
 		switch (attributeType) {
 		case DATA: 
-			eclConstraint = String.format("<%s", CONCEPT_MODEL_DATA_ATTRIBUTE);
+			eclConstraint = allowedDataAttributesExpression;
 			break;
 		case OBJECT: 
-			eclConstraint = String.format("<%s OR <%s", CONCEPT_MODEL_OBJECT_ATTRIBUTE, UNAPPROVED_ATTRIBUTE);
+			eclConstraint = allowedObjectAttributesExpression;
 			break;
 		case ALL: 
-			eclConstraint = String.format("<%s OR <%s OR <%s", CONCEPT_MODEL_OBJECT_ATTRIBUTE, UNAPPROVED_ATTRIBUTE, CONCEPT_MODEL_DATA_ATTRIBUTE);
+			eclConstraint = Ecl.or(allowedDataAttributesExpression, allowedObjectAttributesExpression);
 			break;
 		default: 
 			eclConstraint = Ecl.ANY;