From f5c164604f39d69cd158f0158c795fb225ac2d90 Mon Sep 17 00:00:00 2001 From: Sihun23 Date: Fri, 7 Feb 2025 13:54:46 +0900 Subject: [PATCH] =?UTF-8?q?CLAP-319:fix:=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20import=EB=AC=B8=20=EB=B0=8F=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inbound/web/admin/DeleteMemberController.java | 1 - .../inbound/web/admin/RegisterMemberCsvController.java | 1 - .../inbound/web/dto/admin/request/FindMemberRequest.java | 3 --- .../repository/member/MemberCustomRepositoryImpl.java | 9 ++++----- .../application/service/admin/CsvParseService.java | 2 -- .../application/service/admin/SendInvitationService.java | 4 ---- src/main/java/clap/server/config/aop/LoggingAspect.java | 2 -- .../java/clap/server/domain/model/log/MemberLog.java | 1 - .../java/clap/server/domain/model/member/Member.java | 2 +- 9 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java index e65e180f..24b27c99 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java @@ -10,7 +10,6 @@ import org.springframework.security.access.annotation.Secured; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java index 266a3cd2..b0a982a3 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java @@ -5,7 +5,6 @@ import clap.server.common.annotation.architecture.WebAdapter; import clap.server.common.utils.FileTypeValidator; import clap.server.exception.AdapterException; -import clap.server.exception.ApplicationException; import clap.server.exception.code.FileErrorcode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java index 5c659cce..5fa2249c 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java @@ -24,7 +24,4 @@ public record FindMemberRequest( @Schema(description = "회원 역할", example = "ROLE_USER") MemberRole role - //TODO: 가입일 추가 - - ) {} diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java index 39863735..966cb823 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java @@ -26,7 +26,7 @@ private Page executeQueryWithPageable(Pageable pageable, BooleanBu List result = queryFactory .selectFrom(memberEntity) .where(whereClause) - .orderBy(orderSpecifier) // 동적 sorting + .orderBy(orderSpecifier) .offset(pageable.getOffset()) .limit(pageable.getPageSize()) .fetch(); @@ -44,7 +44,6 @@ private Page executeQueryWithPageable(Pageable pageable, BooleanBu ); } - // 필터 조건 생성 private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) { BooleanBuilder whereClause = new BooleanBuilder(); whereClause.and(memberEntity.status.ne(MemberStatus.DELETED)); @@ -70,7 +69,7 @@ private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) { @Override public Page findAllMembers(Pageable pageable) { - OrderSpecifier orderSpecifier = memberEntity.createdAt.desc(); // 기본 정렬: 최신순 + OrderSpecifier orderSpecifier = memberEntity.createdAt.desc(); return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)), orderSpecifier); } @@ -79,8 +78,8 @@ public Page findMembersWithFilter(Pageable pageable, FindMemberReq BooleanBuilder whereClause = createMemberFilter(filterRequest); OrderSpecifier orderSpecifier = sortDirection.equalsIgnoreCase("ASC") - ? memberEntity.createdAt.asc() // ASC 정렬 - : memberEntity.createdAt.desc(); // DESC 정렬 + ? memberEntity.createdAt.asc() + : memberEntity.createdAt.desc(); return executeQueryWithPageable(pageable, whereClause, orderSpecifier); } diff --git a/src/main/java/clap/server/application/service/admin/CsvParseService.java b/src/main/java/clap/server/application/service/admin/CsvParseService.java index 547b99c0..76199e41 100644 --- a/src/main/java/clap/server/application/service/admin/CsvParseService.java +++ b/src/main/java/clap/server/application/service/admin/CsvParseService.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; -import static clap.server.application.mapper.MemberResponseMapper.toMember; import static clap.server.domain.model.member.MemberInfo.toMemberInfo; @@ -35,7 +34,6 @@ public List parseDataAndMapToMember(MultipartFile file) { List departments = loadDepartmentPort.findActiveDepartments(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream()))) { - // 첫 번째 줄은 헤더로 간주하고 다음 줄부터 파싱 String headerLine = reader.readLine(); if (headerLine == null) { throw new ApplicationException(MemberErrorCode.INVALID_CSV_FORMAT); diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java index b17918f1..7981a6e1 100644 --- a/src/main/java/clap/server/application/service/admin/SendInvitationService.java +++ b/src/main/java/clap/server/application/service/admin/SendInvitationService.java @@ -26,19 +26,15 @@ public class SendInvitationService implements SendInvitationUsecase { @Override @Transactional public void sendInvitation(SendInvitationRequest request) { - // 회원 조회 Member member = loadMemberPort.findById(request.memberId()) .orElseThrow(() -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND)); - // 초기 비밀번호 생성 String initialPassword = passwordGenerator.generateRandomPassword(); String encodedPassword = passwordEncoder.encode(initialPassword); - // 회원 비밀번호 업데이트 member.resetPassword(encodedPassword); commandMemberPort.save(member); - // 회원 상태를 APPROVAL_REQUEST으로 변경 member.changeToApproveRequested(); sendEmailPort.sendInvitationEmail( diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java index 760e08fa..e1ff3e8e 100644 --- a/src/main/java/clap/server/config/aop/LoggingAspect.java +++ b/src/main/java/clap/server/config/aop/LoggingAspect.java @@ -22,8 +22,6 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import org.springframework.web.servlet.HandlerExceptionResolver; -import org.springframework.web.servlet.ModelAndView; import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/java/clap/server/domain/model/log/MemberLog.java b/src/main/java/clap/server/domain/model/log/MemberLog.java index 933b753e..7ad55f70 100644 --- a/src/main/java/clap/server/domain/model/log/MemberLog.java +++ b/src/main/java/clap/server/domain/model/log/MemberLog.java @@ -4,7 +4,6 @@ import clap.server.common.utils.ClientIpParseUtil; import clap.server.domain.model.member.Member; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java index 27b06c6d..5b593676 100644 --- a/src/main/java/clap/server/domain/model/member/Member.java +++ b/src/main/java/clap/server/domain/model/member/Member.java @@ -138,6 +138,6 @@ public void verifyPassword(String encodedPassword) { } public void register(Member admin) { - this.admin = admin; // 관리자 설정 + this.admin = admin; } }