MAINT-2370 Change the Annotation language to a new column in RF2

IHTSDO · Oct 26, 2023 · e240656 · e240656
1 parent 753e2dc
commit e240656
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/org/snomed/snowstorm/core/data/domain/Annotation.java b/src/main/java/org/snomed/snowstorm/core/data/domain/Annotation.java
@@ -13,8 +13,6 @@
 
 public class Annotation extends ReferenceSetMember implements AnnotationView {
 
-	private static final Pattern ANNOTATION_LANGUAGE_TYPE_PATTERN = Pattern.compile("^@+\\S.*\\\".*\\\"$");
-
 	@JsonView(value = View.Component.class)
 	private String annotationId;
 	@JsonView(value = View.Component.class)
@@ -98,14 +96,8 @@ public Annotation fromRefsetMember(ReferenceSetMember fromMember) {
 		setReferencedComponentId(fromMember.getReferencedComponentId());
 		setReleased(fromMember.isReleased());
 		setAnnotationTypeId(fromMember.getAdditionalField(AnnotationFields.ANNOTATION_TYPE_ID));
-
-		String annotationValue = fromMember.getAdditionalField(AnnotationFields.ANNOTATION_VALUE);
-		if (StringUtils.isNotEmpty(annotationValue) && ANNOTATION_LANGUAGE_TYPE_PATTERN.matcher(annotationValue).matches()) {
-			setAnnotationLanguage(annotationValue.substring(1, annotationValue.indexOf("\"")).trim());
-			setAnnotationValue(annotationValue.substring(annotationValue.indexOf("\"") + 1, annotationValue.lastIndexOf("\"")));
-		} else {
-			setAnnotationValue(annotationValue);
-		}
+		setAnnotationValue(fromMember.getAdditionalField(AnnotationFields.ANNOTATION_VALUE));
+		setAnnotationLanguage(fromMember.getAdditionalField(AnnotationFields.ANNOTATION_LANGUAGE));
 		return this;
 	}
 
@@ -115,7 +107,8 @@ public ReferenceSetMember toRefsetMember() {
 		String moduleId = getModuleId() != null ? getModuleId() : Concepts.CORE_MODULE;
 		ReferenceSetMember member = new ReferenceSetMember(annotationId, getEffectiveTimeI(), isActive(), moduleId, refsetId, getReferencedComponentId());
 		member.setAdditionalField(AnnotationFields.ANNOTATION_TYPE_ID, getAnnotationTypeId());
-		member.setAdditionalField(AnnotationFields.ANNOTATION_VALUE, getAnnotationLanguage() != null ? "@" + getAnnotationLanguage() + "\""  + getAnnotationValue() + "\"" : getAnnotationValue());
+		member.setAdditionalField(AnnotationFields.ANNOTATION_VALUE, getAnnotationValue());
+		member.setAdditionalField(AnnotationFields.ANNOTATION_LANGUAGE, getAnnotationLanguage());
 		return member;
 	}
 

diff --git a/src/main/java/org/snomed/snowstorm/core/data/domain/ReferenceSetMember.java b/src/main/java/org/snomed/snowstorm/core/data/domain/ReferenceSetMember.java
@@ -63,6 +63,7 @@ public interface MRCMAttributeDomainFields {
 	public interface AnnotationFields {
 		String ANNOTATION_TYPE_ID = "annotationTypeId";
 		String ANNOTATION_VALUE = "annotationValue";
+		String ANNOTATION_LANGUAGE = "annotationLanguage";
 	}
 
 	@JsonView(value = View.Component.class)

diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/AutoMerger.java b/src/main/java/org/snomed/snowstorm/core/data/services/AutoMerger.java
@@ -553,10 +553,19 @@ private void reapplyAnnotationMemberChanges(Map<String, ReferenceSetMember> sour
                                     sourceReferenceSetMember.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_VALUE)
                             )
                     );
+                    mergedReferenceSetMember.setAdditionalField(
+                            ReferenceSetMember.AnnotationFields.ANNOTATION_LANGUAGE,
+                            getValueChanged(
+                                    targetReferenceSetMemberOld.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_LANGUAGE),
+                                    targetReferenceSetMemberNew.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_LANGUAGE),
+                                    sourceReferenceSetMember.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_LANGUAGE)
+                            )
+                    );
                 } else {
                     mergedReferenceSetMember.setRefsetId(sourceReferenceSetMember.getRefsetId());
                     mergedReferenceSetMember.setAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_TYPE_ID, sourceReferenceSetMember.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_TYPE_ID));
                     mergedReferenceSetMember.setAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_VALUE, sourceReferenceSetMember.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_VALUE));
+                    mergedReferenceSetMember.setAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_LANGUAGE, sourceReferenceSetMember.getAdditionalField(ReferenceSetMember.AnnotationFields.ANNOTATION_LANGUAGE));
                 }
 
                 // Re-apply mutable fields

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -166,7 +166,7 @@ refset.types.Language=900000000000506000|Language|c|acceptabilityId
 refset.types.AssociationReference=900000000000521006|Content|c|targetComponentId
 refset.types.AttributeValue=900000000000480006|Content|c|valueId
 refset.types.Simple=446609009|Content||
-refset.types.Annotation=1292992004|Content|cs|annotationTypeId,annotationValue
+refset.types.Annotation=1292992004|Content|css|annotationTypeId,annotationValue,annotationLanguage
 refset.types.SimpleMapToSCT=1187636009|Map|s|mapSource
 refset.types.SimpleMapFromSCT=900000000000496009|Map|s|mapTarget
 refset.types.SimpleMapCorrelationToSCT=1193543008|Map|sc|mapSource,correlationId