diff --git a/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java b/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java index fb5947eb9..933442327 100644 --- a/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java +++ b/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java @@ -1043,9 +1043,10 @@ public boolean isBuildCancelRequested(final Build build) { @Override public void deleteOutputFiles(Build build) { List outputFiles = listOutputFilePaths(build); + final String outputFilesPath = pathHelper.getOutputFilesPath(build); for (String outputFile : outputFiles) { - if (srsFileHelper.exists(outputFile)) { - srsFileHelper.deleteFile(outputFile); + if (srsFileHelper.exists(outputFilesPath + outputFile)) { + srsFileHelper.deleteFile(outputFilesPath + outputFile); } } } @@ -1054,11 +1055,12 @@ public void deleteOutputFiles(Build build) { public void deleteTransformedFiles(Build build) { List transformedFiles = listTransformedFilePaths(build); LOGGER.info("Transformed file size: {}", transformedFiles.size()); + final String transformedFilesPath = pathHelper.getBuildTransformedFilesPath(build).toString(); for (String transformedFile : transformedFiles) { LOGGER.info("File to delete: {}", transformedFile); - if (srsFileHelper.exists(transformedFile)) { + if (srsFileHelper.exists(transformedFilesPath + transformedFile)) { LOGGER.info("Deleting the transformed file: {}", transformedFile); - srsFileHelper.deleteFile(transformedFile); + srsFileHelper.deleteFile(transformedFilesPath + transformedFile); } } } diff --git a/src/main/java/org/ihtsdo/buildcloud/core/dao/helper/S3PathHelper.java b/src/main/java/org/ihtsdo/buildcloud/core/dao/helper/S3PathHelper.java index 559d7e09d..f092c5f3e 100644 --- a/src/main/java/org/ihtsdo/buildcloud/core/dao/helper/S3PathHelper.java +++ b/src/main/java/org/ihtsdo/buildcloud/core/dao/helper/S3PathHelper.java @@ -139,7 +139,7 @@ private String getFilePath(final Build build, final String relativePath) { } public StringBuilder getBuildTransformedFilesPath(final Build build) { - return getBuildPath(build.getReleaseCenterKey(), build.getProductKey(), build.getId()).append(TRANSFORMED_FILES).append(SEPARATOR); + return getBuildPath(build).append(TRANSFORMED_FILES).append(SEPARATOR); } public String getTransformedFilePath(final Build build, final String relativeFilePath) {