Merge pull request #127 from onc-healthit/feature/SITE-4361

Update interaction with SNOMED codes to fix duplicate rows error (SITE-4361)

Author: jwspcc

src/main/java/org/sitenv/vocabularies/validation/repositories/CodeRepository.java

@@ -34,6 +34,6 @@ public interface CodeRepository extends JpaRepository<Code, Integer> {
 
     List<Code> findByCodeAndCodeSystemIn(String code, List<String> codesystems);
 
-    @Query("SELECT c.active FROM Code c WHERE c.code = :code and c.codeSystem in (:codesystems)")
+    @Query("SELECT c.active FROM Code c WHERE c.code = :code and c.codeSystem in (:codesystems) and c.active = true and ROWNUM() < 2 ")
     boolean codeIsActive(@Param("code")String code, @Param("codesystems")Set<String> codesystems);
 }

src/main/java/org/sitenv/vocabularies/validation/validators/nodetypes/CodeSystemCodeValidator.java

@@ -73,19 +73,19 @@ public List<VocabularyValidationResult> validateNode(ConfiguredValidator configu
                 nodeValidationResult.setCodeSystemFound(true);
                 if(codeRepository.foundCodeInCodesystems(nodeCode, allowedConfiguredCodeSystemNames)){
                     nodeValidationResult.setNodeCodeFound(true);
-					try {
-						if (!codeRepository.codeIsActive(nodeCode, allowedConfiguredCodeSystemNames)) {
-							nodeValidationResult.setNodeCodeIsActive(false);
-						}
-					} catch (NonUniqueResultException nonUniqueResultException) {
-						nodeValidationResult.setNodeCodeIsActive(false);
-						logger.error(
-								"The following error was encountered when trying to check codeRepository.codeIsActive(...). "
-										+ "It will be handled internally and considered inactive as the source is likely corrupt "
-										+ "since it is returning multiple values.",
-								nonUniqueResultException);
+                    try {
+                        if (!codeRepository.codeIsActive(nodeCode, allowedConfiguredCodeSystemNames)) {
+                            nodeValidationResult.setNodeCodeIsActive(false);
+                        }
+                    } catch (NonUniqueResultException nonUniqueResultException) {
+                        nodeValidationResult.setNodeCodeIsActive(false);
+                        logger.error(
+                                "The following error was encountered when trying to check codeRepository.codeIsActive(...). "
+                                        + "It will be handled internally and considered inactive as the source is likely corrupt "
+                                        + "since it is returning multiple values.",
+                                nonUniqueResultException);
 
-					}
+                    }
                 }
                 if(codeRepository.foundDisplayNameInCodesystems(nodeDisplayName, allowedConfiguredCodeSystemNames)){
                     nodeValidationResult.setNodeDisplayNameFound(true);