Feat: PDFKey 추출해오는 메서드 및 파일이름 저장시 wallet address로 저장되게 수정

pjhcsols · Aug 28, 2024 · c0d783c · c0d783c
1 parent 94057f3
commit c0d783c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/web3-credential-server/build/tmp/compileJava/previous-compilation-data.bin b/web3-credential-server/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/web3-credential-server/src/main/java/web3/s3Storage/controller/S3StorageController.java b/web3-credential-server/src/main/java/web3/s3Storage/controller/S3StorageController.java
@@ -93,6 +93,13 @@ public ResponseEntity<String> getMetadata(@RequestParam String pdfUrl,
         return ResponseEntity.ok().body(metadata);
     }
 
+    @GetMapping("/get-pdfkey")
+    public ResponseEntity<String> getPdfKey(@RequestParam String pdfUrl,
+                                              @RequestParam int page) {
+        String metadata = s3StorageService.getPdfKeyForPage(pdfUrl, page);
+        return ResponseEntity.ok().body(metadata);
+    }
+
 
 
     /*//스케줄러 용

diff --git a/web3-credential-server/src/main/java/web3/s3Storage/service/S3StorageService.java b/web3-credential-server/src/main/java/web3/s3Storage/service/S3StorageService.java
@@ -110,7 +110,7 @@ public String uploadPdf(MultipartFile file, Wallet wallet,String pdfInfo,String
     }
 
     private static String getFileName(MultipartFile file, Wallet wallet) {
-        return wallet.getAddress() + "_" + System.currentTimeMillis() + "_" + file.getOriginalFilename();
+        return wallet.getAddress() + "_" + System.currentTimeMillis() + "_" + wallet.getAddress();
     }
 
     private static String getEmptyFilename(Wallet wallet) {
@@ -320,6 +320,30 @@ public String getMetadataForPage(String pdfUrl, int pageNumber) {
         return null; // 결과가 없거나 ':'가 없는 경우 null 반환
     }
 
+    public String getPdfKeyForPage(String pdfUrl, int pageNumber) {
+        String fileName = extractKeyFromUrl(pdfUrl);
+
+        GetObjectRequest getRequest = GetObjectRequest.builder()
+                .bucket(bucketName)
+                .key(fileName)
+                .build();
+
+        GetObjectResponse getObjectResponse = s3Client.getObject(getRequest).response();
+
+        Map<String, String> metadata = getObjectResponse.metadata();
+
+        String pageKey = "page-" + pageNumber;
+
+        String result = metadata.get(pageKey);
+
+        // pdfKey 부분만 추출
+        if (result != null && result.contains(":")) {
+            return result.split(":")[1]; // ':'기준으로 분리
+        }
+
+        return null; // 결과가 없거나 ':'가 없는 경우 null 반환
+    }
+
 
 
     public int getPdfPageCount(byte[] pdfBytes) throws IOException {