Merge branch 'feat/33' into develop

Author: dooongdaeng

back/src/main/java/com/back/domain/member/member/controller/MemberController.java

@@ -30,6 +30,7 @@ public RsData<Void> signupMentee(@RequestBody MenteeSignupRequest request) {
         memberService.joinMentee(
             request.email(),
             request.name(),
+            request.nickname(),
             request.password(),
             request.interestedField()
         );
@@ -53,6 +54,7 @@ public RsData<Void> signupMentor(@RequestBody MentorSignupVerifyRequest request)
         memberService.joinMentor(
             request.email(),
             request.name(),
+            request.nickname(),
             request.password(),
             request.career(),
             request.careerYears()
@@ -62,7 +64,7 @@ public RsData<Void> signupMentor(@RequestBody MentorSignupVerifyRequest request)
 
     @PostMapping("/login")
     public RsData<Void> login(@RequestBody LoginRequest request) {
-        Member member = memberService.login(request.getEmail(), request.getPassword());
+        Member member = memberService.login(request.email(), request.password());
 
         // JWT 토큰 생성 후 쿠키에 저장
         String accessToken = memberService.genAccessToken(member);

back/src/main/java/com/back/domain/member/member/dto/LoginRequest.java

@@ -1,9 +1,7 @@
 package com.back.domain.member.member.dto;
 
-import lombok.Data;
-
-@Data
-public class LoginRequest {
-    private String email;
-    private String password;
+public record LoginRequest(
+    String email,
+    String password
+) {
 }

back/src/main/java/com/back/domain/member/member/dto/MenteeSignupRequest.java

@@ -4,6 +4,7 @@ public record MenteeSignupRequest(
     String email,
     String password,
     String name,
+    String nickname,
     String interestedField
 ) {
 }

back/src/main/java/com/back/domain/member/member/dto/MentorSignupRequest.java

@@ -4,6 +4,7 @@ public record MentorSignupRequest(
     String email,
     String password,
     String name,
+    String nickname,
     String career,
     Integer careerYears
 ) {

back/src/main/java/com/back/domain/member/member/dto/MentorSignupVerifyRequest.java

@@ -5,6 +5,7 @@ public record MentorSignupVerifyRequest(
     String verificationCode,
     String password,
     String name,
+    String nickname,
     String career,
     Integer careerYears
 ) {

back/src/main/java/com/back/domain/member/member/entity/Member.java

@@ -18,6 +18,9 @@ public class Member extends BaseEntity {
     @Column(nullable = false)
     private String name;
 
+    @Column(unique = true, nullable = false)
+    private String nickname;
+
     @Column(nullable = false)
     private String password;
 
@@ -29,17 +32,19 @@ public enum Role {
         MENTOR, MENTEE, ADMIN
     }
 
-    public Member(String email, String password, String name, Role role) {
+    public Member(String email, String password, String name, String nickname, Role role) {
         this.email = email;
         this.password = password;
         this.name = name;
+        this.nickname = nickname;
         this.role = role;
     }
 
-    public Member(Long id, String email, String name, Role role) {
+    public Member(Long id, String email, String name, String nickname, Role role) {
         this.setId(id);
         this.email = email;
         this.name = name;
+        this.nickname = nickname;
         this.role = role;
     }
 }

back/src/main/java/com/back/domain/member/member/repository/MemberRepository.java

@@ -7,5 +7,5 @@
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByEmail(String email);
-
+    Optional<Member> findByNickname(String nickname);
 }

back/src/main/java/com/back/domain/member/member/service/AuthTokenService.java

@@ -21,12 +21,13 @@ public class AuthTokenService {
     public String genAccessToken(Member member) {
         String email = member.getEmail();
         String name = member.getName();
+        String nickname = member.getNickname();
         String role = member.getRole().name();
 
         return Ut.jwt.toString(
                 jwtSecretKey,
                 accessTokenExpirationSeconds,
-                Map.of("email", email, "name", name, "role", role)
+                Map.of("email", email, "name", name, "nickname", nickname, "role", role)
         );
     }
 
@@ -36,20 +37,22 @@ Map<String, Object> payload(String accessToken) {
 
         String email = (String) parsedPayload.get("email");
         String name = (String) parsedPayload.get("name");
+        String nickname = (String) parsedPayload.get("nickname");
         String role = (String) parsedPayload.get("role");
 
-        return Map.of("email", email, "name", name, "role", role);
+        return Map.of("email", email, "name", name, "nickname", nickname, "role", role);
     }
 
     public String genRefreshToken(Member member) {
         String email = member.getEmail();
         String name = member.getName();
+        String nickname = member.getNickname();
         String role = member.getRole().name();
 
         return Ut.jwt.toString(
                 jwtSecretKey,
                 refreshTokenExpirationSeconds,
-                Map.of("email", email, "name", name, "role", role, "type", "refresh")
+                Map.of("email", email, "name", name, "nickname", nickname, "role", role, "type", "refresh")
         );
     }
 

back/src/main/java/com/back/domain/member/member/service/MemberService.java

@@ -25,14 +25,20 @@ public class MemberService {
     private final PasswordEncoder passwordEncoder;
 
     @Transactional
-    public Member joinMentee(String email, String name, String password, String interestedField) {
+    public Member joinMentee(String email, String name, String nickname, String password, String interestedField) {
         memberRepository.findByEmail(email).ifPresent(
                 member -> {
                     throw new ServiceException("400-1", "이미 존재하는 이메일입니다.");
                 }
         );
 
-        Member member = new Member(email, passwordEncoder.encode(password), name, Member.Role.MENTEE);
+        memberRepository.findByNickname(nickname).ifPresent(
+                member -> {
+                    throw new ServiceException("400-3", "이미 존재하는 닉네임입니다.");
+                }
+        );
+
+        Member member = new Member(email, passwordEncoder.encode(password), name, nickname, Member.Role.MENTEE);
         Member savedMember = memberRepository.save(member);
 
         // TODO: interestedField를 jobId로 매핑하는 로직 필요
@@ -43,14 +49,20 @@ public Member joinMentee(String email, String name, String password, String inte
     }
 
     @Transactional
-    public Member joinMentor(String email, String name, String password, String career, Integer careerYears) {
+    public Member joinMentor(String email, String name, String nickname, String password, String career, Integer careerYears) {
         memberRepository.findByEmail(email).ifPresent(
                 member -> {
                     throw new ServiceException("400-2", "이미 존재하는 이메일입니다.");
                 }
         );
 
-        Member member = new Member(email, passwordEncoder.encode(password), name, Member.Role.MENTOR);
+        memberRepository.findByNickname(nickname).ifPresent(
+                member -> {
+                    throw new ServiceException("400-4", "이미 존재하는 닉네임입니다.");
+                }
+        );
+
+        Member member = new Member(email, passwordEncoder.encode(password), name, nickname, Member.Role.MENTOR);
         Member savedMember = memberRepository.save(member);
 
         // TODO: career를 jobId로 매핑하는 로직 필요

back/src/main/java/com/back/global/rq/Rq.java

@@ -56,6 +56,7 @@ public Member getActor() {
                             securityUser.getId(),
                             securityUser.getUsername(),  // email
                             securityUser.getName(),
+                            securityUser.getNickname(),
                             role != null ? Member.Role.valueOf(role) : null
                     );
                 })