Merge pull request #85 from TU-NEBULA/fix/SCRUM-214

SCRUM 214 : html_file S3 버킷 공유 문제 해결

Author: Seungkiii

src/main/java/com/team_nebula/nebula/domain/star/service/StarCommandServiceImpl.java

@@ -55,7 +55,7 @@ public CreateStarResponseDTO createFirstStar(Long userId, MultipartFile htmlFile
                 .orElseThrow(() -> new GeneralException(ErrorStatus._USER_NOT_FOUND));
 
         String sanitizedTitle = s3Service.sanitizeTitleForS3(title);
-        String htmlFileKey = s3Service.saveHtmlFile(htmlFile, sanitizedTitle);
+        String htmlFileKey = s3Service.saveHtmlFile(htmlFile, sanitizedTitle, userNode.getUserId());
 
         Star star = Star.builder()
                 .title(title)
@@ -215,7 +215,7 @@ public DeleteStarResponseDTO cancelStar(UUID starId){
 
     @Override
     public AddBookMarkResponseDTO addBookMark(Long userId, MultipartFile htmlFile, String title, String siteUrl){
-        String htmlFileKey = s3Service.saveHtmlFile(htmlFile, title);
+        String htmlFileKey = s3Service.saveHtmlFile(htmlFile, title, userId);
 
         Favicon favicon = faviconService.getOrCreateFavicon(siteUrl);
 

src/main/java/com/team_nebula/nebula/global/image/S3Service.java

@@ -7,6 +7,7 @@
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.team_nebula.nebula.global.apipayload.code.status.ErrorStatus;
 import com.team_nebula.nebula.global.apipayload.exception.GeneralException;
+import com.team_nebula.nebula.global.util.HashUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,20 +41,21 @@ public String saveThumbnail(MultipartFile thumbnailImage, String dataInfo) {
         return uploadThumbnailToS3(thumbnailImage, THUMBNAIL_DIR, dataInfo);
     }
 
-    public String saveHtmlFile(MultipartFile htmlFile, String dataInfo) {
-        return uploadHtmlToS3(htmlFile, HTML_FILE_DIR, dataInfo);
+    public String saveHtmlFile(MultipartFile htmlFile, String dataInfo, Long userId) {
+        return uploadHtmlToS3(htmlFile, HTML_FILE_DIR, dataInfo, userId);
     }
 
     public String saveFavicon(File faviconFile, String domain) {
         String fileName = FAVICON_FILE_DIR + domain + ".png";
         return uploadFileToS3(faviconFile, fileName);
     }
 
-    private String uploadHtmlToS3(MultipartFile file, String dirName, String dataInfo)  {
+    private String uploadHtmlToS3(MultipartFile file, String dirName, String dataInfo, Long userId)  {
         File uploadFile = convert(file)
                 .orElseThrow(() -> new GeneralException(ErrorStatus._MULTIPARTFILE_CONVERT_FAIL));
+        String hashUserId = HashUtil.hashUserId(userId);
 
-        String fileName = dirName + dataInfo + "/" + UUID.randomUUID() + "_" + file.getOriginalFilename();
+        String fileName = dirName + hashUserId + "/" + dataInfo + "/" + UUID.randomUUID() + "_" + file.getOriginalFilename();
 
         putHtmlS3(uploadFile, fileName);
         removeNewFile(uploadFile);

src/main/java/com/team_nebula/nebula/global/util/HashUtil.java

@@ -0,0 +1,27 @@
+package com.team_nebula.nebula.global.util;
+
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class HashUtil {
+    public static String hashUserId(Long userId){
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            byte[] encodedHash = digest.digest(userId.toString().getBytes());
+            return bytesToHex(encodedHash).substring(0, 16);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("UserId Hash Algorithm failed to calculate hash", e);
+        }
+    }
+
+    private static String bytesToHex(byte[] hash) {
+        StringBuilder hexString = new StringBuilder(2 * hash.length);
+        for (byte b : hash) {
+            String hex = Integer.toHexString(0xff & b);
+            if (hex.length() == 1) hexString.append('0');
+            hexString.append(hex);
+        }
+        return hexString.toString();
+    }
+}