From 0f22ee56e6fd8c646fd0a2c83d9505cb9f4609da Mon Sep 17 00:00:00 2001 From: Vlad-Stelea Date: Tue, 10 Dec 2019 13:23:06 -0500 Subject: [PATCH] Made database store full url --- .../src/main/java/youtrek/handlers/UploadVideoHandler.java | 4 ++-- youTrek/src/main/java/youtrek/s3/S3Util.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/youTrek/src/main/java/youtrek/handlers/UploadVideoHandler.java b/youTrek/src/main/java/youtrek/handlers/UploadVideoHandler.java index 67c8590..ac863ab 100644 --- a/youTrek/src/main/java/youtrek/handlers/UploadVideoHandler.java +++ b/youTrek/src/main/java/youtrek/handlers/UploadVideoHandler.java @@ -26,9 +26,9 @@ public UploadVideoResponse handleRequest(UploadVideoPostRequest uploadVideoPostR String videoKey = generateUniqueBucketKeyForVideo() + ".ogg"; S3Util.getInstance().uploadVideoToBucket(BUCKET_LOCATION, videoKey, uploadVideoPostRequest.getVideo()); - + String url = S3Util.getInstance().getUrl(BUCKET_LOCATION, videoKey); //Insert into the videos table - Video insertVideo = new Video(uploadVideoPostRequest.getName(), "/" + videoKey, uploadVideoPostRequest.getDialogue()); + Video insertVideo = new Video(uploadVideoPostRequest.getName(), url, uploadVideoPostRequest.getDialogue()); insertVideo.id = VideoDAO.getInstance().createVideo(insertVideo); //Parse the characters passed in as a string and turn them into character objects diff --git a/youTrek/src/main/java/youtrek/s3/S3Util.java b/youTrek/src/main/java/youtrek/s3/S3Util.java index d15d0cd..b128ddb 100644 --- a/youTrek/src/main/java/youtrek/s3/S3Util.java +++ b/youTrek/src/main/java/youtrek/s3/S3Util.java @@ -53,6 +53,13 @@ public void deleteFile(String bucketName, String fileName) throws Exception{ s3.deleteObject(bucketName, fileName); } + public String getUrl(String bucketName, String fileName) throws Exception{ + final AmazonS3 s3 = AmazonS3ClientBuilder.standard() + .withRegion(Regions.US_EAST_2) //Stick to Ohio region because that's where our buckets are located + .build(); + + return s3.getUrl(bucketName, fileName).toString(); + } //Exception should bubble up