[BE] 회원가입 기능을 구현한다.

backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java

@@ -4,31 +4,35 @@
 import com.bang_ggood.auth.controller.cookie.CookieProvider;
 import com.bang_ggood.auth.controller.cookie.CookieResolver;
 import com.bang_ggood.auth.dto.request.OauthLoginRequest;
+import com.bang_ggood.auth.dto.request.RegisterRequestV1;
 import com.bang_ggood.auth.dto.response.AuthTokenResponse;
 import com.bang_ggood.auth.dto.response.RefreshTokenCheckResponse;
 import com.bang_ggood.auth.service.AuthService;
 import com.bang_ggood.user.domain.User;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import java.net.URI;
 
+@RequiredArgsConstructor
 @RestController
 public class AuthController {
 
     private final AuthService authService;
     private final CookieProvider cookieProvider;
     private final CookieResolver cookieResolver;
 
-    public AuthController(AuthService authService, CookieProvider cookieProvider, CookieResolver cookieResolver) {
-        this.authService = authService;
-        this.cookieProvider = cookieProvider;
-        this.cookieResolver = cookieResolver;
+    @PostMapping("/v1/local-auth/register")
+    public ResponseEntity<Void> register(@Valid @RequestBody RegisterRequestV1 request) {
+        Long userId = authService.register(request);
+        return ResponseEntity.created(URI.create("/v1/local-auth/register/" + userId)).build();
     }
 
     @PostMapping("/oauth/login")

backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/RegisterRequestV1.java

@@ -0,0 +1,15 @@
+package com.bang_ggood.auth.dto.request;
+
+import com.bang_ggood.user.domain.LoginType;
+import com.bang_ggood.user.domain.User;
+import com.bang_ggood.user.domain.UserType;
+import jakarta.validation.constraints.NotBlank;
+
+public record RegisterRequestV1(@NotBlank(message = "이름이 존재하지 않습니다.") String name,
+                                @NotBlank(message = "이메일이 존재하지 않습니다.") String email,
+                                @NotBlank(message = "비밀번호가 존재하지 않습니다.") String password) {
+
+    public User toUserEntity() {
+        return new User(name(), email(), password(), UserType.USER, LoginType.LOCAL);
+    }
+}

backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java

@@ -1,6 +1,7 @@
 package com.bang_ggood.auth.service;
 
 import com.bang_ggood.auth.dto.request.OauthLoginRequest;
+import com.bang_ggood.auth.dto.request.RegisterRequestV1;
 import com.bang_ggood.auth.dto.response.AuthTokenResponse;
 import com.bang_ggood.auth.dto.response.OauthInfoApiResponse;
 import com.bang_ggood.auth.service.jwt.JwtTokenProvider;
@@ -9,12 +10,15 @@
 import com.bang_ggood.global.DefaultChecklistService;
 import com.bang_ggood.global.exception.BangggoodException;
 import com.bang_ggood.global.exception.ExceptionCode;
+import com.bang_ggood.user.domain.Email;
+import com.bang_ggood.user.domain.LoginType;
 import com.bang_ggood.user.domain.User;
 import com.bang_ggood.user.domain.UserType;
 import com.bang_ggood.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
@@ -32,11 +36,20 @@ public class AuthService {
     private final DefaultChecklistService defaultChecklistService;
     private final UserRepository userRepository; // TODO 리팩토링
 
+    @Transactional
+    public Long register(RegisterRequestV1 request) {
+        try {
+            return userRepository.save(request.toUserEntity()).getId();
+        } catch (DataIntegrityViolationException e) {
+            throw new BangggoodException(ExceptionCode.USER_EMAIL_ALREADY_USED);
+        }
+    }
+
     @Transactional
     public AuthTokenResponse login(OauthLoginRequest request) {
         OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request);
 
-        User user = userRepository.findByEmail(oauthInfoApiResponse.kakao_account().email())
+        User user = userRepository.findByEmail(new Email(oauthInfoApiResponse.kakao_account().email()))
                 .orElseGet(() -> signUp(oauthInfoApiResponse));
 
         String accessToken = jwtTokenProvider.createAccessToken(user);

backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/PasswordEncoder.java

@@ -0,0 +1,43 @@
+package com.bang_ggood.auth.service;
+
+import com.bang_ggood.global.exception.BangggoodException;
+import com.bang_ggood.global.exception.ExceptionCode;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.util.Base64;
+
+public class PasswordEncoder {
+
+    private static final String DELIMITER = ":";
+
+    public static String encodeWithGeneralSalt(String password) {
+        return encode(password, getSalt());
+    }
+
+    public static String encode(String password, byte[] salt) {
+        try {
+            KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 512);
+            SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+            byte[] hash = factory.generateSecret(spec).getEncoded();
+            String encodedPassword = Base64.getEncoder().encodeToString(hash);
+            String encodedSalt = Base64.getEncoder().encodeToString(salt);
+            return encodedPassword + DELIMITER + encodedSalt;
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+            throw new BangggoodException(ExceptionCode.PASSWORD_HASHING_ERROR);
+        }
+    }
+
+    public static byte[] getSalt() {
+        SecureRandom secureRandom = new SecureRandom();
+        byte[] salt = new byte[64];
+        secureRandom.nextBytes(salt);
+        return salt;
+    }
+
+    private PasswordEncoder() {
+    }
+}

backend/bang-ggood/src/main/java/com/bang_ggood/global/DBInitializer.java

@@ -28,7 +28,7 @@ public void createGuestUser() {
         List<User> foundGuestUser = userService.readUser(UserType.GUEST);
 
         if (foundGuestUser.isEmpty()) {
-            User guestUser = new User("방끗", "bang-ggood@gmail.com", UserType.GUEST, LoginType.LOCAL);
+            User guestUser = new User("방끗", "bang-ggood1@gmail.com", UserType.GUEST, LoginType.LOCAL);
             userService.createUser(guestUser);
             defaultChecklistService.createDefaultChecklistAndQuestions(guestUser);
         }

backend/bang-ggood/src/main/java/com/bang_ggood/global/exception/ExceptionCode.java

@@ -20,9 +20,17 @@ public enum ExceptionCode {
 
     // User
     USER_NOT_FOUND(HttpStatus.UNAUTHORIZED, "유저가 존재하지 않습니다."),
+    USER_EMAIL_ALREADY_USED(HttpStatus.CONFLICT, "이미 해당 이메일을 사용하는 유저가 존재합니다."),
     GUEST_USER_NOT_FOUND(HttpStatus.INTERNAL_SERVER_ERROR, "게스트 유저가 존재하지 않습니다."),
     GUEST_USER_UNEXPECTED_EXIST(HttpStatus.INTERNAL_SERVER_ERROR, "예상치 못한 게스트 유저가 존재합니다. 데이터베이스를 확인해주세요."),
 
+    //Email
+    EMAIL_INVALID_FORMAT(HttpStatus.BAD_REQUEST, "유효하지 않은 이메일 형식입니다."),
+
+    //Password
+    PASSWORD_INVALID_FORMAT(HttpStatus.BAD_REQUEST, "유효하지 않은 비밀번호 형식입니다."),
+    PASSWORD_HASHING_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "비밀번호 해싱 중 오류가 발생했습니다."),
+
     // Answer
     ANSWER_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."),
 

backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/Email.java

@@ -0,0 +1,55 @@
+package com.bang_ggood.user.domain;
+
+import com.bang_ggood.global.exception.BangggoodException;
+import com.bang_ggood.global.exception.ExceptionCode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+import static lombok.AccessLevel.PROTECTED;
+
+@Embeddable
+@Getter
+@NoArgsConstructor(access = PROTECTED)
+public class Email {
+
+    //이메일은 영문 대소문자, 숫자, 점, 하이픈, 언더스코어, 플러스 기호를 포함할 수 있으며,
+    // "@" 기호 뒤에 도메인 이름이 필요하고,
+    // 마지막에는 최소 2글자의 영문자로 이루어진 최상위 도메인이 포함되어야 한다..
+    private static final Pattern EMAIL_PATTERN =
+            Pattern.compile("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$");
+
+    @Column(name = "email")
+    private String value;
+
+    public Email(String value) {
+        validateEmailPattern(value);
+        this.value = value;
+    }
+
+    public void validateEmailPattern(String email) {
+        if(!EMAIL_PATTERN.matcher(email).matches()) {
+            throw new BangggoodException(ExceptionCode.EMAIL_INVALID_FORMAT);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Email email = (Email) o;
+        return Objects.equals(value, email.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(value);
+    }
+}

backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/Password.java

@@ -0,0 +1,54 @@
+package com.bang_ggood.user.domain;
+
+import com.bang_ggood.auth.service.PasswordEncoder;
+import com.bang_ggood.global.exception.BangggoodException;
+import com.bang_ggood.global.exception.ExceptionCode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+import static lombok.AccessLevel.PROTECTED;
+
+@Getter
+@Embeddable
+@NoArgsConstructor(access = PROTECTED)
+public class Password {
+
+    //비밀번호는 최소 6자 이상이어야 하며, 영어 문자와 숫자를 각각 1개 이상 포함해야 한다.
+    private static final Pattern PASSWORD_PATTERN =
+            Pattern.compile("^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{6,}$");
+
+    @Column(name = "password")
+    private String value;
+
+    public Password(String value) {
+        validatePasswordPattern(value);
+        this.value = PasswordEncoder.encodeWithGeneralSalt(value);
+    }
+
+    public void validatePasswordPattern(String password) {
+        if (!PASSWORD_PATTERN.matcher(password).matches()) {
+            throw new BangggoodException(ExceptionCode.PASSWORD_INVALID_FORMAT);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Password password1 = (Password) o;
+        return Objects.equals(value, password1.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(value);
+    }
+}

backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java

@@ -2,6 +2,7 @@
 
 import com.bang_ggood.BaseEntity;
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -28,7 +29,11 @@ public class User extends BaseEntity {
     private String name;
 
     @Column(nullable = false)
-    private String email;
+    @Embedded
+    private Email email;
+
+    @Embedded
+    private Password password;
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
@@ -40,15 +45,23 @@ public class User extends BaseEntity {
 
     public User(String name, String email, UserType userType, LoginType loginType) {
         this.name = name;
-        this.email = email;
+        this.email = new Email(email);
+        this.userType = userType;
+        this.loginType = loginType;
+    }
+
+    public User(String name, String email, String password, UserType userType, LoginType loginType) {
+        this.name = name;
+        this.email = new Email(email);
+        this.password = new Password(password);
         this.userType = userType;
         this.loginType = loginType;
     }
 
     public User(Long id, String name, String email) { // TODO 테스트용
         this.id = id;
         this.name = name;
-        this.email = email;
+        this.email = new Email(email);
     }
 
     @Override

backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java

@@ -6,7 +6,7 @@
 public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) {
     public static UserResponse from(User user) {
         return new UserResponse(
-                user.getId(), user.getName(), user.getEmail(), user.getCreatedAt()
+                user.getId(), user.getName(), user.getEmail().getValue(), user.getCreatedAt()
         );
     }
 }

backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java

@@ -2,6 +2,8 @@
 
 import com.bang_ggood.global.exception.BangggoodException;
 import com.bang_ggood.global.exception.ExceptionCode;
+import com.bang_ggood.user.domain.Email;
+import com.bang_ggood.user.domain.LoginType;
 import com.bang_ggood.user.domain.User;
 import com.bang_ggood.user.domain.UserType;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -22,7 +24,7 @@ default User getUserById(Long id) {
     List<User> findUserByUserType(@Param("userType") UserType userType);
 
     @Query("SELECT u FROM User u WHERE u.email = :email and u.deleted = false ")
-    Optional<User> findByEmail(@Param("email") String email);
+    Optional<User> findByEmail(@Param("email") Email email);
 
     @Transactional
     @Modifying(flushAutomatically = true, clearAutomatically = true)

backend/bang-ggood/src/main/resources/data.sql

@@ -1,5 +1,7 @@
-INSERT INTO users(name, email, user_type, login_type, created_at, modified_at, deleted)
-VALUES ('방방이', '[email protected]', 'USER', 'LOCAL', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false);
+-- 비밀번호 : password1234
+INSERT INTO users(name, email, password, user_type, login_type, created_at, modified_at, deleted)
+VALUES ('방방이', '[email protected]', 'xDNYKEJqE/36U0Dt3nXRMFPNEMEgjCYM7R/A4B29baOsv4KYQ9MGgcO3HUa11sNKCFb9ZXyYBqJqxNglvBzFvg==:7yejAszEpxBb7AyZNKvAqpmMEJiKFXIa8JKwAx3n4loB2DRcAC2pfwkgo/dzKzRvBX4RbrATWaIlPYrgAhbHZQ==',
+        'USER', 'LOCAL', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false);
 
 INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted)
 VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),

backend/bang-ggood/src/main/resources/schema.sql

@@ -33,11 +33,13 @@ CREATE TABLE users
     id          BIGINT AUTO_INCREMENT PRIMARY KEY,
     name        VARCHAR(255),
     email       VARCHAR(255) NOT NULL,
-    user_type    VARCHAR(255) NOT NULL,
-    login_type   VARCHAR(255) NOT NULL,
+    password    VARCHAR(255),
+    user_type   VARCHAR(255) NOT NULL,
+    login_type  VARCHAR(255) NOT NULL,
     created_at  TIMESTAMP(6),
     modified_at TIMESTAMP(6),
-    deleted     BOOLEAN
+    deleted     BOOLEAN,
+    CONSTRAINT unique_email_login_type UNIQUE (email, login_type)
 );
 
 CREATE TABLE checklist

backend/bang-ggood/src/test/java/com/bang_ggood/auth/config/ArgumentResolverTest.java

@@ -30,7 +30,7 @@ class ArgumentResolverTest extends AcceptanceTest {
     @Test
     void resolveUserPrincipalArgument_returnGuestUser() {
         // given & when
-        userRepository.save(UserFixture.GUEST_USER());
+        userRepository.save(UserFixture.GUEST_USER1());
 
         User user = RestAssured.given().log().all()
                 .contentType(ContentType.JSON)