[FEATURE] 로그인 회원가입 API 작성 (#53)

build.gradle

@@ -26,10 +26,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.0.4'
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
+    implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
+    implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: '3.2.0'
+    implementation 'org.springframework.session:spring-session-data-redis:3.1.1'
     implementation 'org.jsoup:jsoup:1.17.2'
     implementation 'org.json:json:20240205'
+    implementation 'com.google.guava:guava:30.1-jre'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'

src/main/java/com/smunity/petition/domain/account/annotation/AccountArgumentResolver.java

@@ -0,0 +1,38 @@
+package com.smunity.petition.domain.account.annotation;
+
+import com.smunity.petition.domain.account.entity.User;
+import com.smunity.petition.domain.account.jwt.userdetails.CustomUserDetails;
+import com.smunity.petition.domain.account.service.AccountsQueryService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.MethodParameter;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Transactional
+public class AccountArgumentResolver implements HandlerMethodArgumentResolver {
+
+    private final AccountsQueryService accountsQueryService;
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        boolean hasParameterAnnotation = parameter.hasParameterAnnotation(AccountResolver.class);
+        boolean isOrganizationParameterType = parameter.getParameterType().isAssignableFrom(User.class);
+        return hasParameterAnnotation && isOrganizationParameterType;
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+                                  NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+        Object userDetails = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        return accountsQueryService.findByUserName(((CustomUserDetails) userDetails).getUsername());
+    }
+}

src/main/java/com/smunity/petition/domain/account/annotation/AccountResolver.java

@@ -0,0 +1,14 @@
+package com.smunity.petition.domain.account.annotation;
+
+import io.swagger.v3.oas.annotations.Parameter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@Parameter(hidden = true)
+public @interface AccountResolver {
+}

src/main/java/com/smunity/petition/domain/account/controller/AccountsController.java

@@ -0,0 +1,52 @@
+package com.smunity.petition.domain.account.controller;
+
+import com.smunity.petition.domain.account.annotation.AccountResolver;
+import com.smunity.petition.domain.account.dto.UserRegisterRequestDto;
+import com.smunity.petition.domain.account.dto.UserRegisterResponseDto;
+import com.smunity.petition.domain.account.entity.User;
+import com.smunity.petition.domain.account.jwt.dto.JwtDto;
+import com.smunity.petition.domain.account.jwt.exception.SecurityCustomException;
+import com.smunity.petition.domain.account.jwt.exception.TokenErrorCode;
+import com.smunity.petition.domain.account.jwt.util.JwtUtil;
+import com.smunity.petition.domain.account.service.AccountsService;
+import com.smunity.petition.global.common.ApiResponse;
+import io.jsonwebtoken.ExpiredJwtException;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/accounts")
+@RestController
+public class AccountsController {
+
+    private final AccountsService accountsService;
+
+    private final JwtUtil jwtUtil;
+
+    @PostMapping("/register")
+    public ApiResponse<UserRegisterResponseDto> register(@Valid @RequestBody UserRegisterRequestDto request) {
+        return ApiResponse.onSuccess(accountsService.register(request));
+    }
+
+    @GetMapping("/reissue")
+    public ApiResponse<JwtDto> reissueToken(@RequestHeader("RefreshToken") String refreshToken) {
+        try {
+            jwtUtil.validateRefreshToken(refreshToken);
+            return ApiResponse.onSuccess(
+                    jwtUtil.reissueToken(refreshToken)
+            );
+        } catch (ExpiredJwtException eje) {
+            throw new SecurityCustomException(TokenErrorCode.TOKEN_EXPIRED, eje);
+        } catch (IllegalArgumentException iae) {
+            throw new SecurityCustomException(TokenErrorCode.INVALID_TOKEN, iae);
+        }
+    }
+
+    @GetMapping("/test")
+    public ApiResponse<String> register(@AccountResolver User user) {
+        return ApiResponse.onSuccess(user.getUserName());
+    }
+}

src/main/java/com/smunity/petition/domain/account/dto/UserRegisterRequestDto.java

@@ -0,0 +1,48 @@
+package com.smunity.petition.domain.account.dto;
+
+import com.smunity.petition.domain.account.entity.User;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
+public record UserRegisterRequestDto(
+        @NotBlank(message = "[ERROR] 이름 입력은 필수 입니다.")
+        String name,
+        @NotBlank(message = "[ERROR] 학번 입력은 필수 입니다.")
+        String username,
+        @NotBlank(message = "[ERROR] 학과 입력은 필수 입니다.")
+        String department,
+
+        @NotBlank(message = "[ERROR] 이메일 입력은 필수입니다.")
+        @Pattern(regexp = "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+.[A-Za-z]{2,6}$", message = "[ERROR] 이메일 형식에 맞지 않습니다.")
+        String email,
+
+        @NotBlank(message = "[ERROR] 비밀번호 입력은 필수 입니다.")
+        @Size(min = 8, message = "[ERROR] 비밀번호는 최소 8자리 이이어야 합니다.")
+        @Pattern(regexp = "^(?=.*[a-z])(?=.*\\d)(?=.*[!@#$%^&*]).{8,64}$", message = "[ERROR] 비밀번호는 8자 이상, 64자 이하이며 특수문자 한 개를 포함해야 합니다.")
+        String password,
+
+        @NotBlank(message = "[ERROR] 비밀번호 재확인 입력은 필수 입니다.")
+        String passwordCheck,
+
+        @NotNull(message = "[ERROR] 현재 학년 입력은 필수 입니다.")
+        int year,
+        @NotNull(message = "[ERROR] 이수한 학기 입력은 필수 입니다.")
+        int semester
+) {
+
+    public User toEntity(String encodedPw) {
+        return User.builder()
+                .userName(username)
+                .password(encodedPw)
+                .email(email)
+                .name(name)
+                .year(null)
+                .department(null)
+                .currentYear(year)
+                .completedSemesters(semester)
+                .build();
+
+    }
+}

src/main/java/com/smunity/petition/domain/account/dto/UserRegisterResponseDto.java

@@ -0,0 +1,31 @@
+package com.smunity.petition.domain.account.dto;
+
+import com.smunity.petition.domain.account.entity.User;
+import lombok.Builder;
+
+@Builder
+public record UserRegisterResponseDto(
+        Long id,
+        String email,
+        String userName,
+        String name,
+        String year,
+        String department,
+        int currentYear,
+        int completedSemesters
+
+) {
+
+    public static UserRegisterResponseDto from(User user) {
+        return UserRegisterResponseDto.builder()
+                .id(user.getId())
+                .email(user.getEmail())
+                .userName(user.getUserName())
+                .name(user.getName())
+                .year(user.getYear().getYear())
+                .department(user.getDepartment().getName())
+                .currentYear(user.getCurrentYear())
+                .completedSemesters(user.getCompletedSemesters())
+                .build();
+    }
+}

src/main/java/com/smunity/petition/domain/account/entity/Department.java

@@ -3,12 +3,11 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 
-import java.util.List;
-
 @Getter
 @Table(name = "accounts_department")
 @Entity
 public class Department {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -24,7 +23,4 @@ public class Department {
 
     @Column(name = "url")
     private String url;
-
-    @OneToMany(mappedBy = "department")
-    private List<Profile> profiles;
 }

src/main/java/com/smunity/petition/domain/account/entity/User.java

@@ -9,7 +9,6 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.time.LocalDateTime;
@@ -22,9 +21,10 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @EntityListeners(AuditingEntityListener.class)
-@Table(name = "auth_user")
+@Table(name = "accounts_user")
 @Entity
 public class User {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -39,9 +39,8 @@ public class User {
     @Column(name = "email", nullable = false)
     private String email;
 
-    @Column(name = "is_superuser", nullable = false)
-    @ColumnDefault("false")
-    private Boolean isSuperUser;
+    @Column(name = "name", nullable = false)
+    private String name;
 
     @Column(name = "is_staff", nullable = false)
     @ColumnDefault("false")
@@ -54,12 +53,19 @@ public class User {
     @Column(name = "last_login")
     private LocalDateTime lastLogin;
 
-    @Column(name = "date_joined")
-    @CreatedDate
-    private LocalDateTime dateJoined;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "year_id")
+    private Year year;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "department_id")
+    private Department department;
 
-    @OneToOne(mappedBy = "user", fetch = FetchType.LAZY)
-    private Profile profile;
+    @Column(name = "current_year")
+    private int currentYear;
+
+    @Column(name = "completed_semester")
+    private int completedSemesters;
 
     @OneToMany(mappedBy = "user")
     private List<Question> questions;
@@ -70,7 +76,11 @@ public class User {
     @OneToMany(mappedBy = "user")
     private List<Petition> petitions;
 
-    public void setProfile(Profile profile) {
-        this.profile = profile;
+    public void setYear(Year year) {
+        this.year = year;
+    }
+
+    public void setDepartment(Department department) {
+        this.department = department;
     }
 }

src/main/java/com/smunity/petition/domain/account/entity/Year.java

@@ -1,20 +1,13 @@
 package com.smunity.petition.domain.account.entity;
 
-import java.util.List;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Getter;
 
 @Getter
 @Table(name = "accounts_year")
 @Entity
 public class Year {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -36,7 +29,4 @@ public class Year {
 
     @Column(name = "all_score")
     private int all;
-
-    @OneToMany(mappedBy = "year")
-    private List<Profile> profiles;
 }

src/main/java/com/smunity/petition/domain/account/exception/AccountsExceptionHandler.java

@@ -0,0 +1,11 @@
+package com.smunity.petition.domain.account.exception;
+
+
+import com.smunity.petition.global.common.code.BaseErrorCode;
+import com.smunity.petition.global.common.exception.GeneralException;
+
+public class AccountsExceptionHandler extends GeneralException {
+    public AccountsExceptionHandler(BaseErrorCode code) {
+        super(code);
+    }
+}

src/main/java/com/smunity/petition/domain/account/jwt/dto/JwtDto.java

@@ -0,0 +1,7 @@
+package com.smunity.petition.domain.account.jwt.dto;
+
+public record JwtDto(
+        String accessToken,
+        String refreshToken
+) {
+}