RINGUS v1 Server 배포

.github/workflows/main-cd.yml

@@ -36,6 +36,15 @@ jobs:
               git clone [email protected]:Ring-Us/ring-us-server.git /home/ubuntu/ring-us-server
               cd /home/ubuntu/ring-us-server
             fi
+
+            cd /home/ubuntu/ring-us-server
+
+            echo "${{ secrets.ENV }}" > .env.dev
+
+            # 🛠 Gradle 빌드 권한 설정
+            echo "[GitHub Actions] 🔧 Fixing Gradle permissions"
+            sudo chown -R $USER:$USER ~/.gradle
+            sudo chmod -R 777 ~/.gradle
 
             # 🛠 Gradle 빌드 권한 설정
             echo "[GitHub Actions] 🔧 Fixing Gradle permissions"

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - redis
     ports:
       - ${SPRING_PORT}:${SPRING_PORT}
-    restart: always
+    restart: "always"
 
   database:
     image: mysql:8.4.4
@@ -27,7 +27,7 @@ services:
       - ${DB_PORT}
     ports:
       - ${DB_PORT}:${DB_PORT}
-    restart: no
+    restart: "no"
     volumes:
       - ring-us-database:/var/lib/mysql
 
@@ -39,9 +39,9 @@ services:
       - ${REDIS_PORT}
     ports:
       - ${REDIS_PORT}:${REDIS_PORT}
-    restart: always
+    restart: "always"
     volumes:
       - 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

@@ -37,6 +37,7 @@ public SignUpResponse signUp(SignUpRequest request, HttpSession session){
 
         emailSessionRepository.deleteById(sessionId);
 
+        verificationService.deleteSession(sessionId);
         return new SignUpResponse(member.getId());
     }
 

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

@@ -8,6 +8,7 @@
 import es.princip.ringus.domain.exception.SignUpErrorCode;
 import es.princip.ringus.domain.member.MemberRepository;
 import es.princip.ringus.global.exception.CustomRuntimeException;
+import es.princip.ringus.presentation.auth.dto.request.GenerateCodeRequest;
 import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpSession;
 import jakarta.transaction.Transactional;
@@ -20,7 +21,6 @@
 @Service
 @RequiredArgsConstructor
 public class EmailVerificationService {
-
     private final EmailVerificationRepository verificationRepository;
     private final EmailSessionRepository sessionRepository;
     private final MemberRepository memberRepository;
@@ -35,14 +35,21 @@ public void init(){
     }
 
     @Transactional
-    public void generateVerificationCode(String email) {
-        if(memberRepository.existsByEmail(email)){
-            throw new CustomRuntimeException(SignUpErrorCode.DUPLICATE_EMAIL);
+    public void generateVerificationCode(GenerateCodeRequest request) {
+        if(request.isPasswordReset()) {
+            if (!memberRepository.existsByEmail(request.email())) {
+                throw new CustomRuntimeException(SignUpErrorCode.NOT_FOUND_MEMBER);
+            }
+        }
+        else {
+            if(memberRepository.existsByEmail(request.email())) {
+                throw new CustomRuntimeException(SignUpErrorCode.DUPLICATE_EMAIL);
+            }
         }
 
-        EmailVerification verification = EmailVerification.of(email);
+        EmailVerification verification = EmailVerification.of(request.email());
 
-        emailSendService.sendMimeMessage(email, verification.getVerificationCode());
+        emailSendService.sendMimeMessage(request.email(), verification.getVerificationCode());
 
         verificationRepository.save(verification);
     }
@@ -91,6 +98,13 @@ public void verifySession(String email, HttpSession session){
             throw new CustomRuntimeException(EmailErrorCode.SESSION_EMAIL_MISMATCH);
         }
 
-        sessionRepository.delete(emailSession);
+    }
+
+    @Transactional
+    public void deleteSession(String email) {
+        if(!sessionRepository.existsById(email)) {
+            throw new CustomRuntimeException(EmailErrorCode.SESSION_NOT_FOUND);
+        }
+        sessionRepository.deleteById(email);
     }
 }

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

@@ -1,5 +1,6 @@
 package es.princip.ringus.application.member.service;
 
+import es.princip.ringus.application.auth.service.EmailVerificationService;
 import es.princip.ringus.domain.exception.MemberErrorCode;
 import es.princip.ringus.domain.exception.SignUpErrorCode;
 import es.princip.ringus.domain.member.Member;
@@ -8,13 +9,16 @@
 import es.princip.ringus.domain.mentee.MenteeRepository;
 import es.princip.ringus.domain.mentor.Mentor;
 import es.princip.ringus.domain.mentor.MentorRepository;
+import es.princip.ringus.domain.mentoring.MentoringRepository;
 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 es.princip.ringus.presentation.member.dto.MenteeProfileResponse;
 import es.princip.ringus.presentation.member.dto.MentorProfileResponse;
+import es.princip.ringus.presentation.member.dto.PasswordUpdateRequest;
+import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -30,8 +34,10 @@
 public class MemberService {
     private final MemberRepository memberRepository;
     private final MentorRepository mentorRepository;
-    private  final MenteeRepository menteeRepository;
+    private final MenteeRepository menteeRepository;
     private final PasswordEncoder passwordEncoder;
+    private final MentoringRepository mentoringRepository;
+    private final EmailVerificationService emailVerificationService;
 
     /**
      * 회원 저장 (이메일 인증 후 회원가입 진행)
@@ -68,13 +74,30 @@ public MemberResponse getMember(Long memberId) {
                 Mentor mentor = mentorRepository.findByMemberId(memberId)
                         .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
 
-                MentorProfileResponse profile = MentorProfileResponse.from(mentor);
+                MentorProfileResponse profile = MentorProfileResponse.from(mentor, mentoringRepository.findMentoringCountBy(mentor.getId()));
                 return MemberResponse.of(member, profile);
             }
         }
         return MemberResponse.of(member);
     }
 
+    @Transactional
+    public void updatePassword(PasswordUpdateRequest request, HttpSession session) {
+        emailVerificationService.verifySession(request.email(), session);
+
+        Member member = memberRepository.findByEmail(request.email())
+                .orElseThrow(() -> new CustomRuntimeException(SignUpErrorCode.NOT_FOUND_MEMBER));
+
+        if (passwordEncoder.matches(request.newPassword(), member.getPassword())) {
+            throw new CustomRuntimeException(MemberErrorCode.DUPLICATE_EXISTING_PASSWORD);
+        }
+
+        member.updatePassword(request.newPassword(), passwordEncoder);
+
+        emailVerificationService.deleteSession(request.email());
+
+    }
+
     public boolean isUniqueNickname(String nickname) {
         return !mentorRepository.existsByNickname(nickname) && !menteeRepository.existsByNickname(nickname);
     }

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

@@ -1,6 +1,9 @@
 package es.princip.ringus.application.mentee.service;
 
+import es.princip.ringus.domain.exception.MemberErrorCode;
 import es.princip.ringus.domain.exception.MenteeErrorCode;
+import es.princip.ringus.domain.member.Member;
+import es.princip.ringus.domain.member.MemberRepository;
 import es.princip.ringus.domain.mentee.Mentee;
 import es.princip.ringus.domain.mentee.MenteeRepository;
 import es.princip.ringus.global.exception.CustomRuntimeException;
@@ -13,11 +16,16 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class MyMenteeService {
+    private final MemberRepository memberRepository;
     private final MenteeRepository menteeRepository;
 
     public MyMenteeResponse getDetailBy(Long mentorId) {
         Mentee mentee = menteeRepository.findByMemberId(mentorId)
                 .orElseThrow(() -> new CustomRuntimeException(MenteeErrorCode.MENTEE_NOT_FOUND));
-        return MyMenteeResponse.from(mentee);
+
+        Member member = memberRepository.findById(mentee.getMemberId())
+                .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
+
+        return MyMenteeResponse.from(member,mentee);
     }
 }

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

@@ -7,6 +7,7 @@
 import es.princip.ringus.domain.member.MemberRepository;
 import es.princip.ringus.domain.mentor.Mentor;
 import es.princip.ringus.domain.mentor.MentorRepository;
+import es.princip.ringus.domain.mentoring.MentoringRepository;
 import es.princip.ringus.domain.support.CursorResponse;
 import es.princip.ringus.global.exception.CustomRuntimeException;
 import es.princip.ringus.presentation.mentor.dto.*;
@@ -25,6 +26,7 @@ public class MentorService {
 
     private final MemberRepository memberRepository;
     private final MentorRepository mentorRepository;
+    private final MentoringRepository mentoringRepository;
 
     @Transactional
     public Long register(Long memberId, MentorRequest request) {
@@ -47,7 +49,7 @@ public Long register(Long memberId, MentorRequest request) {
 
     @Transactional
     public Long edit(Long memberId, EditMentorRequest request) {
-        Mentor mentor = mentorRepository.findById(memberId)
+        Mentor mentor = mentorRepository.findByMemberId(memberId)
                 .orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND));
         mentor.edit(request);
         return mentor.getId();
@@ -57,6 +59,7 @@ public CursorResponse<MentorCardResponse> getMentorBy(CursorRequest request, Pag
         if(request.isBookmarked()) {
             Member member = memberRepository.findById(memberId)
                 .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
+            Long menteeId = member.getId();
 
             if (member.isNotMentee()) {
                 throw new CustomRuntimeException(MemberErrorCode.MEMBER_TYPE_DIFFERENT);
@@ -71,6 +74,10 @@ public CursorResponse<MentorCardResponse> getMentorBy(CursorRequest request, Pag
     public MentorDetailResponse getDetailBy(Long mentorId) {
         Mentor mentor = mentorRepository.findById(mentorId)
                 .orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND));
-        return MentorDetailResponse.from(mentor);
+
+        return MentorDetailResponse.from(
+                mentor,
+                mentoringRepository.findMentoringCountBy(mentorId)
+        );
     }
 }

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

@@ -1,8 +1,12 @@
 package es.princip.ringus.application.mentor.service;
 
+import es.princip.ringus.domain.exception.MemberErrorCode;
 import es.princip.ringus.domain.exception.MentorErrorCode;
+import es.princip.ringus.domain.member.Member;
+import es.princip.ringus.domain.member.MemberRepository;
 import es.princip.ringus.domain.mentor.Mentor;
 import es.princip.ringus.domain.mentor.MentorRepository;
+import es.princip.ringus.domain.mentoring.MentoringRepository;
 import es.princip.ringus.global.exception.CustomRuntimeException;
 import es.princip.ringus.presentation.mentor.dto.MyMentorResponse;
 import lombok.RequiredArgsConstructor;
@@ -14,10 +18,16 @@
 @Transactional(readOnly = true)
 public class MyMentorService {
     private  final MentorRepository mentorRepository;
+    private final MemberRepository memberRepository;
+    private  final MentoringRepository mentoringRepository;
 
     public MyMentorResponse getDetailBy(Long memberId) {
         Mentor mentor = mentorRepository.findByMemberId(memberId)
                 .orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND));
-        return MyMentorResponse.from(mentor);
+
+        Member member = memberRepository.findById(mentor.getMemberId())
+                .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
+
+        return MyMentorResponse.from(member, mentor, mentoringRepository.findMentoringCountBy(mentor.getId()));
     }
 }

src/main/java/es/princip/ringus/application/mentoring/MentoringService.java

@@ -1,7 +1,9 @@
 package es.princip.ringus.application.mentoring;
 
+import es.princip.ringus.application.notification.service.NotificationService;
 import es.princip.ringus.domain.exception.MenteeErrorCode;
 import es.princip.ringus.domain.exception.MentorErrorCode;
+import es.princip.ringus.domain.exception.MentoringErrorCode;
 import es.princip.ringus.domain.mentee.Mentee;
 import es.princip.ringus.domain.mentee.MenteeRepository;
 import es.princip.ringus.domain.mentor.Mentor;
@@ -10,8 +12,8 @@
 import es.princip.ringus.domain.mentoring.MentoringRepository;
 import es.princip.ringus.domain.mentoring.MentoringStatus;
 import es.princip.ringus.global.exception.CustomRuntimeException;
-import es.princip.ringus.presentation.mentoring.dto.CreateMentoringRequest;
-import es.princip.ringus.presentation.mentoring.dto.MentoringResponse;
+import es.princip.ringus.global.sender.dto.MentoringRequestMessage;
+import es.princip.ringus.presentation.mentoring.dto.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +26,7 @@ public class MentoringService {
     private final MentorRepository mentorRepository;
     private final MenteeRepository menteeRepository;
 
+    private final NotificationService notificationService;
     /**
      * 멘토링 신청 생성
      */
@@ -39,11 +42,46 @@ public MentoringResponse createMentoring(CreateMentoringRequest request, Long me
                 request.applyTimes(),
                 request.mentoringMessage(),
                 mentor,
-                mentee);
+                mentee
+        );
 
         mentee.addMentoring(mentoring);
         mentor.addMentoring(mentoring);
 
+        notificationService.notify(MentoringRequestMessage.from(mentee, mentor, mentoring));
         return MentoringResponse.from(mentoringRepository.save(mentoring));
     }
+
+    /**
+     * 멘토링 신청 취소
+     */
+    @Transactional
+    public MentoringCancelResponse cancelMentoring(CancelMentoringRequest request, Long memberId) {
+        Mentoring mentoring = mentoringRepository.findById(request.mentoringId())
+                .orElseThrow(() -> new CustomRuntimeException(MentoringErrorCode.MENTORING_NOT_FOUND));
+
+        if (!mentoring.getMentee().getMemberId().equals(memberId)) {
+            throw new CustomRuntimeException(MentoringErrorCode.MENTORING_CANCEL_NOT_POSSIBLE);
+        }
+
+        mentoring.cancel();
+        return MentoringCancelResponse.from(mentoring);
+    }
+
+    /**
+     * 멘토링 신청 거절
+     */
+    @Transactional
+    public MentoringRejectResponse rejectMentoring(RejectMentoringRequest request, Long memberId) {
+        Mentoring mentoring = mentoringRepository.findById(request.mentoringId())
+                .orElseThrow(() -> new CustomRuntimeException(MentoringErrorCode.MENTORING_NOT_FOUND));
+
+        if (!mentoring.getMentor().getMemberId().equals(memberId)) {
+            throw new CustomRuntimeException(MentorErrorCode.MENTOR_NOT_FOUND);
+        }
+
+        mentoring.reject();
+
+        return MentoringRejectResponse.from(mentoring);
+    }
 }

src/main/java/es/princip/ringus/application/notification/service/NotificationService.java

@@ -0,0 +1,26 @@
+package es.princip.ringus.application.notification.service;
+
+import es.princip.ringus.domain.notification.Notification;
+import es.princip.ringus.domain.notification.NotificationRepository;
+import es.princip.ringus.global.factory.NotificationMessageFactory;
+import es.princip.ringus.global.sender.NotificationSender;
+import es.princip.ringus.global.sender.dto.MentoringRequestMessage;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class NotificationService {
+
+    private final NotificationSender notificationSender;
+    private  final NotificationMessageFactory notificationMessageFactory;
+    private final NotificationRepository notificationRepository;
+
+    public void notify(MentoringRequestMessage request) {
+        Notification notification =  notificationMessageFactory.mentoringRequestMessage(request);
+        notificationRepository.save(notification);
+        notificationSender.send(notification);
+    }
+}

src/main/java/es/princip/ringus/domain/bookmark/BookmarkQueryDslRepository.java

@@ -0,0 +1,5 @@
+package es.princip.ringus.domain.bookmark;
+
+public interface BookmarkQueryDslRepository {
+    Boolean isBookmarked(Long memberId, Long mentorId);
+}