RINGUS-30 fix: 충돌 오류 및 연관관계 수정

Author: wodydl0

dev.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ENV_FILE=".env"
+ENV_FILE=".env.dev"
 
 echo "[dev.sh] environment variable file: $ENV_FILE"
 
@@ -25,7 +25,7 @@ fi
 
 echo "[dev.sh] environment variable load complete"
 
-./gradlew clean build
+./gradlew build -x test
 
 if [ $? -eq 0 ]; then
     echo "[dev.sh] build complete"
@@ -34,6 +34,6 @@ else
     exit 1
 fi
 
-sudo docker compose --env-file .env up -d --build
+sudo docker compose --env-file .env.dev up -d --build
 
-echo "[dev.sh] deploy complete"
+echo "[dev.sh] deploy complete"

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     restart: always
 
   database:
-    image: mysql:9.0.0
+    image: mysql:8.4.4
     container_name: ring-us-database
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
@@ -34,16 +34,14 @@ services:
   redis:
     image: redis:7.0
     container_name: ring-us-redis
-    environment:
-      REDIS_PASSWORD : ${REDIS_PASSWORD}
-    command: redis-server --requirepass ${REDIS_PASSWORD}
+    command: --port ${REDIS_PORT} --requirepass ${REDIS_PASSWORD}
     expose:
       - ${REDIS_PORT}
     ports:
       - ${REDIS_PORT}:${REDIS_PORT}
     restart: always
     volumes:
-      - ring-us-redis:/var/lib/redis
+      - ring-us-redis:/data
 volumes:
   ring-us-database:
-  ring-us-redis:
+  ring-us-redis:

src/main/java/es/princip/ringus/application/auth/service/AuthService.java

@@ -1,13 +1,14 @@
 package es.princip.ringus.application.auth.service;
 
+
+import es.princip.ringus.application.member.service.MemberService;
 import es.princip.ringus.application.serviceTerm.ServiceTermAgreementService;
-import es.princip.ringus.domain.serviceTerm.ServiceTermAgreement;
+import es.princip.ringus.domain.email.EmailSessionRepository;
+import es.princip.ringus.domain.member.Member;
 import es.princip.ringus.presentation.auth.dto.request.LoginRequest;
-import es.princip.ringus.presentation.auth.dto.response.LoginResponse;
 import es.princip.ringus.presentation.auth.dto.request.SignUpRequest;
+import es.princip.ringus.presentation.auth.dto.response.LoginResponse;
 import es.princip.ringus.presentation.auth.dto.response.SignUpResponse;
-import es.princip.ringus.application.member.service.MemberService;
-import es.princip.ringus.domain.member.Member;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -24,14 +25,17 @@ public class AuthService {
     private final EmailVerificationService verificationService;
     private final MemberService memberService;
     private final ServiceTermAgreementService serviceTermAgreementService;
+    private final EmailSessionRepository emailSessionRepository;
 
     @Transactional
-    public SignUpResponse signUp(SignUpRequest request){
-        verificationService.verifySession(request.email());
+    public SignUpResponse signUp(SignUpRequest request, HttpSession session){
+        String sessionId = session.getId();
+
+        verificationService.verifySession(request.email(), session);
 
-        Set<ServiceTermAgreement> serviceTerm = serviceTermAgreementService.validateAndCreateAgreements(request.serviceTerms());
+        Member member = memberService.createMember(request, serviceTermAgreementService.validateAndCreateAgreements(request.serviceTerms()));
 
-        Member member = memberService.createMember(request, serviceTerm);
+        emailSessionRepository.deleteById(sessionId);
 
         return new SignUpResponse(member.getId());
     }

src/main/java/es/princip/ringus/application/auth/service/EmailVerificationService.java

@@ -2,16 +2,21 @@
 
 import es.princip.ringus.domain.email.EmailSession;
 import es.princip.ringus.domain.email.EmailSessionRepository;
-import es.princip.ringus.domain.email.EmailVerificationRepository;
 import es.princip.ringus.domain.email.EmailVerification;
+import es.princip.ringus.domain.email.EmailVerificationRepository;
 import es.princip.ringus.domain.exception.EmailErrorCode;
 import es.princip.ringus.domain.exception.SignUpErrorCode;
 import es.princip.ringus.domain.member.MemberRepository;
 import es.princip.ringus.global.exception.CustomRuntimeException;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpSession;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 @Service
 @RequiredArgsConstructor
 public class EmailVerificationService {
@@ -21,6 +26,14 @@ public class EmailVerificationService {
     private final MemberRepository memberRepository;
     private final EmailSendService emailSendService;
 
+    @Value("${verification.max-failed-attempts}")
+    private int maxFailedAttempts;
+
+    @PostConstruct
+    public void init(){
+        EmailVerification.setMaxFailedAttempts(maxFailedAttempts);
+    }
+
     @Transactional
     public void generateVerificationCode(String email) {
         if(memberRepository.existsByEmail(email)){
@@ -42,7 +55,7 @@ public void generateVerificationCode(String email) {
      * @throws CustomRuntimeException
      */
     @Transactional
-    public void verifyCode(String email, String inputCode){
+    public void verifyCode(String email, String inputCode, HttpSession session){
         EmailVerification verification = verificationRepository.findById(email)
                 .orElseThrow(() -> new CustomRuntimeException(EmailErrorCode.TTL_EXPIRED));
 
@@ -57,7 +70,11 @@ public void verifyCode(String email, String inputCode){
         }
 
         verificationRepository.delete(verification);
-        sessionRepository.save(EmailSession.of(email));
+
+        String sessionId = session.getId();
+
+        sessionRepository.save(EmailSession.of(email, sessionId));
+
     }
 
     /**
@@ -66,8 +83,14 @@ public void verifyCode(String email, String inputCode){
      * @throws CustomRuntimeException
      */
     @Transactional
-    public void verifySession(String email){
-        EmailSession emailSession = sessionRepository.findByEmail(email)
+    public void verifySession(String email, HttpSession session){
+        EmailSession emailSession = sessionRepository.findById(email)
                 .orElseThrow(() -> new CustomRuntimeException(EmailErrorCode.TTL_EXPIRED));
+
+        if(!Objects.equals(emailSession.getSessionId(), session.getId())){
+            throw new CustomRuntimeException(EmailErrorCode.SESSION_EMAIL_MISMATCH);
+        }
+
+        sessionRepository.delete(emailSession);
     }
 }

src/main/java/es/princip/ringus/application/member/service/MemberService.java

@@ -1,11 +1,14 @@
 package es.princip.ringus.application.member.service;
 
-import es.princip.ringus.domain.serviceTerm.ServiceTermAgreement;
-import es.princip.ringus.presentation.auth.dto.request.SignUpRequest;
+import es.princip.ringus.domain.exception.MemberErrorCode;
 import es.princip.ringus.domain.exception.SignUpErrorCode;
 import es.princip.ringus.domain.member.Member;
 import es.princip.ringus.domain.member.MemberRepository;
+import es.princip.ringus.domain.serviceTerm.ServiceTermAgreement;
 import es.princip.ringus.global.exception.CustomRuntimeException;
+import es.princip.ringus.global.util.UniversityDomainUtil;
+import es.princip.ringus.presentation.auth.dto.request.SignUpRequest;
+import es.princip.ringus.presentation.member.dto.MemberResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -31,14 +34,19 @@ public Member createMember(SignUpRequest request, Set<ServiceTermAgreement> serv
             throw new CustomRuntimeException(SignUpErrorCode.DUPLICATE_EMAIL);
         }
 
-        Member member = Member.of(request.email(), request.password(), passwordEncoder, request.memberType(), serviceTerm);
+        boolean isUniversityVerified = UniversityDomainUtil.isUniversityVerified(request.email());
+
+        Member member = Member.of(request.email(), request.password(), passwordEncoder, request.memberType(), serviceTerm, isUniversityVerified);
+
         memberRepository.save(member);
 
         return member;
     }
 
-    public Member getByMemberId(Long memberId) {
-        return memberRepository.findById(memberId).orElseThrow();
-    }
+    public MemberResponse getMemberById(Long memberId){
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
 
+        return MemberResponse.from(member);
+    }
 }

src/main/java/es/princip/ringus/application/mentee/service/MenteeService.java

@@ -7,7 +7,7 @@
 import es.princip.ringus.domain.mentee.MenteeRepository;
 import es.princip.ringus.domain.mentor.MentorRepository;
 import es.princip.ringus.global.exception.CustomRuntimeException;
-import es.princip.ringus.presentation.user.dto.MenteeRequest;
+import es.princip.ringus.presentation.mentee.dto.MenteeRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,24 +18,13 @@
 public class MenteeService {
 
     private final MemberRepository memberRepository;
-    private final MentorRepository mentorRepository;
     private final MenteeRepository menteeRepository;
 
     @Transactional
-    public void createMentee(MenteeRequest request) {
+    public Long register(MenteeRequest request) {
         Member member = memberRepository.findByEmail(request.email())
                 .orElseThrow(() -> new CustomRuntimeException(SignUpErrorCode.WRONG_EMAIL));
-
-        if (mentorRepository.existsByMember(member)) {
-            throw new CustomRuntimeException(SignUpErrorCode.ALREADY_REGISTERED_AS_MENTOR);
-        }
-        if (menteeRepository.existsByMember(member)) {
-            throw new CustomRuntimeException(SignUpErrorCode.ALREADY_REGISTERED_AS_MENTEE);
-        }
-
-        Mentee mentee = Mentee.of(member, request.nickname(), request.introduction(), request.major(), request.educationLevelType());
-
-        menteeRepository.save(mentee);
+        Mentee mentee = request.toEntity();
+        return  menteeRepository.save(mentee).getId();
     }
-
-}
+}

src/main/java/es/princip/ringus/application/mentor/service/MentorService.java

@@ -7,7 +7,7 @@
 import es.princip.ringus.domain.mentor.Mentor;
 import es.princip.ringus.domain.mentor.MentorRepository;
 import es.princip.ringus.global.exception.CustomRuntimeException;
-import es.princip.ringus.presentation.user.dto.MentorRequest;
+import es.princip.ringus.presentation.mentor.dto.MentorRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,23 +19,12 @@ public class MentorService {
 
     private final MemberRepository memberRepository;
     private final MentorRepository mentorRepository;
-    private final MenteeRepository menteeRepository;
 
     @Transactional
-    public void createMentor(MentorRequest request) {
+    public Long register(MentorRequest request) {
         Member member = memberRepository.findByEmail(request.email())
                 .orElseThrow(() -> new CustomRuntimeException(SignUpErrorCode.WRONG_EMAIL));
-
-        if (mentorRepository.existsByMember(member)) {
-            throw new CustomRuntimeException(SignUpErrorCode.ALREADY_REGISTERED_AS_MENTOR);
-        }
-        if (menteeRepository.existsByMember(member)) {
-            throw new CustomRuntimeException(SignUpErrorCode.ALREADY_REGISTERED_AS_MENTEE);
-        }
-
-        Mentor mentor = Mentor.of(member, request.nickname(), request.introduction(), request.company(), request.job(), request.experience());
-
-        mentorRepository.save(mentor);
+        Mentor mentor = request.toEntity(member.getId());
+        return  mentorRepository.save(mentor).getId();
     }
-
-}
+}

src/main/java/es/princip/ringus/domain/common/Education.java

@@ -0,0 +1,19 @@
+package es.princip.ringus.domain.common;
+
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+// 학력
+@Getter
+@Embeddable
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Education {
+    // 학교명 (필수)
+    private String schoolName;
+    // 전공명 (선택)
+    private String major;
+}

src/main/java/es/princip/ringus/domain/email/EmailSession.java

@@ -15,12 +15,14 @@ public class EmailSession implements Serializable {
 
     @Id
     private String email;
+    private String sessionId;
 
-    public static EmailSession of(String email) {
-        return new EmailSession(email);
+    public static EmailSession of(String email, String sessionId) {
+        return new EmailSession(email, sessionId);
     }
 
-    private EmailSession(String email) {
+    private EmailSession(String email, String sessionId) {
         this.email = email;
+        this.sessionId = sessionId;
     }
 }

src/main/java/es/princip/ringus/domain/email/EmailVerification.java

@@ -5,6 +5,7 @@
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
+
 import java.io.Serializable;
 import java.util.Random;
 
@@ -26,6 +27,8 @@ public class EmailVerification implements Serializable {
 
     private int failedAttempts;
 
+    private static int maxFailedAttempts;
+
     public static EmailVerification of(String email) {
         return new EmailVerification(email, generateVerificationCode());
     }
@@ -45,10 +48,14 @@ public void plusFailedAttempts() {
     }
 
     public boolean hasVerificationAttemptsLeft() {
-        return failedAttempts < 5;
+        return failedAttempts < maxFailedAttempts;
     }
 
     public boolean isValid(String inputCode) {
         return this.verificationCode.equals(inputCode);
     }
+
+    public static void setMaxFailedAttempts(int maxFailedAttempts) {
+        EmailVerification.maxFailedAttempts = maxFailedAttempts;
+    }
 }