MAINT-2596 Include additional fields in laterality failures

Author: dmcgihtsdo

src/main/java/org/ihtsdo/rvf/core/service/MRCMValidationService.java

@@ -17,7 +17,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snomed.quality.validator.mrcm.*;
-import org.snomed.quality.validator.mrcm.model.ReferenceSetMember;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -42,6 +41,8 @@ public class MRCMValidationService {
 
 	private static final String EXT_ZIP = ".zip";
 
+	private static final String COMMA = ",";
+
 	@Autowired
 	private WhitelistService whitelistService;
 
@@ -264,13 +265,25 @@ private TestRunItem createTestRunItemWithFailures(Assertion mrcmAssertion, Conte
 		List<FailureDetail> failedDetails = new ArrayList<>(firstNCount);
 		if (LateralizableRefsetValidationService.ASSERTION_ID_MEMBERS_NEED_TO_BE_REMOVED_FROM_LATERALIZABLE_REFSET.equals(mrcmAssertion.getUuid().toString())) {
 			for (int i = 0; i < firstNCount; i++) {
-				ReferenceSetMember referenceSetMember = mrcmAssertion.getCurrentViolatedReferenceSetMembers().get(i);
-				failedDetails.add(new FailureDetail(referenceSetMember.referencedComponentId(), String.format(mrcmAssertion.getDetails(), referenceSetMember.memberId()), null));
+				LOGGER.info("Processing removal from laterality failure {}", i);
+				ConceptResult conceptResult = mrcmAssertion.getCurrentViolatedConcepts().get(i);
+				String conceptId = conceptResult.getId();
+				String details = String.format(mrcmAssertion.getDetails(), conceptId, "removed from");
+				String fsn = conceptResult.getFsn();
+				String additionalFields = getAdditionalFields(conceptResult);
+				LOGGER.info("conceptId: {} details: {} fsn: {} additionalFields: {}", conceptId, details, fsn, additionalFields);
+				failedDetails.add(new FailureDetail(conceptId, details, fsn).setFullComponent(additionalFields));
 			}
 		} else if (LateralizableRefsetValidationService.ASSERTION_ID_CONCEPTS_NEED_TO_BE_ADDED_TO_LATERALIZABLE_REFSET.equals(mrcmAssertion.getUuid().toString())) {
 			for (int i = 0; i < firstNCount; i++) {
-				Long conceptId = mrcmAssertion.getCurrentViolatedConceptIds().get(i);
-				failedDetails.add(new FailureDetail(conceptId.toString(), String.format(mrcmAssertion.getDetails(), conceptId), null));
+				LOGGER.info("Processing addition to laterality failure {}", i);
+				ConceptResult conceptResult = mrcmAssertion.getCurrentViolatedConcepts().get(i);
+				String conceptId = conceptResult.getId();
+				String details = String.format(mrcmAssertion.getDetails(), conceptId, "added to");
+				String fsn = conceptResult.getFsn();
+				String additionalFields = getAdditionalFields(conceptResult);
+				LOGGER.info("conceptId: {} details: {} fsn: {} additionalFields: {}", conceptId, details, fsn, additionalFields);
+				failedDetails.add(new FailureDetail(conceptId, details, fsn).setFullComponent(additionalFields));
 			}
 		} else {
 			for (int i = 0; i < firstNCount; i++) {
@@ -282,4 +295,8 @@ private TestRunItem createTestRunItemWithFailures(Assertion mrcmAssertion, Conte
 		testRunItem.setFirstNInstances(failedDetails);
 		return testRunItem;
 	}
+
+	private String getAdditionalFields(ConceptResult conceptResult) {
+		return (conceptResult.isActive() ? "1" : "0") + COMMA + conceptResult.getModuleId() + COMMA + conceptResult.getDefinitionStatusId();
+	}
 }