Merge pull request #30 from pjhcsols/BE_J

confirm merge

web3-credential-server/build/resources/main/data.sql

@@ -6,4 +6,4 @@ VALUES
 INSERT INTO wallets (user_id, pdfUrl,privateKey, publicKey, address)
 VALUES
     (1, 'https://web3credentialbucket.s3.ap-northeast-2.amazonaws.com/ssa_1727764703278_ssa','privateKeyForUser1', 'publicKeyForUser1', 'addressForUser1'),
-    (2, 'https://web3credentialbucket.s3.ap-northeast-2.amazonaws.com/ssa_1727764703278_ssa','privateKeyForUser2', 'publicKeyForUser2', 'addressForUser2');
+    (2,null,'privateKeyForUser2', 'publicKeyForUser2', 'addressForUser2');

web3-credential-server/src/main/java/web3/exception/GlobalExceptionHandler.java

@@ -11,6 +11,7 @@
 import web3.exception.wallet.WalletAlreadyExistsException;
 import web3.exception.wallet.WalletPrivateKeyNotEqualsException;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 

web3-credential-server/src/main/java/web3/exception/S3/GetFileException.java

@@ -0,0 +1,10 @@
+package web3.exception.S3;
+
+import java.io.IOException;
+
+public class GetFileException extends IOException {
+
+    public GetFileException(String message) {
+        super(message);
+    }
+}

web3-credential-server/src/main/java/web3/exception/S3/S3UploadException.java

@@ -0,0 +1,8 @@
+package web3.exception.S3;
+
+public class S3UploadException extends Exception{
+
+    public S3UploadException(String message) {
+        super(message);
+    }
+}

web3-credential-server/src/main/java/web3/s3Storage/controller/S3StorageController.java

@@ -10,13 +10,16 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import web3.domain.wallet.Wallet;
+import web3.exception.S3.S3UploadException;
+import web3.s3Storage.dto.CertDto;
 import web3.s3Storage.dto.DeleteCertRequest;
 import web3.s3Storage.dto.DeletePdfRequest;
 import web3.s3Storage.service.S3StorageService;
 import web3.service.wallet.WalletService;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -35,22 +38,18 @@ public S3StorageController(S3StorageService s3StorageService, WalletService wall
     @Operation(summary = "인증서(pdf) 업로드",description = "인증서를 업로드합니다. 즉,s3 스토리지에 pdf 파일을 업로드 합니다.")
     @PostMapping("/upload-pdf")
     public ResponseEntity<String> uploadPdf(
-            @Parameter(description = "업로드할 pdf 파일",required = true)
             @RequestParam("file") MultipartFile file,
-            @Parameter(description = "사용자 지갑ID",required = true)
             @RequestParam("walletId") Long walletId,
-            @Parameter(description = "pdf 정보",required = true)
-            @RequestParam String pdfInfo,
-            @Parameter(description = "pdf 키값",required = true)
-            @RequestParam String pdfKey) {
+            @RequestParam("certName") String certName,
+            @RequestParam Map<String, String> certContents) throws IOException {
+        certContents.remove("walletId");
+        certContents.remove("file");
+        certContents.remove("certName");
+        //나중에 입력부분 바꾸는거 고려
         Wallet wallet = walletService.getWalletById(walletId).orElseThrow(()-> new EntityNotFoundException("Wallet does not exist"));
-        try {
-            String pdfUrl = s3StorageService.uploadPdf(file, wallet,pdfInfo,pdfKey);
-            return ResponseEntity.ok(pdfUrl);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to upload pdf: " + e.getMessage());
-        }
+        String pdfUrl = s3StorageService.uploadPdf(file, wallet,certName,certContents);
+        return ResponseEntity.ok(pdfUrl);
+
     }
 
 
@@ -60,7 +59,6 @@ public ResponseEntity<Void> deleteWallet(
             @Parameter(description = "지울 pdf 파일 경로 관련 Dto",required = true)
             @RequestBody DeletePdfRequest request) {
         String urlToDelete = request.getUrlToDelete();
-        System.out.println("urlToDelete = " + urlToDelete);
         s3StorageService.deletePdf(urlToDelete);
         return ResponseEntity.noContent().build();
     }
@@ -70,8 +68,7 @@ public ResponseEntity<Void> deleteWallet(
     public ResponseEntity<Void> deleteCertForPage(
             @Parameter(description = "walletId와 삭제할 page가 담긴 Dto",required = true)
             @RequestBody DeleteCertRequest request
-    ) throws IOException {
-        System.out.println("request = " + request);
+    ) throws IOException, S3UploadException {
         Long walletId = request.getWalletId();
         int page = request.getPage();
         Wallet wallet = walletService.getWalletById(walletId).orElseThrow(()-> new EntityNotFoundException("Wallet does not exist"));
@@ -86,7 +83,6 @@ public ResponseEntity<HashMap<String,String>> getCertList(
             @RequestParam("pdfUrl") String pdfUrl) {
         HashMap<String, String> certList = s3StorageService.getCertList(pdfUrl);
         HashMap<String, String> decodedMetadata = s3StorageService.decodeMetadata(certList);
-        //return ResponseEntity.ok().body(certList);
         return ResponseEntity.ok().body(decodedMetadata);
 
     }
@@ -113,16 +109,10 @@ public ResponseEntity<String> replacePdf(
             @Parameter(description = "페이지 번호",required = true)
             @RequestParam("page") int page,
             @Parameter(description = "사용자 지갑ID",required = true)
-            @RequestParam("walletId") Long walletId) {
-        try {
-            System.out.println("file = " + file);
-            Wallet wallet = walletService.getWalletById(walletId).orElseThrow(()-> new EntityNotFoundException("Wallet does not exist"));
-            String pdfUrl = s3StorageService.replacePdfPage(wallet, page, file);
-            return ResponseEntity.ok(pdfUrl);
-        }catch(IOException e) {
-            e.printStackTrace();
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to replace pdf: " + e.getMessage());
-        }
+            @RequestParam("walletId") Long walletId) throws IOException {
+        Wallet wallet = walletService.getWalletById(walletId).orElseThrow(()-> new EntityNotFoundException("Wallet does not exist"));
+        String pdfUrl = s3StorageService.replacePdfPage(wallet, page, file);
+        return ResponseEntity.ok(pdfUrl);
     }
 
     @Operation(summary = "메타데이터 얻기",description = "사용자의 모든 메타데이터의 정보들을 가져옵니다.")
@@ -137,15 +127,16 @@ public ResponseEntity<String> getMetadata(
         return ResponseEntity.ok().body(metadata);
     }
 
-    @Operation(summary = "pdf key값 얻기",description = "사용자의 pdf에서 원하는 페이지의 key값을 가져옵니다.")
-    @GetMapping("/get-pdfkey")
-    public ResponseEntity<String> getPdfKey(
+    @Operation(summary = "메타데이터 내용부분 얻기",description = "사용자의 인증서 목록중 원하는 인증서의 내용들을 가져옵니다.")
+    @GetMapping("/get-content")
+    public ResponseEntity<List<Map.Entry<String, String>>> getPdfKey(
             @Parameter(description = "pdf 파일 경로",required = true)
             @RequestParam String pdfUrl,
             @Parameter(description = "페이지 번호",required = true)
-            @RequestParam int page) {
-        String metadata = s3StorageService.getPdfKeyForPage(pdfUrl, page);
-        return ResponseEntity.ok().body(metadata);
+            @RequestParam String certName) {
+
+        List<Map.Entry<String, String>> contentsForCertName = s3StorageService.getContentsForCertName(pdfUrl, certName);
+        return ResponseEntity.ok().body(contentsForCertName);
     }
 
 }

web3-credential-server/src/main/java/web3/s3Storage/dto/CertDto.java

@@ -0,0 +1,17 @@
+package web3.s3Storage.dto;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.util.HashMap;
+
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class CertDto {
+    private String certName;
+    private HashMap<String, String> certContents;
+
+    // Getters and Setters
+}