SITE-4361

Author: Girish

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

@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.persistence.NonUniqueResultException;
 import javax.xml.xpath.XPath;
@@ -20,7 +19,6 @@
 import org.sitenv.vocabularies.validation.dto.NodeValidationResult;
 import org.sitenv.vocabularies.validation.dto.VocabularyValidationResult;
 import org.sitenv.vocabularies.validation.dto.enums.VocabularyValidationResultLevel;
-import org.sitenv.vocabularies.validation.entities.Code;
 import org.sitenv.vocabularies.validation.repositories.CodeRepository;
 import org.sitenv.vocabularies.validation.utils.XpathUtils;
 import org.sitenv.vocabularies.validation.validators.NodeValidator;
@@ -76,21 +74,9 @@ public List<VocabularyValidationResult> validateNode(ConfiguredValidator configu
                 if(codeRepository.foundCodeInCodesystems(nodeCode, allowedConfiguredCodeSystemNames)){
                     nodeValidationResult.setNodeCodeFound(true);
                     try {
-                        logger.info("Code :: "+nodeCode+" :: Code System names :: "+allowedConfiguredCodeSystemNames);
-                        List<String> configuredCodeSystemList= allowedConfiguredCodeSystemNames.stream().collect(Collectors.toList());
-                        List<Code> codeList = codeRepository.findByCodeAndCodeSystemIn(nodeCode, configuredCodeSystemList);
-                        boolean foundActiveRecord = false;
-                        for(Code code :codeList ) {
-                            if (codeList.size() > 0) {
-                                logger.info("Multiple codes found for code :: "+code.getCode()+" :: Code System name :: "+code.getCodeSystem() +" :: isActive :: "+code.isActive());
-                            }                           
-                            if (code.isActive()) {
-                                foundActiveRecord = true;
-                            }
-                        }
-                        if (!foundActiveRecord) {
+                        if (!codeRepository.codeIsActive(nodeCode, allowedConfiguredCodeSystemNames)) {
                             nodeValidationResult.setNodeCodeIsActive(false);
-                        }   
+                        }
                     } catch (NonUniqueResultException nonUniqueResultException) {
                         nodeValidationResult.setNodeCodeIsActive(false);
                         logger.error(