Merge remote-tracking branch 'origin/feat/#38-1' into feat/#38-1

hodoon · hodoon · commit 6bc4251941ba · 2025-02-18T22:54:34.000+09:00
# Conflicts:
#	src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/dto/ApplicantCreateRequestDto.java b/src/main/java/dmu/dasom/api/domain/applicant/dto/ApplicantCreateRequestDto.java
@@ -1,5 +1,8 @@
 package dmu.dasom.api.domain.applicant.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import dmu.dasom.api.domain.applicant.entity.Applicant;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.*;
@@ -9,6 +12,11 @@
 @Schema(name = "ApplicantCreateRequestDto", description = "지원자 생성 요청 DTO")
 public class ApplicantCreateRequestDto {
 
+    @NotNull
+    @Size(max = 16)
+    @Schema(description = "이름", example = "홍길동")
+    private String name;
+
     @NotNull
     @Pattern(regexp = "^[0-9]{8}$")
     @Size(min = 8, max = 8)
@@ -39,15 +47,21 @@ public class ApplicantCreateRequestDto {
     private String reasonForApply;
 
     @Size(max = 200)
-    @Schema(description = "활동 희망사항", example = "동아리 활동 참여")
+    @Schema(description = "활동 희망사항", example = "동아리 활동 참여", nullable = true)
     private String activityWish;
 
     @NotNull
     @Schema(description = "개인정보 처리방침 동의 여부", example = "true")
     private Boolean isPrivacyPolicyAgreed;
 
+    @JsonProperty(defaultValue = "false")
+    @JsonSetter(nulls = Nulls.SKIP)
+    @Schema(description = "지원서 덮어쓰기 확인 여부", example = "false", defaultValue = "false", nullable = true)
+    private Boolean isOverwriteConfirmed = false;
+
     public Applicant toEntity() {
         return Applicant.builder()
+                .name(this.name)
                 .studentNo(this.studentNo)
                 .contact(this.contact)
                 .email(this.email)
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/entity/Applicant.java b/src/main/java/dmu/dasom/api/domain/applicant/entity/Applicant.java
@@ -1,5 +1,6 @@
 package dmu.dasom.api.domain.applicant.entity;
 
+import dmu.dasom.api.domain.applicant.dto.ApplicantCreateRequestDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantDetailsResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantResponseDto;
 import dmu.dasom.api.domain.applicant.enums.ApplicantStatus;
@@ -9,6 +10,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -17,6 +19,7 @@
 
 @AllArgsConstructor
 @Builder
+@DynamicUpdate
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @Getter
@@ -32,7 +35,7 @@ public class Applicant {
     @Size(max = 16)
     private String name;
 
-    @Column(name = "student_no", nullable = false, length = 8)
+    @Column(name = "student_no", nullable = false, unique = true, length = 8)
     @Pattern(regexp = "^[0-9]{8}$")
     @Size(min = 8, max = 8)
     private String studentNo;
@@ -105,4 +108,14 @@ public ApplicantDetailsResponseDto toApplicantDetailsResponse() {
                 .build();
     }
 
+    public void overwrite(final ApplicantCreateRequestDto request) {
+        this.name = request.getName();
+        this.contact = request.getContact();
+        this.email = request.getEmail();
+        this.grade = request.getGrade();
+        this.reasonForApply = request.getReasonForApply();
+        this.activityWish = request.getActivityWish();
+        this.isPrivacyPolicyAgreed = request.getIsPrivacyPolicyAgreed();
+    }
+
 }
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java b/src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java
@@ -9,6 +9,8 @@
 
 import java.util.List;
 
+import java.util.Optional;
+
 public interface ApplicantRepository extends JpaRepository<Applicant, Long> {
 
     @Query("SELECT a FROM Applicant a ORDER BY a.id DESC")
@@ -17,4 +19,6 @@ public interface ApplicantRepository extends JpaRepository<Applicant, Long> {
     // 상태별 지원자 조회
     List<Applicant> findByStatus(ApplicantStatus status);
 
+    Optional<Applicant> findByStudentNo(final String studentNo);
+
 }
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java b/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java
@@ -17,12 +17,16 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
 
 import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor
 @Service
+@Transactional
 public class ApplicantServiceImpl implements ApplicantService {
 
     private final static int DEFAULT_PAGE_SIZE = 20;
@@ -33,6 +37,20 @@ public class ApplicantServiceImpl implements ApplicantService {
     // 지원자 저장
     @Override
     public void apply(final ApplicantCreateRequestDto request) {
+        final Optional<Applicant> applicant = findByStudentNo(request.getStudentNo());
+
+        // 이미 지원한 학번이 존재할 경우
+        if (applicant.isPresent()) {
+            // 덮어쓰기 확인 여부가 false일 경우 예외 발생
+            if (!request.getIsOverwriteConfirmed())
+                throw new CustomException(ErrorCode.DUPLICATED_STUDENT_NO);
+
+            // 기존 지원자 정보 갱신 수행
+            applicant.get().overwrite(request);
+            return;
+        }
+
+        // 새로운 지원자일 경우 저장
         applicantRepository.save(request.toEntity());
     }
 
@@ -119,4 +137,9 @@ private Applicant findById(final Long id) {
                 .orElseThrow(() -> new CustomException(ErrorCode.EMPTY_RESULT));
     }
 
+    // 학번으로 지원자 존재 여부 확인
+    private Optional<Applicant> findByStudentNo(final String studentNo) {
+        return applicantRepository.findByStudentNo(studentNo);
+    }
+
 }
diff --git a/src/main/java/dmu/dasom/api/domain/common/exception/ErrorCode.java b/src/main/java/dmu/dasom/api/domain/common/exception/ErrorCode.java
@@ -19,7 +19,8 @@ public enum ErrorCode {
     NOT_FOUND(404, "C010", "해당 리소스를 찾을 수 없습니다."),
     WRITE_FAIL(400, "C011", "데이터를 쓰는데 실패하였습니다."),
     EMPTY_RESULT(400, "C012", "조회 결과가 없습니다."),
-    SEND_EMAIL_FAIL(400, "C014", "이메일 전송에 실패하였습니다."),
+    DUPLICATED_STUDENT_NO(400, "C013", "이미 등록된 학번입니다."),
+    SEND_EMAIL_FAIL(400, "C014", "이메일 전송에 실패하였습니다.")
     ;
 
     private final int status;
diff --git a/src/main/java/dmu/dasom/api/domain/member/controller/MemberController.java b/src/main/java/dmu/dasom/api/domain/member/controller/MemberController.java
@@ -64,6 +64,7 @@ public ResponseEntity<Void> tokenRotation(@AuthenticationPrincipal final UserDet
         final HttpHeaders headers = new HttpHeaders();
         headers.add("Access-Token", tokenBox.getAccessToken());
         headers.add("Refresh-Token", tokenBox.getRefreshToken());
+        headers.add("Authority", tokenBox.getAuthority());
 
         return ResponseEntity.ok().headers(headers).build();
     }
diff --git a/src/main/java/dmu/dasom/api/domain/member/service/MemberServiceImpl.java b/src/main/java/dmu/dasom/api/domain/member/service/MemberServiceImpl.java
@@ -9,10 +9,14 @@
 import dmu.dasom.api.global.auth.jwt.JwtUtil;
 import dmu.dasom.api.global.auth.userdetails.UserDetailsImpl;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
+import java.util.Iterator;
+
 @RequiredArgsConstructor
 @Service
 @Transactional(readOnly = true)
@@ -49,7 +53,13 @@ public void signUp(final SignupRequestDto request) {
     // 토큰 갱신
     @Override
     public TokenBox tokenRotation(final UserDetailsImpl userDetails) {
-        return jwtUtil.tokenRotation(userDetails);
+        final Collection<? extends GrantedAuthority> authorities = userDetails.getAuthorities();
+        final Iterator<? extends GrantedAuthority> iterator = authorities.iterator();
+        final GrantedAuthority auth = iterator.next();
+
+        final String authority = auth.getAuthority();
+
+        return jwtUtil.tokenRotation(userDetails.getUsername(), authority);
     }
 
 }
diff --git a/src/main/java/dmu/dasom/api/domain/recruit/controller/RecruitController.java b/src/main/java/dmu/dasom/api/domain/recruit/controller/RecruitController.java
@@ -2,7 +2,11 @@
 
 import dmu.dasom.api.domain.applicant.dto.ApplicantCreateRequestDto;
 import dmu.dasom.api.domain.applicant.service.ApplicantService;
+import dmu.dasom.api.domain.common.exception.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.validation.Valid;
@@ -23,8 +27,15 @@ public class RecruitController {
     // 지원하기
     @Operation(summary = "부원 지원하기")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "지원 성공")
-    })
+            @ApiResponse(responseCode = "200", description = "지원 성공"),
+            @ApiResponse(responseCode = "400", description = "실패 케이스",
+                content = @Content(
+                        mediaType = "application/json",
+                        schema = @Schema(implementation = ErrorResponse.class),
+                        examples = {
+                            @ExampleObject(
+                                name = "학번 중복",
+                                value = "{ \"code\": \"C013\", \"message\": \"이미 등록된 학번입니다.\" }")}))})
     @PostMapping("/apply")
     public ResponseEntity<Void> apply(@Valid @RequestBody final ApplicantCreateRequestDto request) {
         applicantService.apply(request);
diff --git a/src/main/java/dmu/dasom/api/global/auth/dto/TokenBox.java b/src/main/java/dmu/dasom/api/global/auth/dto/TokenBox.java
@@ -19,4 +19,8 @@ public class TokenBox {
     @NotNull
     private String refreshToken;
 
+    @Schema(description = "권한")
+    @NotNull
+    private String authority;
+
 }
diff --git a/src/main/java/dmu/dasom/api/global/auth/filter/CustomAuthenticationFilter.java b/src/main/java/dmu/dasom/api/global/auth/filter/CustomAuthenticationFilter.java
@@ -17,9 +17,12 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
 
 @RequiredArgsConstructor
 public class CustomAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
@@ -47,12 +50,19 @@ protected void successfulAuthentication(final HttpServletRequest request, final
         // 기존 토큰 만료 처리
         jwtUtil.blacklistTokens(authResult.getName());
 
+        final Collection<? extends GrantedAuthority> authorities = authResult.getAuthorities();
+        final Iterator<? extends GrantedAuthority> iterator = authorities.iterator();
+        final GrantedAuthority auth = iterator.next();
+
+        final String authority = auth.getAuthority();
+
         // 토큰 생성
-        final TokenBox tokenBox = jwtUtil.generateTokenBox(authResult.getName());
+        final TokenBox tokenBox = jwtUtil.generateTokenBox(authResult.getName(), authority);
 
         response.setStatus(HttpStatus.OK.value());
         response.setHeader("Access-Token", tokenBox.getAccessToken());
         response.setHeader("Refresh-Token", tokenBox.getRefreshToken());
+        response.setHeader("Authority", tokenBox.getAuthority());
     }
 
     @Override
diff --git a/src/main/java/dmu/dasom/api/global/auth/jwt/JwtUtil.java b/src/main/java/dmu/dasom/api/global/auth/jwt/JwtUtil.java
@@ -38,10 +38,11 @@ public JwtUtil(@Value("${jwt.secret}") final String secretKey, final StringRedis
     }
 
     // Access, Refresh 토큰 생성
-    public TokenBox generateTokenBox(final String email) {
+    public TokenBox generateTokenBox(final String email, final String authority) {
         final TokenBox tokenBox = TokenBox.builder()
                 .accessToken(generateToken(email, accessTokenExpiration))
                 .refreshToken(generateToken(email, refreshTokenExpiration))
+                .authority(authority)
                 .build();
 
         saveTokens(tokenBox, email);
@@ -132,9 +133,9 @@ public boolean isExpired(final String token) {
     }
 
     // Access, Refresh 토큰 갱신
-    public TokenBox tokenRotation(final UserDetailsImpl userDetails) {
-        blacklistTokens(userDetails.getUsername());
-        return generateTokenBox(userDetails.getUsername());
+    public TokenBox tokenRotation(final String email, final String authority) {
+        blacklistTokens(email);
+        return generateTokenBox(email, authority);
     }
 
 }
diff --git a/src/test/java/dmu/dasom/api/domain/applicant/ApplicantServiceTest.java b/src/test/java/dmu/dasom/api/domain/applicant/ApplicantServiceTest.java
@@ -19,6 +19,7 @@
 import org.springframework.data.domain.PageRequest;
 
 import java.util.Collections;
+import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -37,6 +38,8 @@ class ApplicantServiceTest {
     void apply_success() {
         // given
         ApplicantCreateRequestDto request = mock(ApplicantCreateRequestDto.class);
+        when(request.getStudentNo()).thenReturn("20210000");
+        when(applicantRepository.findByStudentNo("20210000")).thenReturn(Optional.empty());
 
         // when
         applicantService.apply(request);
@@ -48,6 +51,38 @@ void apply_success() {
     @Test
     @DisplayName("지원자 저장 - 실패")
     void apply_fail() {
+        // given
+        ApplicantCreateRequestDto request = mock(ApplicantCreateRequestDto.class);
+        when(request.getStudentNo()).thenReturn("20210000");
+        when(applicantRepository.findByStudentNo("20210000")).thenReturn(Optional.of(mock(Applicant.class)));
+        when(request.getIsOverwriteConfirmed()).thenReturn(false);
+
+        // when
+        CustomException exception = assertThrows(CustomException.class, () -> {
+            applicantService.apply(request);
+        });
+
+        // then
+        verify(applicantRepository).findByStudentNo("20210000");
+        assertEquals(ErrorCode.DUPLICATED_STUDENT_NO, exception.getErrorCode());
+    }
+
+    @Test
+    @DisplayName("지원자 저장 - 덮어쓰기")
+    void apply_overwrite() {
+        // given
+        ApplicantCreateRequestDto request = mock(ApplicantCreateRequestDto.class);
+        when(request.getStudentNo()).thenReturn("20210000");
+        Applicant applicant = mock(Applicant.class);
+        when(applicantRepository.findByStudentNo("20210000")).thenReturn(Optional.of(applicant));
+        when(request.getIsOverwriteConfirmed()).thenReturn(true);
+
+        // when
+        applicantService.apply(request);
+
+        // then
+        verify(applicantRepository).findByStudentNo("20210000");
+        verify(applicant).overwrite(request);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public enum ErrorCode {`
`19`	`19`	`NOT_FOUND(404, "C010", "해당 리소스를 찾을 수 없습니다."),`
`20`	`20`	`WRITE_FAIL(400, "C011", "데이터를 쓰는데 실패하였습니다."),`
`21`	`21`	`EMPTY_RESULT(400, "C012", "조회 결과가 없습니다."),`
`22`		`- SEND_EMAIL_FAIL(400, "C014", "이메일 전송에 실패하였습니다."),`
	`22`	`+ DUPLICATED_STUDENT_NO(400, "C013", "이미 등록된 학번입니다."),`
	`23`	`+ SEND_EMAIL_FAIL(400, "C014", "이메일 전송에 실패하였습니다.")`
`23`	`24`	`;`
`24`	`25`
`25`	`26`	`private final int status;`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public ResponseEntity<Void> tokenRotation(@AuthenticationPrincipal final UserDet`
`64`	`64`	`final HttpHeaders headers = new HttpHeaders();`
`65`	`65`	`headers.add("Access-Token", tokenBox.getAccessToken());`
`66`	`66`	`headers.add("Refresh-Token", tokenBox.getRefreshToken());`
	`67`	`+ headers.add("Authority", tokenBox.getAuthority());`
`67`	`68`
`68`	`69`	`return ResponseEntity.ok().headers(headers).build();`
`69`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,8 @@ public class TokenBox {`
`19`	`19`	`@NotNull`
`20`	`20`	`private String refreshToken;`
`21`	`21`
	`22`	`+ @Schema(description = "권한")`
	`23`	`+ @NotNull`
	`24`	`+ private String authority;`
	`25`	`+`
`22`	`26`	`}`