Skip to content

Commit ce67434

Browse files
authored
Merge pull request #395 from TaskFlow-CLAP/CLAP-319
CLAP-319: 회원 관리 및 Logging API cleanup
2 parents 75a3412 + f5c1646 commit ce67434

File tree

9 files changed

+5
-20
lines changed

9 files changed

+5
-20
lines changed

src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.springframework.security.access.annotation.Secured;
1111
import org.springframework.transaction.annotation.Transactional;
1212
import org.springframework.web.bind.annotation.DeleteMapping;
13-
import org.springframework.web.bind.annotation.PatchMapping;
1413
import org.springframework.web.bind.annotation.RequestBody;
1514
import org.springframework.web.bind.annotation.RequestMapping;
1615

src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import clap.server.common.annotation.architecture.WebAdapter;
66
import clap.server.common.utils.FileTypeValidator;
77
import clap.server.exception.AdapterException;
8-
import clap.server.exception.ApplicationException;
98
import clap.server.exception.code.FileErrorcode;
109
import io.swagger.v3.oas.annotations.Operation;
1110
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,4 @@ public record FindMemberRequest(
2424
@Schema(description = "회원 역할", example = "ROLE_USER")
2525
MemberRole role
2626

27-
//TODO: 가입일 추가
28-
29-
3027
) {}

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBu
2626
List<MemberEntity> result = queryFactory
2727
.selectFrom(memberEntity)
2828
.where(whereClause)
29-
.orderBy(orderSpecifier) // 동적 sorting
29+
.orderBy(orderSpecifier)
3030
.offset(pageable.getOffset())
3131
.limit(pageable.getPageSize())
3232
.fetch();
@@ -44,7 +44,6 @@ private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBu
4444
);
4545
}
4646

47-
// 필터 조건 생성
4847
private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
4948
BooleanBuilder whereClause = new BooleanBuilder();
5049
whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
@@ -70,7 +69,7 @@ private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
7069

7170
@Override
7271
public Page<MemberEntity> findAllMembers(Pageable pageable) {
73-
OrderSpecifier<LocalDateTime> orderSpecifier = memberEntity.createdAt.desc(); // 기본 정렬: 최신순
72+
OrderSpecifier<LocalDateTime> orderSpecifier = memberEntity.createdAt.desc();
7473
return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)), orderSpecifier);
7574
}
7675

@@ -79,8 +78,8 @@ public Page<MemberEntity> findMembersWithFilter(Pageable pageable, FindMemberReq
7978
BooleanBuilder whereClause = createMemberFilter(filterRequest);
8079

8180
OrderSpecifier<LocalDateTime> orderSpecifier = sortDirection.equalsIgnoreCase("ASC")
82-
? memberEntity.createdAt.asc() // ASC 정렬
83-
: memberEntity.createdAt.desc(); // DESC 정렬
81+
? memberEntity.createdAt.asc()
82+
: memberEntity.createdAt.desc();
8483

8584
return executeQueryWithPageable(pageable, whereClause, orderSpecifier);
8685
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import static clap.server.application.mapper.MemberResponseMapper.toMember;
2322
import static clap.server.domain.model.member.MemberInfo.toMemberInfo;
2423

2524

@@ -35,7 +34,6 @@ public List<Member> parseDataAndMapToMember(MultipartFile file) {
3534
List<Department> departments = loadDepartmentPort.findActiveDepartments();
3635

3736
try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream()))) {
38-
// 첫 번째 줄은 헤더로 간주하고 다음 줄부터 파싱
3937
String headerLine = reader.readLine();
4038
if (headerLine == null) {
4139
throw new ApplicationException(MemberErrorCode.INVALID_CSV_FORMAT);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,15 @@ public class SendInvitationService implements SendInvitationUsecase {
2626
@Override
2727
@Transactional
2828
public void sendInvitation(SendInvitationRequest request) {
29-
// 회원 조회
3029
Member member = loadMemberPort.findById(request.memberId())
3130
.orElseThrow(() -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
3231

33-
// 초기 비밀번호 생성
3432
String initialPassword = passwordGenerator.generateRandomPassword();
3533
String encodedPassword = passwordEncoder.encode(initialPassword);
3634

37-
// 회원 비밀번호 업데이트
3835
member.resetPassword(encodedPassword);
3936
commandMemberPort.save(member);
4037

41-
// 회원 상태를 APPROVAL_REQUEST으로 변경
4238
member.changeToApproveRequested();
4339

4440
sendEmailPort.sendInvitationEmail(

src/main/java/clap/server/config/aop/LoggingAspect.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import org.springframework.security.core.Authentication;
2323
import org.springframework.security.core.context.SecurityContextHolder;
2424
import org.springframework.stereotype.Component;
25-
import org.springframework.web.servlet.HandlerExceptionResolver;
26-
import org.springframework.web.servlet.ModelAndView;
2725
import org.springframework.web.util.ContentCachingRequestWrapper;
2826
import org.springframework.web.context.request.RequestContextHolder;
2927
import org.springframework.web.context.request.ServletRequestAttributes;

src/main/java/clap/server/domain/model/log/MemberLog.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import clap.server.common.utils.ClientIpParseUtil;
55
import clap.server.domain.model.member.Member;
66
import jakarta.servlet.http.HttpServletRequest;
7-
import jakarta.servlet.http.HttpServletResponse;
87
import lombok.Getter;
98
import lombok.NoArgsConstructor;
109
import lombok.experimental.SuperBuilder;

src/main/java/clap/server/domain/model/member/Member.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@ public void verifyPassword(String encodedPassword) {
138138
}
139139

140140
public void register(Member admin) {
141-
this.admin = admin; // 관리자 설정
141+
this.admin = admin;
142142
}
143143
}

0 commit comments

Comments
 (0)