Merge pull request #24 from hackathon-soa/refactor/#21

refactor : 회원가입 API 수정 및 이미지 업로드 API 추가 구현

Author: Jinseong01

src/main/java/hackathon/soa/config/AmazonConfig.java

@@ -42,6 +42,9 @@ public class AmazonConfig {
     @Value("stories")
     private String storiesPath; // S3 내 테스트 관련 파일 저장 디렉토리 경로 (폴더명: stories)
 
+    @Value("verification")
+    private String verificationPath; // S3 내 테스트 관련 파일 저장 디렉토리 경로 (폴더명: tests)
+
     //!! s3에 어떤 디렉토리를 만들고, 그안에 뭘 저장하고 싶다면!!
     //1. aws 콘솔에서 s3 디렉토리 생성
     //2. AmazonConfig에 private String ~~Path 변수 생성

src/main/java/hackathon/soa/domain/auth/AuthController.java

@@ -7,7 +7,9 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Size;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/api/auth")
@@ -28,6 +30,19 @@ public ApiResponse<AuthResponseDTO.SignupResponseDTO> register(
         return ApiResponse.onSuccess(result);
     }
 
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(
+            summary = "신원인증 이미지 업로드",
+            description = "사용자의 신원정보를 증빙할 수 있는 이미지를 받아서 S3에 업로드합니다."
+    )
+    public ApiResponse<AuthResponseDTO.UploadResponseDTO> upload(
+            @RequestParam Long memberId,
+            MultipartFile file
+            ) {
+        AuthResponseDTO.UploadResponseDTO result = authService.uploadVerification(memberId, file);
+        return ApiResponse.onSuccess(result);
+    }
+
 
     @GetMapping("/check")
     @Operation(

src/main/java/hackathon/soa/domain/auth/AuthConverter.java

@@ -12,6 +12,7 @@ public static AuthResponseDTO.SignupResponseDTO toSignUpResponseDTO(Member saved
                 ;
     }
 
+
     public static AuthResponseDTO.DuplicateCheckResponseDTO toDuplicateCheckResponseDTO(boolean isExists) {
         return AuthResponseDTO.DuplicateCheckResponseDTO.builder()
                 .isAvailable(!isExists)
@@ -26,4 +27,12 @@ public static AuthResponseDTO.LoginResponseDTO toLoginResponseDTO(Member member,
                 .accessToken(accessToken)
                 .build();
     }
+
+
+    public static AuthResponseDTO.UploadResponseDTO toUploadResponseDTO(Member member, String imageUrl) {
+        return AuthResponseDTO.UploadResponseDTO.builder()
+                .userId(member.getId())
+                .verificationImageUrl(imageUrl)
+                .build();
+    }
 }

src/main/java/hackathon/soa/domain/auth/AuthService.java

@@ -3,15 +3,20 @@
 import hackathon.soa.common.JwtUtil;
 import hackathon.soa.common.apiPayload.code.status.ErrorStatus;
 import hackathon.soa.common.apiPayload.exception.AuthHandler;
+import hackathon.soa.config.AmazonConfig;
 import hackathon.soa.domain.auth.dto.AuthRequestDTO;
 import hackathon.soa.domain.auth.dto.AuthResponseDTO;
 import hackathon.soa.domain.member.MemberConverter;
 import hackathon.soa.domain.member.MemberRepository;
+import hackathon.soa.domain.s3.AmazonS3Manager;
 import hackathon.soa.entity.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.UUID;
 
 @Service
 @Transactional
@@ -21,6 +26,8 @@ public class AuthService {
     private final MemberRepository memberRepository;
     private final PasswordEncoder passwordEncoder;
     private final JwtUtil jwtUtil;
+    private final AmazonS3Manager amazonS3Manager;
+    private final AmazonConfig amazonConfig;
 
     public AuthResponseDTO.SignupResponseDTO register(AuthRequestDTO.SignupRequestDTO request) {
         // 1) 아이디 중복 체크
@@ -69,4 +76,31 @@ public AuthResponseDTO.LoginResponseDTO login(AuthRequestDTO.LoginRequestDTO req
         // 45) 응답 DTO 생성
         return AuthConverter.toLoginResponseDTO(member, accessToken);
     }
+
+    public AuthResponseDTO.UploadResponseDTO uploadVerification(Long memberId, MultipartFile file) {
+        // 1) Member 조회
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new IllegalArgumentException("해당 ID의 회원이 존재하지 않습니다: " + memberId));
+
+
+        // 2) 파일명 생성
+        String keyName = generateVerificationImageKeyName(file.getOriginalFilename());
+
+
+        // 3) S3에 업로드
+        String imageUrl = amazonS3Manager.uploadFile(keyName, file);
+
+
+        // 4) Member의 verificationImageUrl 업데이트
+        member.updateVerificationImageUrl(imageUrl);
+
+
+        // 5) 응답 DTO 생성
+        return AuthConverter.toUploadResponseDTO(member, imageUrl);
+    }
+
+    private String generateVerificationImageKeyName(String originalFileName) {
+        String ext = originalFileName.substring(originalFileName.lastIndexOf(".")); // .jpg, .png 등
+        return amazonConfig.getVerificationPath() + "/" + UUID.randomUUID() + ext; // verification/uuid.jpg
+    }
 }

src/main/java/hackathon/soa/domain/auth/dto/AuthRequestDTO.java

@@ -47,9 +47,6 @@ public static class SignupRequestDTO {
         @NotBlank(message = "장애 유형은 필수입니다")
         @Pattern(regexp = "^\\[.*\\]$", message = "장애 유형은 JSON 배열 형식이어야 합니다")
         private String disabilityType;
-
-        @NotNull(message = "프로필 이미지는 필수입니다")
-        private Integer profileImage;
     }
 
     @Builder

src/main/java/hackathon/soa/domain/auth/dto/AuthResponseDTO.java

@@ -15,6 +15,15 @@ public static class SignupResponseDTO {
         private String appId;
     }
 
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class UploadResponseDTO {
+        private Long userId;
+        private String verificationImageUrl;
+    }
+
     @Builder
     @Getter
     @NoArgsConstructor

…domain/auth/course/CourseRepository.java …/soa/domain/course/CourseRepository.javasrc/main/java/hackathon/soa/domain/auth/course/CourseRepository.java renamed to src/main/java/hackathon/soa/domain/course/CourseRepository.java src/main/java/hackathon/soa/domain/auth/course/CourseRepository.java renamed to src/main/java/hackathon/soa/domain/course/CourseRepository.java

@@ -1,4 +1,4 @@
-package hackathon.soa.domain.auth.course;
+package hackathon.soa.domain.course;
 
 import hackathon.soa.entity.Course;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/hackathon/soa/domain/home/HomeService.java

@@ -2,14 +2,13 @@
 
 import hackathon.soa.common.apiPayload.code.status.ErrorStatus;
 import hackathon.soa.common.apiPayload.exception.GeneralException;
-import hackathon.soa.domain.auth.course.CourseRepository;
+import hackathon.soa.domain.course.CourseRepository;
 import hackathon.soa.domain.home.dto.HomeResponseDTO;
 import hackathon.soa.entity.Course;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 

src/main/java/hackathon/soa/domain/member/MemberConverter.java

@@ -10,28 +10,6 @@ public static Member toMember(AuthRequestDTO.SignupRequestDTO request, PasswordE
         // 성별 변환
         Gender gender = "남성".equals(request.getGender()) ? Gender.MALE : Gender.FEMALE;
 
-        // 프로필 이미지 변환
-        String profileImageUrl;
-        switch (request.getProfileImage()) {
-            case 1:
-                profileImageUrl = "https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit1.png";
-                break;
-            case 2:
-                profileImageUrl = "https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit2.png";
-                break;
-            case 3:
-                profileImageUrl = "https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit3.png";
-                break;
-            case 4:
-                profileImageUrl = "https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit4.png";
-                break;
-            case 5:
-                profileImageUrl = "https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit5.png";
-                break;
-            default:
-                profileImageUrl = "https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit1.png";
-        }
-
         return Member.builder()
                 .appId(request.getAppId())
                 .password(passwordEncoder.encode(request.getPassword()))
@@ -41,7 +19,7 @@ public static Member toMember(AuthRequestDTO.SignupRequestDTO request, PasswordE
                 .birth(request.getBirth())
                 .gender(gender)
                 .disabilityType(request.getDisabilityType())
-                .profileImageUrl(profileImageUrl)
+                .profileImageUrl("https://umc-hack-demo-bucket.s3.ap-northeast-2.amazonaws.com/rabbit1.png")
                 .mileage(0)
                 .build();
     }

src/main/java/hackathon/soa/domain/story/StoryController.java

@@ -35,6 +35,7 @@ public ApiResponse<String> uploadImage(
         String url = testService.uploadTestImage(image, userId);
         return ApiResponse.onSuccess(url);
     }
+
     @Operation(summary = "스토리 목록 조회", description = "스토리 목록을 10개씩 페이지네이션으로 반환합니다.")
     @GetMapping
     public ApiResponse<Page<StoryResponseDTO.StoryListDTO>> getStoryList(