Skip to content

Commit be78051

Browse files
committed
CLAP-441 Refactor: enum 값 비교 시, equals가 아닌 == 연산자를 사용하도록 수정
#578
1 parent a652e54 commit be78051

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

src/main/java/clap/server/adapter/inbound/security/service/SecurityUserDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static UserDetails from(MemberEntity member) {
5252
.userId(member.getMemberId())
5353
.username(member.getName())
5454
.authorities(List.of(new CustomGrantedAuthority(member.getRole().name())))
55-
.accountNonLocked(member.getStatus().equals(MemberStatus.ACTIVE))
55+
.accountNonLocked(member.getStatus()==MemberStatus.ACTIVE)
5656
.build();
5757
}
5858

src/main/java/clap/server/application/service/admin/DeleteMemberService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void deleteMember(Long memberId) {
2626
Member member = loadMemberPort.findById(memberId)
2727
.orElseThrow(() -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
2828

29-
if(member.getMemberInfo().getRole().equals(MemberRole.ROLE_MANAGER)){
29+
if (member.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER) {
3030
managerInfoUpdatePolicy.validateNoRemainingTasks(member);
3131
}
3232
Hibernate.initialize(member.getDepartment());

src/main/java/clap/server/application/service/admin/ManageMemberService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest re
3232
Member member = memberService.findById(memberId);
3333
Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
3434
new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
35-
3635
managerInfoUpdatePolicy.validateDepartment(department, request.role());
37-
if(member.getMemberInfo().getRole().equals(MemberRole.ROLE_MANAGER) &&
38-
!request.role().equals(MemberRole.ROLE_MANAGER)){
36+
if(member.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER && !(request.role()==MemberRole.ROLE_MANAGER)){
3937
managerInfoUpdatePolicy.validateNoRemainingTasks(member);
4038
}
4139

src/main/java/clap/server/application/service/auth/AuthService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public LoginResponse login(String nickname, String password, String clientIp) {
3838
Member member = getMember(nickname,clientIp);
3939
validatePassword(password, member.getPassword(), nickname, clientIp);
4040

41-
if (member.getStatus().equals(MemberStatus.APPROVAL_REQUEST)) {
41+
if (member.getStatus()==MemberStatus.APPROVAL_REQUEST) {
4242
String temporaryToken = manageTokenService.issueTemporaryToken(member.getMemberId());
4343
return AuthResponseMapper.toLoginResponse(temporaryToken, null);
4444
}

src/main/java/clap/server/domain/policy/member/ManagerInfoUpdatePolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void validateDepartment(final Department department, final MemberRole mem
2323
// 담당자의 잔여 작업이 남아있는 경우 해당 회원의 데이터 수정이 허용되지 않음
2424
public void validateNoRemainingTasks(final Member member){
2525
// 최종 회원 등록 전의 경우는 검증하지 않는다.
26-
if(member.getStatus().equals(MemberStatus.PENDING) || member.getStatus().equals(MemberStatus.APPROVAL_REQUEST)){
26+
if(member.getStatus()==MemberStatus.PENDING || member.getStatus()==MemberStatus.APPROVAL_REQUEST){
2727
return;
2828
}
2929
if(member.getInReviewingTaskCount()>0 || member.getInProgressTaskCount()> 0){

0 commit comments

Comments
 (0)