Skip to content

Commit 47bdd51

Browse files
authored
Merge pull request #36 from S0ftwareC0ntest/refactor/#35-member-package-seperation
[Refactor/#35] 멤버 패키지 별도 분리
2 parents bb57f1e + d308e7d commit 47bdd51

23 files changed

Lines changed: 48 additions & 24 deletions

File tree

src/main/java/com/assu/server/domain/admin/entity/Admin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.assu.server.domain.admin.entity;
22

3-
import com.assu.server.domain.auth.entity.Member;
3+
import com.assu.server.domain.member.entity.Member;
44
import jakarta.persistence.Entity;
55
import jakarta.persistence.JoinColumn;
66
import jakarta.persistence.MapsId;

src/main/java/com/assu/server/domain/auth/entity/CommonAuth.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.assu.server.domain.auth.entity;
22

33
import com.assu.server.domain.common.entity.BaseEntity;
4+
import com.assu.server.domain.member.entity.Member;
45
import jakarta.persistence.*;
56
import lombok.*;
67

src/main/java/com/assu/server/domain/auth/entity/SSUAuth.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.assu.server.domain.auth.entity;
22

33
import com.assu.server.domain.common.entity.BaseEntity;
4+
import com.assu.server.domain.member.entity.Member;
45
import jakarta.persistence.*;
56
import lombok.*;
67

src/main/java/com/assu/server/domain/auth/security/JwtUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.assu.server.domain.auth.security;
22

33
import com.assu.server.domain.auth.dto.signup.Tokens;
4-
import com.assu.server.domain.auth.entity.Member;
4+
import com.assu.server.domain.member.entity.Member;
55
import com.assu.server.domain.auth.exception.CustomAuthException;
6-
import com.assu.server.domain.auth.repository.MemberRepository;
6+
import com.assu.server.domain.member.repository.MemberRepository;
77
import com.assu.server.domain.common.enums.UserRole;
88
import com.assu.server.global.apiPayload.code.status.ErrorStatus;
99
import io.jsonwebtoken.Claims;

src/main/java/com/assu/server/domain/auth/security/common/CommonUserDetailsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.assu.server.domain.auth.security.common;
22

33
import com.assu.server.domain.auth.entity.CommonAuth;
4-
import com.assu.server.domain.auth.entity.Member;
4+
import com.assu.server.domain.member.entity.Member;
55
import com.assu.server.domain.auth.exception.CustomAuthException;
66
import com.assu.server.domain.auth.repository.CommonAuthRepository;
77
import com.assu.server.domain.common.enums.ActivationStatus;

src/main/java/com/assu/server/domain/auth/security/student/StudentUserDetailsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.assu.server.domain.auth.security.student;
22

3-
import com.assu.server.domain.auth.entity.Member;
3+
import com.assu.server.domain.member.entity.Member;
44
import com.assu.server.domain.auth.entity.SSUAuth;
55
import com.assu.server.domain.auth.repository.SSUAuthRepository;
66
import com.assu.server.domain.common.enums.ActivationStatus;

src/main/java/com/assu/server/domain/auth/service/LoginServiceImpl.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,22 @@
66
import com.assu.server.domain.auth.dto.login.StudentLoginRequest;
77
import com.assu.server.domain.auth.dto.signup.Tokens;
88
import com.assu.server.domain.auth.entity.CommonAuth;
9-
import com.assu.server.domain.auth.entity.Member;
9+
import com.assu.server.domain.member.entity.Member;
1010
import com.assu.server.domain.auth.entity.SSUAuth;
1111
import com.assu.server.domain.auth.exception.CustomAuthException;
1212
import com.assu.server.domain.auth.repository.CommonAuthRepository;
13-
import com.assu.server.domain.auth.repository.MemberRepository;
13+
import com.assu.server.domain.member.repository.MemberRepository;
1414
import com.assu.server.domain.auth.repository.SSUAuthRepository;
1515
import com.assu.server.domain.auth.security.JwtUtil;
1616
import com.assu.server.domain.auth.security.SecurityUtil;
1717
import com.assu.server.domain.auth.security.common.CommonUsernamePasswordAuthenticationToken;
1818
import com.assu.server.domain.auth.security.student.StudentUsernamePasswordAuthenticationToken;
1919
import com.assu.server.global.apiPayload.code.status.ErrorStatus;
2020
import lombok.RequiredArgsConstructor;
21-
import org.springframework.beans.factory.annotation.Value;
2221
import org.springframework.security.authentication.AuthenticationManager;
2322
import org.springframework.security.core.Authentication;
2423
import org.springframework.stereotype.Service;
2524

26-
import java.util.Collections;
27-
import java.util.Map;
28-
2925
@Service
3026
@RequiredArgsConstructor
3127
public class LoginServiceImpl implements LoginService {

src/main/java/com/assu/server/domain/auth/service/LogoutServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.assu.server.domain.auth.service;
22

3-
import com.assu.server.domain.auth.repository.MemberRepository;
3+
import com.assu.server.domain.member.repository.MemberRepository;
44
import com.assu.server.domain.auth.security.JwtUtil;
55
import com.assu.server.domain.auth.security.SecurityUtil;
66
import lombok.RequiredArgsConstructor;

src/main/java/com/assu/server/domain/auth/service/SignUpServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import com.assu.server.domain.auth.security.JwtUtil;
1515
import com.assu.server.domain.common.enums.ActivationStatus;
1616
import com.assu.server.domain.common.enums.UserRole;
17-
import com.assu.server.domain.auth.entity.Member;
18-
import com.assu.server.domain.auth.repository.MemberRepository;
17+
import com.assu.server.domain.member.entity.Member;
18+
import com.assu.server.domain.member.repository.MemberRepository;
1919
import com.assu.server.domain.partner.entity.Partner;
2020
import com.assu.server.domain.partner.repository.PartnerRepository;
2121
import com.assu.server.domain.user.entity.Student;

src/main/java/com/assu/server/domain/chat/converter/ChatConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.assu.server.domain.chat.converter;
22

33
import com.assu.server.domain.admin.entity.Admin;
4-
import com.assu.server.domain.auth.entity.Member;
4+
import com.assu.server.domain.member.entity.Member;
55
import com.assu.server.domain.chat.dto.ChatMessageDTO;
66
import com.assu.server.domain.chat.dto.ChatRequestDTO;
77
import com.assu.server.domain.chat.dto.ChatResponseDTO;

0 commit comments

Comments
 (0)