Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@ public record FindMemberRequest(
@Schema(description = "회원 역할", example = "ROLE_USER")
MemberRole role

//TODO: 가입일 추가


) {}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBu
List<MemberEntity> result = queryFactory
.selectFrom(memberEntity)
.where(whereClause)
.orderBy(orderSpecifier) // 동적 sorting
.orderBy(orderSpecifier)
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch();
Expand All @@ -44,7 +44,6 @@ private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBu
);
}

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

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

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

OrderSpecifier<LocalDateTime> orderSpecifier = sortDirection.equalsIgnoreCase("ASC")
? memberEntity.createdAt.asc() // ASC 정렬
: memberEntity.createdAt.desc(); // DESC 정렬
? memberEntity.createdAt.asc()
: memberEntity.createdAt.desc();

return executeQueryWithPageable(pageable, whereClause, orderSpecifier);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand All @@ -35,7 +34,6 @@ public List<Member> parseDataAndMapToMember(MultipartFile file) {
List<Department> 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/clap/server/config/aop/LoggingAspect.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/clap/server/domain/model/log/MemberLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/clap/server/domain/model/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,6 @@ public void verifyPassword(String encodedPassword) {
}

public void register(Member admin) {
this.admin = admin; // 관리자 설정
this.admin = admin;
}
}