VAL-405 Add a fallback if the previous release was not found from Module Storage Coordinator

Author: QuyenLy87

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

@@ -14,7 +14,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.sql.SQLException;
 import java.util.*;
@@ -70,7 +69,7 @@ public ValidationStatusReport runRF2MysqlValidations(ValidationRunConfig validat
 		MysqlExecutionConfig executionConfig = releaseVersionLoader.createExecutionConfig(validationConfig);
 		this.schemasToRemove.add(executionConfig.getProspectiveVersion());
 
-		if (!StringUtils.hasLength(validationConfig.getPreviousRelease())) {
+		if (validationConfig.getLocalPreviousReleaseFile() == null) {
 			executionConfig.setPreviousVersion(emptyRf2File);
 		}
 		if (validationConfig.getLocalDependencyReleaseFile() == null || executionConfig.isStandAloneProduct()) {

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

@@ -1,5 +1,6 @@
 package org.ihtsdo.rvf.core.service;
 
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.ihtsdo.otf.resourcemanager.ManualResourceConfiguration;
@@ -10,6 +11,7 @@
 import org.ihtsdo.otf.snomedboot.ReleaseImporter;
 import org.ihtsdo.rvf.core.service.config.MysqlExecutionConfig;
 import org.ihtsdo.rvf.core.service.config.ValidationJobResourceConfig;
+import org.ihtsdo.rvf.core.service.config.ValidationReleaseStorageConfig;
 import org.ihtsdo.rvf.core.service.config.ValidationRunConfig;
 import org.ihtsdo.rvf.core.service.pojo.ValidationStatusReport;
 import org.ihtsdo.rvf.core.service.util.RvfReleaseDbSchemaNameGenerator;
@@ -64,11 +66,20 @@ public class ValidationVersionLoader {
 	@Autowired
 	private ResourceDataLoader resourceLoader;
 
+	@Autowired
+	private ValidationReleaseStorageConfig releaseStorageConfig;
+	private ResourceManager releaseSourceManager;
+
 	@Value("${rvf.generate.mysql.binary.archive}")
 	private boolean generateBinaryArchive;
 
 	private final Logger logger = LoggerFactory.getLogger(ValidationVersionLoader.class);
 
+	@PostConstruct
+	public void init() {
+		releaseSourceManager = new ResourceManager(releaseStorageConfig, cloudResourceLoader);
+	}
+
 	public void loadPreviousVersion(MysqlExecutionConfig executionConfig) throws BusinessServiceException, IOException {
 		if (executionConfig.getPreviousVersion().endsWith(ZIP_FILE_EXTENSION)) {
 			String rvfDbSchema = loadRelease(executionConfig.getPreviousVersion(), executionConfig.getExcludedRF2Files());
@@ -360,6 +371,10 @@ public void downloadPreviousReleaseAndDependencyFiles(ValidationRunConfig valida
 					File tempFile = File.createTempFile(validationConfig.getRunId() + "_DEPENDENCY_RF2", ZIP_FILE_EXTENSION);
 					Files.copy(dependencyFile.toPath(), tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 					validationConfig.setLocalDependencyReleaseFile(tempFile);
+					validationConfig.setExtensionDependency(dependency.getFilename());
+					logger.info("Dependency {} found from Module Storage Coordinator", dependency.getFilename());
+				} else {
+					logger.info("Other dependency {} found from Module Storage Coordinator", dependency.getFilename());
 				}
 				Files.delete(dependencyFile.toPath());
 			}
@@ -382,6 +397,18 @@ public void downloadPreviousReleaseAndDependencyFiles(ValidationRunConfig valida
 				Files.delete(releaseFile.toPath());
 			} else {
 				logger.info("Previous release {} not found from Module Storage Coordinator", validationConfig.getPreviousRelease());
+
+				// Fallback to the old versioned content bucket
+				InputStream previousStream = releaseSourceManager.readResourceStreamOrNullIfNotExists(validationConfig.getPreviousRelease());
+				if (previousStream != null) {
+					File previousFile = File.createTempFile(validationConfig.getRunId() + "_PREVIOUS_RF2", ZIP_FILE_EXTENSION);
+					try (OutputStream out = new FileOutputStream(previousFile)) {
+						IOUtils.copy(previousStream, out);
+					} finally {
+						IOUtils.closeQuietly(previousStream, null);
+					}
+					validationConfig.setLocalPreviousReleaseFile(previousFile);
+				}
 			}
 		}
 	}