SUPPORT-9322: Fix

This commit is contained in:
Eduard Tihomirov 2025-09-09 14:53:12 +03:00
parent 97028eacc5
commit 48b03073a6

View file

@ -16,11 +16,13 @@ import ru.micord.ervu.av.exception.FileUploadException;
public class S3Service {
private final String outBucketName;
private final AmazonS3 outClient;
private final String s3Prefix;
@Autowired
public S3Service(String outBucketName, AmazonS3 outClient) {
this.outBucketName = outBucketName;
this.outClient = outClient;
this.s3Prefix = "s3://" + outBucketName + "/";
}
@PostConstruct
@ -33,7 +35,7 @@ public class S3Service {
public String putFile(Path filePath, String key) throws FileUploadException {
try {
outClient.putObject(outBucketName, key, filePath.toFile());
return String.join("/", "s3:/", outBucketName, key);
return s3Prefix + key;
}
catch (AmazonServiceException e) {
// todo message
@ -42,11 +44,10 @@ public class S3Service {
}
public void deleteFileByUrl(String url) {
String prefix = "s3://" + outBucketName + "/";
if (!url.startsWith(prefix)) {
if (!url.startsWith(s3Prefix)) {
throw new IllegalArgumentException("Некорректный S3 URL: " + url);
}
String key = url.substring(prefix.length());
String key = url.substring(s3Prefix.length());
outClient.deleteObject(outBucketName, key);
}
}