[RELEASE] dev to main

src/main/java/ditda/backend/domain/common/auth/controller/AuthController.java → src/main/java/ditda/backend/domain/auth/controller/AuthController.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.controller;
+package ditda.backend.domain.auth.controller;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.CookieValue;
@@ -7,16 +7,16 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import ditda.backend.domain.common.auth.dto.AuthResult;
-import ditda.backend.domain.common.auth.dto.TokenResult;
-import ditda.backend.domain.common.auth.dto.request.CheckUsernameRequest;
-import ditda.backend.domain.common.auth.dto.request.EmailCodeVerificationRequest;
-import ditda.backend.domain.common.auth.dto.request.EmailVerificationRequest;
-import ditda.backend.domain.common.auth.dto.request.LoginRequest;
-import ditda.backend.domain.common.auth.dto.response.LoginResponse;
-import ditda.backend.domain.common.auth.dto.response.ReissueResponse;
-import ditda.backend.domain.common.auth.facade.AuthFacade;
-import ditda.backend.domain.common.auth.mapper.AuthResponseMapper;
+import ditda.backend.domain.auth.dto.AuthResult;
+import ditda.backend.domain.auth.dto.TokenResult;
+import ditda.backend.domain.auth.dto.request.CheckUsernameRequest;
+import ditda.backend.domain.auth.dto.request.EmailCodeVerificationRequest;
+import ditda.backend.domain.auth.dto.request.EmailVerificationRequest;
+import ditda.backend.domain.auth.dto.request.LoginRequest;
+import ditda.backend.domain.auth.dto.response.LoginResponse;
+import ditda.backend.domain.auth.dto.response.ReissueResponse;
+import ditda.backend.domain.auth.facade.AuthFacade;
+import ditda.backend.domain.auth.mapper.AuthResponseMapper;
 import ditda.backend.global.apipayload.response.ApiResponse;
 import ditda.backend.global.jwt.utils.CookieUtils;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/ditda/backend/domain/auth/controller/DesignerAuthController.java

@@ -0,0 +1,67 @@
+package ditda.backend.domain.auth.controller;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import ditda.backend.domain.auth.dto.AuthResult;
+import ditda.backend.domain.auth.dto.request.DesignerSignupRequest;
+import ditda.backend.domain.auth.dto.request.PortfolioPresignRequest;
+import ditda.backend.domain.auth.dto.response.PortfolioPresignResponse;
+import ditda.backend.domain.auth.dto.response.SignupResponse;
+import ditda.backend.domain.auth.facade.DesignerAuthFacade;
+import ditda.backend.domain.auth.mapper.AuthResponseMapper;
+import ditda.backend.global.apipayload.response.ApiResponse;
+import ditda.backend.global.jwt.utils.CookieUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/api/v1/designers/auth")
+@RequiredArgsConstructor
+@Tag(name = "Designer Auth", description = "디자이너 회원가입 API")
+public class DesignerAuthController {
+
+	private final DesignerAuthFacade designerAuthFacade;
+	private final CookieUtils cookieUtils;
+	private final AuthResponseMapper authResponseMapper;
+
+	@Operation(
+		summary = "포트폴리오 업로드 URL 발급",
+		description = "**[회원가입]** 이메일 인증 완료 후, 포트폴리오 파일을 S3에 올릴 presigned PUT URL을 발급합니다. "
+			+ "PUT URL로 S3에 직접 업로드한 뒤, 응답의 key를 회원가입 요청의 portfolioKeys에 담아 전송합니다."
+	)
+	@PostMapping("/signup/portfolio/presigned-url")
+	public ApiResponse<PortfolioPresignResponse> issuePortfolioPresignedUrls(
+		@Valid @RequestBody PortfolioPresignRequest request
+	) {
+		PortfolioPresignResponse response = designerAuthFacade.issuePortfolioPresignedUrl(request);
+
+		return ApiResponse.onSuccess("포트폴리오 업로드 URL 발급 성공", response);
+	}
+
+	@Operation(
+		summary = "디자이너 회원가입",
+		description = "**[회원가입]** 회원가입 후 자동 로그인 처리됩니다. presigned PUT URL로 업로드한 포트폴리오 key를 portfolioKeys에 담아 전송합니다."
+	)
+	@PostMapping(value = "/signup")
+	public ApiResponse<SignupResponse> signup(
+		@Valid @RequestBody DesignerSignupRequest request,
+		HttpServletResponse response
+	) {
+		AuthResult result = designerAuthFacade.signup(request);
+
+		addRefreshTokenCookie(response, result.refreshToken());
+
+		return ApiResponse.onSuccess("디자이너 회원가입 성공", authResponseMapper.toSignupResponse(result));
+	}
+
+	private void addRefreshTokenCookie(HttpServletResponse response, String refreshToken) {
+		response.addHeader(HttpHeaders.SET_COOKIE, cookieUtils.createRefreshTokenCookie(refreshToken).toString());
+	}
+}

src/main/java/ditda/backend/domain/instructor/auth/controller/InstructorAuthController.java → src/main/java/ditda/backend/domain/auth/controller/InstructorAuthController.java

@@ -1,16 +1,16 @@
-package ditda.backend.domain.instructor.auth.controller;
+package ditda.backend.domain.auth.controller;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import ditda.backend.domain.instructor.auth.dto.InstructorAuthResult;
-import ditda.backend.domain.instructor.auth.dto.request.InstructorSignupRequest;
-import ditda.backend.domain.instructor.auth.dto.response.InstructorSignupResponse;
-import ditda.backend.domain.instructor.auth.facade.InstructorAuthFacade;
-import ditda.backend.domain.instructor.auth.mapper.InstructorAuthResponseMapper;
+import ditda.backend.domain.auth.dto.AuthResult;
+import ditda.backend.domain.auth.dto.request.InstructorSignupRequest;
+import ditda.backend.domain.auth.dto.response.SignupResponse;
+import ditda.backend.domain.auth.facade.InstructorAuthFacade;
+import ditda.backend.domain.auth.mapper.AuthResponseMapper;
 import ditda.backend.global.apipayload.response.ApiResponse;
 import ditda.backend.global.jwt.utils.CookieUtils;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,16 +27,16 @@ public class InstructorAuthController {
 
 	private final InstructorAuthFacade instructorAuthFacade;
 	private final CookieUtils cookieUtils;
-	private final InstructorAuthResponseMapper authResponseMapper;
+	private final AuthResponseMapper authResponseMapper;
 
 	@Operation(summary = "강사 회원가입", description = "**[회원가입]** 회원가입 후 자동 로그인 처리됩니다.")
 	@PostMapping("/signup")
-	public ApiResponse<InstructorSignupResponse> signup(
+	public ApiResponse<SignupResponse> signup(
 		@Valid @RequestBody InstructorSignupRequest request,
 		HttpServletResponse response
 	) {
 
-		InstructorAuthResult result = instructorAuthFacade.signup(request);
+		AuthResult result = instructorAuthFacade.signup(request);
 
 		addRefreshTokenCookie(response, result.refreshToken());
 

src/main/java/ditda/backend/domain/common/auth/dto/AuthResult.java → src/main/java/ditda/backend/domain/auth/dto/AuthResult.java

@@ -1,9 +1,13 @@
-package ditda.backend.domain.common.auth.dto;
+package ditda.backend.domain.auth.dto;
+
+import ditda.backend.domain.user.entity.enums.UserRole;
 
 public record AuthResult(
 
 	Long userId,
 
+	UserRole userRole,
+
 	String name,
 
 	String profileImage,

src/main/java/ditda/backend/domain/common/auth/dto/TokenResult.java → src/main/java/ditda/backend/domain/auth/dto/TokenResult.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.dto;
+package ditda.backend.domain.auth.dto;
 
 public record TokenResult(
 	String accessToken,

src/main/java/ditda/backend/domain/common/auth/dto/request/CheckUsernameRequest.java → src/main/java/ditda/backend/domain/auth/dto/request/CheckUsernameRequest.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.dto.request;
+package ditda.backend.domain.auth.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ditda/backend/domain/designer/auth/dto/request/DesignerSignupRequest.java → src/main/java/ditda/backend/domain/auth/dto/request/DesignerSignupRequest.java

@@ -1,11 +1,11 @@
-package ditda.backend.domain.designer.auth.dto.request;
+package ditda.backend.domain.auth.dto.request;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import ditda.backend.domain.common.term.entity.enums.TermType;
-import ditda.backend.domain.designer.auth.entity.enums.BankName;
+import ditda.backend.domain.designer.entity.enums.BankName;
+import ditda.backend.domain.term.entity.enums.TermType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Email;
@@ -84,7 +84,12 @@ public record DesignerSignupRequest(
 
 	@NotNull(message = "계좌 정보는 필수입니다")
 	@Valid
-	BankAccountRequest bankAccount
+	BankAccountRequest bankAccount,
+
+	@Schema(description = "presigned URL로 업로드한 포트폴리오 key 목록 (최대 3개)",
+		example = "[\"portfolio/tmp/3f2b....pdf\", \"portfolio/tmp/9a1c....png\"]")
+	@Size(max = 3, message = "포트폴리오 파일은 최대 3개까지 업로드 가능합니다.")
+	List<@NotBlank(message = "포트폴리오 key는 비어 있을 수 없습니다.") String> portfolioKeys
 ) {
 
 	public record TermRequest(

src/main/java/ditda/backend/domain/common/auth/dto/request/EmailCodeVerificationRequest.java → src/main/java/ditda/backend/domain/auth/dto/request/EmailCodeVerificationRequest.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.dto.request;
+package ditda.backend.domain.auth.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;

src/main/java/ditda/backend/domain/common/auth/dto/request/EmailVerificationRequest.java → src/main/java/ditda/backend/domain/auth/dto/request/EmailVerificationRequest.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.dto.request;
+package ditda.backend.domain.auth.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;

src/main/java/ditda/backend/domain/instructor/auth/dto/request/InstructorSignupRequest.java → src/main/java/ditda/backend/domain/auth/dto/request/InstructorSignupRequest.java

@@ -1,10 +1,10 @@
-package ditda.backend.domain.instructor.auth.dto.request;
+package ditda.backend.domain.auth.dto.request;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import ditda.backend.domain.common.term.entity.enums.TermType;
+import ditda.backend.domain.term.entity.enums.TermType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Email;

src/main/java/ditda/backend/domain/common/auth/dto/request/LoginRequest.java → src/main/java/ditda/backend/domain/auth/dto/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.dto.request;
+package ditda.backend.domain.auth.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ditda/backend/domain/auth/dto/request/PortfolioPresignRequest.java

@@ -0,0 +1,19 @@
+package ditda.backend.domain.auth.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+
+@Schema(description = "포트폴리오 presigned URL 발급 요청")
+public record PortfolioPresignRequest(
+
+	@Schema(description = "인증 완료된 이메일", example = "testid@gmail.com")
+	@NotBlank(message = "이메일은 필수입니다.")
+	@Email(message = "올바른 이메일 형식이 아닙니다.")
+	String email,
+
+	@Schema(description = "파일 Content-Type", example = "application/pdf")
+	@NotBlank(message = "Content-Type은 필수입니다.")
+	String contentType
+) {
+}

src/main/java/ditda/backend/domain/common/auth/dto/response/LoginResponse.java → src/main/java/ditda/backend/domain/auth/dto/response/LoginResponse.java

@@ -1,5 +1,6 @@
-package ditda.backend.domain.common.auth.dto.response;
+package ditda.backend.domain.auth.dto.response;
 
+import ditda.backend.domain.user.entity.enums.UserRole;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "로그인 응답")
@@ -8,6 +9,9 @@ public record LoginResponse(
 	@Schema(description = "로그인 유저 ID", example = "1")
 	Long userId,
 
+	@Schema(description = "사용자 타입", example = "INSTRUCTOR")
+	UserRole userType,
+
 	@Schema(description = "사용자 이름", example = "홍길동")
 	String name,
 

src/main/java/ditda/backend/domain/auth/dto/response/PortfolioPresignResponse.java

@@ -0,0 +1,13 @@
+package ditda.backend.domain.auth.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record PortfolioPresignResponse(
+
+	@Schema(description = "S3 객체 key", example = "portfolio/tmp/5a5237a7-674a-47c2-91ca-6fdb28ba6b2d.pdf")
+	String key,
+
+	@Schema(description = "S3 직접 업로드용 presigned PUT URL", example = "https://{bucket}.s3.{region}.amazonaws.com/portfolio/tmp/{uuid}.pdf?X-Amz-Signature=...")
+	String presignedUrl
+) {
+}

src/main/java/ditda/backend/domain/common/auth/dto/response/ReissueResponse.java → src/main/java/ditda/backend/domain/auth/dto/response/ReissueResponse.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.dto.response;
+package ditda.backend.domain.auth.dto.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/ditda/backend/domain/designer/auth/dto/response/DesignerSignupResponse.java → src/main/java/ditda/backend/domain/auth/dto/response/SignupResponse.java

@@ -1,13 +1,17 @@
-package ditda.backend.domain.designer.auth.dto.response;
+package ditda.backend.domain.auth.dto.response;
 
+import ditda.backend.domain.user.entity.enums.UserRole;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-@Schema(description = "디자이너 회원가입 응답")
-public record DesignerSignupResponse(
+@Schema(description = "회원가입 응답")
+public record SignupResponse(
 
 	@Schema(description = "User ID")
 	Long userId,
 
+	@Schema(description = "사용자 타입", example = "INSTRUCTOR")
+	UserRole userType,
+
 	@Schema(description = "사용자 이름", example = "홍길동")
 	String name,
 

src/main/java/ditda/backend/domain/common/auth/entity/RefreshToken.java → src/main/java/ditda/backend/domain/auth/entity/RefreshToken.java

@@ -1,10 +1,10 @@
-package ditda.backend.domain.common.auth.entity;
+package ditda.backend.domain.auth.entity;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.time.LocalDateTime;
 
-import ditda.backend.domain.common.user.entity.User;
+import ditda.backend.domain.user.entity.User;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

src/main/java/ditda/backend/domain/designer/auth/event/DesignerSignedUpEvent.java → src/main/java/ditda/backend/domain/auth/event/DesignerSignedUpEvent.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.designer.auth.event;
+package ditda.backend.domain.auth.event;
 
 import java.util.List;
 

src/main/java/ditda/backend/domain/common/auth/exception/AuthErrorCode.java → src/main/java/ditda/backend/domain/auth/exception/AuthErrorCode.java

@@ -1,4 +1,4 @@
-package ditda.backend.domain.common.auth.exception;
+package ditda.backend.domain.auth.exception;
 
 import org.springframework.http.HttpStatus;
 

src/main/java/ditda/backend/domain/common/auth/facade/AuthFacade.java → src/main/java/ditda/backend/domain/auth/facade/AuthFacade.java

@@ -1,14 +1,14 @@
-package ditda.backend.domain.common.auth.facade;
+package ditda.backend.domain.auth.facade;
 
 import org.springframework.stereotype.Component;
 
-import ditda.backend.domain.common.auth.dto.AuthResult;
-import ditda.backend.domain.common.auth.dto.TokenResult;
-import ditda.backend.domain.common.auth.dto.request.LoginRequest;
-import ditda.backend.domain.common.auth.notification.EmailVerificationMailer;
-import ditda.backend.domain.common.auth.service.AuthService;
-import ditda.backend.domain.common.auth.service.EmailVerificationService;
-import ditda.backend.domain.common.user.service.UserService;
+import ditda.backend.domain.auth.dto.AuthResult;
+import ditda.backend.domain.auth.dto.TokenResult;
+import ditda.backend.domain.auth.dto.request.LoginRequest;
+import ditda.backend.domain.auth.notification.EmailVerificationMailer;
+import ditda.backend.domain.auth.service.AuthService;
+import ditda.backend.domain.auth.service.EmailVerificationService;
+import ditda.backend.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 
 @Component