[FEAT] 지원서 프로필 작성 단계에서 거주지역 추가 (#349)

* feat: 거주 지역 정보를 위한 Region enum 클래스 추가

* feat: Member 엔티티에 Region 필드 추가 및 관련 로직 반영

* feat: MemberEditRequest에 Region 필드 추가 및 유효성 검증 로직 반영

* feat: MemberRegisterRequest에 Region 필드 추가 및 유효성 검증 로직 반영

* feat: MemberDetailResponse에 Region 필드 추가 및 매핑 로직 반영

* feat: MemberManagementService에서 Member 생성 시 Region 필드 매핑 로직 추가

* feat: ApplyProfileRequest에 Region 필드 추가 및 유효성 검증 로직 반영

* feat: ApplyRepository에 memberId 중복 여부 확인 메서드 추가

* feat: ApplyService에 Region 필드 매핑 로직 추가 및 applyRepository 중복 확인 로직 개선

* test: Member 관련 테스트에 Region 필드 검증 로직 추가

* test: MemberManagementControllerTest에 Region 필드 관련 테스트 추가

* test: MemberManagementServiceTest에 Region 필드 관련 테스트 추가

* test: ApplyServiceTest에 Region 필드 관련 테스트 로직 추가

* test: MemberManagementControllerTest에 Region 필드 관련 테스트 추가

* chore: member 테이블에 region 컬럼 추가

* refactor: ApplyService의 중복 확인 로직 리팩토링 및 불필요한 코드 제거

* chore: apply 테이블에 member_id와 recruit_id에 대한 유니크 제약 조건 추가

* fix: ApplyService에 멱등성 보 로직 추가

* test: ApplyServiceTest에 applyRepository의 존재 여부 검증 로직 추가

Author: 023-dev

src/main/java/org/ject/support/domain/admin/dto/MemberDetailResponse.java

@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import org.ject.support.domain.member.JobFamily;
+import org.ject.support.domain.member.Region;
 import org.ject.support.domain.member.Role;
 import org.ject.support.domain.member.entity.Member;
 import org.ject.support.domain.recruit.domain.Semester;
@@ -14,6 +15,7 @@ public record MemberDetailResponse(
         String phoneNumber,
         String email,
         JobFamily jobFamily,
+        Region region,
         String semesterName
 ) {
     public static MemberDetailResponse toResponse(
@@ -27,6 +29,7 @@ public static MemberDetailResponse toResponse(
                 .phoneNumber(member.getPhoneNumber())
                 .email(member.getEmail())
                 .jobFamily(member.getJobFamily())
+                .region(member.getRegion())
                 .semesterName(semester.getName().replaceAll("\\D", ""))
                 .build();
     }

src/main/java/org/ject/support/domain/admin/dto/MemberEditRequest.java

@@ -7,6 +7,7 @@
 import jakarta.validation.constraints.Pattern;
 import lombok.Builder;
 import org.ject.support.domain.member.JobFamily;
+import org.ject.support.domain.member.Region;
 import org.ject.support.domain.member.Role;
 
 @Builder
@@ -21,6 +22,8 @@ public record MemberEditRequest(
         String email,
         @NotNull(message = "포지션은 필수입니다.")
         JobFamily jobFamily,
+        @NotNull(message = "거주 지역을 선택해주세요")
+        Region region,
         @Schema(description = "기수 이름", example = "1기")
         @Pattern(regexp = "^\\d+기$", message = "숫자+'기' 형식으로 입력해주세요", flags = Pattern.Flag.CANON_EQ)
         String semesterName

src/main/java/org/ject/support/domain/admin/dto/MemberRegisterRequest.java

@@ -7,6 +7,7 @@
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Pattern.Flag;
 import org.ject.support.domain.member.JobFamily;
+import org.ject.support.domain.member.Region;
 import org.ject.support.domain.member.Role;
 import org.ject.support.domain.member.entity.Member;
 import org.ject.support.domain.recruit.domain.Semester;
@@ -22,6 +23,9 @@ public record MemberRegisterRequest(
         String email,
         @NotNull(message = "포지션은 필수입니다.")
         JobFamily jobFamily,
+
+        @NotNull(message = "거주 지역을 선택해주세요")
+        Region region,
         @NotNull(message = "기수는 필수입니다.")
         @Schema(description = "기수 이름", example = "1기")
         @Pattern(regexp = "^\\d+기$", message = "숫자+'기' 형식으로 입력해주세요", flags = Flag.CANON_EQ)
@@ -34,6 +38,7 @@ public Member toEntity(Semester semester) {
                 .phoneNumber(this.phoneNumber)
                 .email(this.email)
                 .jobFamily(this.jobFamily)
+                .region(this.region)
                 .semesterId(semester.getId())
                 .build();
     }

src/main/java/org/ject/support/domain/admin/service/MemberManagementService.java

@@ -84,6 +84,7 @@ public void editMember(final Long memberId,
                 .phoneNumber(request.phoneNumber())
                 .email(request.email())
                 .jobFamily(request.jobFamily())
+                .region(request.region())
                 .role(request.role())
                 .build();
 

src/main/java/org/ject/support/domain/apply/dto/ApplyProfileRequest.java

@@ -10,6 +10,7 @@
 import org.ject.support.domain.member.JobFamily;
 
 import java.util.List;
+import org.ject.support.domain.member.Region;
 
 public record ApplyProfileRequest(
         @NotBlank(message = "이름을 입력해주세요")
@@ -22,6 +23,9 @@ public record ApplyProfileRequest(
         @NotNull(message = "포지션을 선택해주세요")
         JobFamily jobFamily,
 
+        @NotNull(message = "거주 지역을 선택해주세요")
+        Region region,
+
         @NotNull(message = "지원자 신분을 선택해주세요")
         CareerDetails careerDetails,
 

src/main/java/org/ject/support/domain/apply/repository/ApplyRepository.java

@@ -11,6 +11,8 @@
 
 public interface ApplyRepository extends JpaRepository<Apply, Long>, ApplyQueryRepository {
 
+    boolean existsByMemberId(Long memberId);
+
     @Query("select a from Apply a where a.member.id = :memberId")
     Optional<Apply> findByMemberId(Long memberId);
 

src/main/java/org/ject/support/domain/apply/service/ApplyService.java

@@ -36,6 +36,7 @@
 import org.ject.support.domain.recruit.exception.RecruitErrorCode;
 import org.ject.support.domain.recruit.exception.RecruitException;
 import org.ject.support.domain.recruit.repository.RecruitRepository;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -190,6 +191,7 @@ public void saveProfile(Long memberId, ApplyProfileRequest request) {
                 .name(request.name())
                 .phoneNumber(request.phoneNumber())
                 .jobFamily(request.jobFamily())
+                .region(request.region())
                 .careerDetails(request.careerDetails())
                 .experiencePeriod(request.experiencePeriod())
                 .interestedDomains(request.interestedDomains())
@@ -199,11 +201,15 @@ public void saveProfile(Long memberId, ApplyProfileRequest request) {
     }
 
     private void createApplyIfNotExists(Member member, JobFamily jobFamily) {
-        applyRepository.findByMemberId(member.getId()).orElseGet(() -> {
-            var recruit = getPeriodRecruit(jobFamily);
-            var newApply = Apply.createApply(member, recruit);
-            return applyRepository.save(newApply);
-        });
+        if (!applyRepository.existsByMemberId(member.getId())) {
+            try {
+                var recruit = getPeriodRecruit(jobFamily);
+                var newApply = Apply.createApply(member, recruit);
+                applyRepository.save(newApply);
+            } catch (DataIntegrityViolationException e) {
+                log.warn("지원서 생성 중 레이스 컨디션 발생. memberId: {}. 이미 지원서가 존재합니다.", member.getId());
+            }
+        }
     }
 
     private void validateQuestions(final Map<String, String> answers, final Recruit recruit) {

src/main/java/org/ject/support/domain/member/Region.java

@@ -0,0 +1,29 @@
+package org.ject.support.domain.member;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum Region {
+    SEOUL("서울"),
+    GYEONGGI("경기"),
+    INCHEON("인천"),
+    BUSAN("부산"),
+    DAEGU("대구"),
+    DAEJEON("대전"),
+    GWANGJU("광주"),
+    ULSAN("울산"),
+    SEJONG("세종"),
+    GANGWON("강원"),
+    CHUNGBUK("충북"),
+    CHUNGNAM("충남"),
+    JEONBUK("전북"),
+    JEONNAM("전남"),
+    GYEONGBUK("경북"),
+    GYEONGNAM("경남"),
+    JEJU("제주"),
+    OVERSEAS("해외");
+
+    private final String description;
+}

src/main/java/org/ject/support/domain/member/entity/Member.java

@@ -25,6 +25,7 @@
 import org.ject.support.domain.member.ExperiencePeriod;
 import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.member.MemberStatus;
+import org.ject.support.domain.member.Region;
 import org.ject.support.domain.member.Role;
 
 import java.util.ArrayList;
@@ -58,6 +59,10 @@ public class Member extends BaseTimeEntity {
     @Column(columnDefinition = "varchar(45)")
     private JobFamily jobFamily;
 
+    @Enumerated(EnumType.STRING)
+    @Column(length = 30)
+    private Region region;
+
     @Enumerated(EnumType.STRING)
     @Column(length = 30)
     private CareerDetails careerDetails;
@@ -115,6 +120,7 @@ public MemberEditor.MemberEditorBuilder toEditor() {
                 .email(this.email)
                 .semesterId(this.semesterId)
                 .jobFamily(this.jobFamily)
+                .region(this.region)
                 .experiencePeriod(this.experiencePeriod)
                 .careerDetails(this.careerDetails)
                 .interestedDomains(this.interestedDomains)
@@ -127,6 +133,7 @@ public void edit(MemberEditor editor) {
         this.email = editor.email();
         this.semesterId = editor.semesterId();
         this.jobFamily = editor.jobFamily();
+        this.region = editor.region();
         this.experiencePeriod = editor.experiencePeriod();
         this.careerDetails = editor.careerDetails();
         this.interestedDomains = editor.interestedDomains();
@@ -137,6 +144,7 @@ public void deleteProfile() {
         this.name = null;
         this.phoneNumber = null;
         this.jobFamily = null;
+        this.region = null;
         this.careerDetails = null;
         this.experiencePeriod = null;
         this.interestedDomains.clear();

src/main/java/org/ject/support/domain/member/entity/MemberEditor.java

@@ -1,22 +1,25 @@
 package org.ject.support.domain.member.entity;
 
-import java.util.List;
 import lombok.Builder;
 import org.ject.support.domain.member.CareerDetails;
 import org.ject.support.domain.member.ExperiencePeriod;
 import org.ject.support.domain.member.JobFamily;
+import org.ject.support.domain.member.Region;
 import org.ject.support.domain.member.Role;
 
+import java.util.List;
+
 @Builder
-public record MemberEditor (
-        String name,
-        String phoneNumber,
-        String email,
-        Long semesterId,
-        JobFamily jobFamily,
-        ExperiencePeriod experiencePeriod,
-        CareerDetails careerDetails,
-        List<String> interestedDomains,
-        Role role
+public record MemberEditor(
+    String name,
+    String phoneNumber,
+    String email,
+    Long semesterId,
+    JobFamily jobFamily,
+    Region region,
+    ExperiencePeriod experiencePeriod,
+    CareerDetails careerDetails,
+    List<String> interestedDomains,
+    Role role
 ) {
 }