Feature/#168 로그인api 반환 값 변경

backend/src/main/java/sw_css/auth/application/AuthSignInService.java

@@ -3,14 +3,17 @@
 
 import jakarta.transaction.Transactional;
 import java.security.SecureRandom;
+import java.util.Optional;
 import java.util.regex.Pattern;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import sw_css.auth.application.dto.response.SignInResponse;
 import sw_css.auth.exception.AuthException;
 import sw_css.auth.exception.AuthExceptionType;
+import sw_css.member.domain.FacultyMember;
 import sw_css.member.domain.Member;
 import sw_css.member.domain.Role;
+import sw_css.member.domain.StudentMember;
 import sw_css.member.domain.embedded.Password;
 import sw_css.member.domain.repository.FacultyMemberRepository;
 import sw_css.member.domain.repository.MemberRepository;
@@ -38,12 +41,23 @@ public SignInResponse signIn(String email, String rawPassword) {
             throw new AuthException(AuthExceptionType.MEMBER_WRONG_ID_OR_PASSWORD);
         }
 
-        String role = loadMemberRole(member);
-        boolean isModerator = role.equals(Role.ROLE_ADMIN.toString());
+        Object memberDetail = loadMemberDetail(member);
+        if (memberDetail instanceof StudentMember studentMember) {
+            String role = Role.ROLE_MEMBER.toString();
 
-        String accessToken = jwtTokenProvider.createToken(member.getId(), role);
+            String accessToken = jwtTokenProvider.createToken(member.getId(), role);
 
-        return SignInResponse.of(member, role, isModerator, accessToken);
+            return SignInResponse.of(member, studentMember.getId(), role, false, accessToken);
+
+        } else if (memberDetail instanceof FacultyMember facultyMember) {
+            String role = Role.ROLE_ADMIN.toString();
+
+            String accessToken = jwtTokenProvider.createToken(member.getId(), role);
+
+            return SignInResponse.of(member, facultyMember.getId(), role, true, accessToken);
+        }
+
+        throw new AuthException(AuthExceptionType.MEMBER_EMAIL_NOT_FOUND);
     }
 
     public void resetPassword(String email, String name) {
@@ -63,13 +77,16 @@ public void resetPassword(String email, String name) {
         authEmailService.sendNewPassword(email, newPassword);
     }
 
-    private String loadMemberRole(Member member) {
+    private Object loadMemberDetail(Member member) {
         Long memberId = member.getId();
-        if (studentMemberRepository.existsByMemberId(memberId)) {
-            return Role.ROLE_MEMBER.toString();
+        Optional<StudentMember> studentMember = studentMemberRepository.findByMemberId(memberId);
+        if (studentMember.isPresent()) {
+            return studentMember.get();
         }
-        if (facultyMemberRepository.existsByMemberId(memberId)) {
-            return Role.ROLE_ADMIN.toString();
+
+        Optional<FacultyMember> facultyMember = facultyMemberRepository.findByMemberId(memberId);
+        if (facultyMember.isPresent()) {
+            return facultyMember.get();
         }
         throw new AuthException(AuthExceptionType.MEMBER_NOT_FOUND);
     }

backend/src/main/java/sw_css/auth/application/dto/response/SignInResponse.java

@@ -11,7 +11,7 @@ public record SignInResponse(
         String token
 ) {
 
-    public static SignInResponse of(Member member, String role, Boolean isModerator, String token) {
-        return new SignInResponse(member.getId(), member.getName(), member.getEmail(), role, isModerator, token);
+    public static SignInResponse of(Member member, long member_id, String role, Boolean isModerator, String token) {
+        return new SignInResponse(member_id, member.getName(), member.getEmail(), role, isModerator, token);
     }
 }

backend/src/main/java/sw_css/member/domain/repository/FacultyMemberRepository.java

@@ -1,8 +1,11 @@
 package sw_css.member.domain.repository;
 
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import sw_css.member.domain.FacultyMember;
 
 public interface FacultyMemberRepository extends JpaRepository<FacultyMember, Long> {
     boolean existsByMemberId(Long memberId);
+
+    Optional<FacultyMember> findByMemberId(Long memberId);
 }

backend/src/main/java/sw_css/member/domain/repository/StudentMemberRepository.java

@@ -1,10 +1,13 @@
 package sw_css.member.domain.repository;
 
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import sw_css.member.domain.StudentMember;
 
 public interface StudentMemberRepository extends JpaRepository<StudentMember, Long> {
     boolean existsById(Number studentId);
 
     boolean existsByMemberId(Number memberId);
+
+    Optional<StudentMember> findByMemberId(Number memberId);
 }

backend/src/main/resources/schema.sql

@@ -9,14 +9,13 @@ drop table if exists sw_css.milestone_history;
 
 create table member
 (
-    id            bigint auto_increment primary key,
-    email         varchar(255) not null,
-    name          varchar(255) not null,
-    password      varchar(255) not null,
-    phone_number  varchar(255) not null,
-    is_authorized boolean      not null,
-    is_deleted    boolean      not null,
-    created_at    datetime(6)  not null default current_timestamp(6)
+    id           bigint auto_increment primary key,
+    email        varchar(255) not null,
+    name         varchar(255) not null,
+    password     varchar(255) not null,
+    phone_number varchar(255) not null,
+    is_deleted   boolean      not null,
+    created_at   datetime(6)  not null default current_timestamp(6)
 );
 
 create table student_member

backend/src/main/resources/test-data.sql

@@ -1,19 +1,19 @@
 ## member(student)
-insert into member (email, name, password, phone_number, is_authorized, is_deleted)
+insert into member (email, name, password, phone_number, is_deleted)
 values ('[email protected]', '송세연', '$2a$10$YyiOL/E5WjKrZPkB6eQSK.PwZtAO.z3JimFbq/Ky3u3rFf3XTGrWK', '010-0000-0000',
         true, false);
 
 insert into student_member (id, member_id, major_id, minor_id, double_major_id, career, career_detail)
 values (202055558, 1, 1, null, null, 'EMPLOYMENT_COMPANY', 'IT 기업 개발자');
 
-insert into member (email, name, password, phone_number, is_authorized, is_deleted)
+insert into member (email, name, password, phone_number, is_deleted)
 values ('[email protected]', '이다은', '$2a$10$YyiOL/E5WjKrZPkB6eQSK.PwZtAO.z3JimFbq/Ky3u3rFf3XTGrWK', '010-0000-0000',
         true, false);
 
 insert into student_member (id, member_id, major_id, minor_id, double_major_id, career, career_detail)
 values (202055555, 2, 1, null, null, 'GRADUATE_SCHOOL', 'IT 기업 개발자');
 
-insert into member (email, name, password, phone_number, is_authorized, is_deleted)
+insert into member (email, name, password, phone_number, is_deleted)
 values ('[email protected]', '김하윤', '$2a$10$YyiOL/E5WjKrZPkB6eQSK.PwZtAO.z3JimFbq/Ky3u3rFf3XTGrWK', '010-0000-0000',
         true, false);