Skip to content

feat : 업체 내 사원 이름 검색 추가 #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HMHMHMJUN merged 4 commits into from
Jul 10, 2025
Merged

feat : 업체 내 사원 이름 검색 추가 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37c849f
feat : 업체 내 사원 이름 검색 서비스 추가 #350
HMHMHMJUN Jul 10, 2025
ec6e5c2
feat : 업체 내 사원 이름 검색 컨트롤러 #350
HMHMHMJUN Jul 10, 2025
8b68c58
feat : 업체 내 사원 이름 검색 쿼리 #350
HMHMHMJUN Jul 10, 2025
544d60b
feat : 업체 내 사원 이름 검색 테스트 #350
HMHMHMJUN Jul 10, 2025
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
12 changes: 6 additions & 6 deletions src/main/java/kr/mywork/domain/member/repository/MemberRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package kr.mywork.domain.member.repository;

import java.util.List;
import java.util.Optional;
import java.util.UUID;

import kr.mywork.domain.company.service.dto.response.MemberDetailResponse;
import kr.mywork.domain.member.model.Member;
import kr.mywork.domain.member.service.dto.response.MemberSelectResponse;

import java.util.List;
import java.util.Optional;
import java.util.UUID;

public interface MemberRepository {
Optional<Member> findByEmailAndDeletedFalse(String email);

List<Member> findMemberByCompanyId(UUID companyId, int page, int memberPageSize);
List<Member> findMemberByCompanyId(UUID companyId, int page, int memberPageSize, String memberName);

long countByCompanyIdAndDeletedFalse(UUID companyId);
long countByCompanyIdAndDeletedFalse(UUID companyId,String memberName);

Member save(Member member);

Expand Down
29 changes: 14 additions & 15 deletions src/main/java/kr/mywork/domain/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
package kr.mywork.domain.member.service;

import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import kr.mywork.common.auth.components.dto.LoginMemberDetail;
import kr.mywork.domain.activityLog.listener.eventObject.ActivityLogCreateEvent;
import kr.mywork.domain.activityLog.listener.eventObject.ActivityLogDeleteEvent;
Expand All @@ -25,6 +14,16 @@
import kr.mywork.domain.member.service.dto.response.MemberSelectResponse;
import kr.mywork.interfaces.member.controller.dto.request.ResetPasswordWebRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
Expand All @@ -38,18 +37,18 @@ public class MemberService {
private final ApplicationEventPublisher eventPublisher;

@Transactional
public List<CompanyMemberResponse> findMemberByCompanyId(UUID companyId, int page) {
public List<CompanyMemberResponse> findMemberByCompanyId(UUID companyId, int page, String memberName) {

return memberRepository.findMemberByCompanyId(companyId, page, memberPageSize)
return memberRepository.findMemberByCompanyId(companyId, page, memberPageSize, memberName)
.stream()
.map(CompanyMemberResponse::fromEntity)
.collect(Collectors.toList());

}

@Transactional
public long countMembersByCompanyId(UUID companyId) {
return memberRepository.countByCompanyIdAndDeletedFalse(companyId);
public long countMembersByCompanyId(UUID companyId, String memberName) {
return memberRepository.countByCompanyIdAndDeletedFalse(companyId,memberName);
}

@Transactional
Expand Down
41 changes: 30 additions & 11 deletions src/main/java/kr/mywork/infrastructure/member/rdb/QueryDslMemberRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQueryFactory;
import kr.mywork.domain.company.service.dto.response.MemberDetailResponse;
import kr.mywork.domain.member.model.Member;
Expand Down Expand Up @@ -31,23 +32,41 @@ public Optional<Member> findByEmailAndDeletedFalse(String email) {
}

@Override
public List<Member> findMemberByCompanyId(UUID companyId, int page, int memberPageSize) {
public List<Member> findMemberByCompanyId(UUID companyId, int page, int memberPageSize,String memberName) {
final int offset = (page - 1) * memberPageSize;

return queryFactory
.selectFrom(member)
.where(
member.companyId.eq(companyId),
member.deleted.eq(false))
.orderBy(member.name.asc())
.offset(offset)
.limit(memberPageSize)
.fetch();
.selectFrom(member)
.where(
member.companyId.eq(companyId),
member.deleted.eq(false),
memberNameCondition(memberName)
)
.orderBy(member.name.asc())
.offset(offset)
.limit(memberPageSize)
.fetch();
}

private BooleanExpression memberNameCondition(String memberName) {
if (memberName == null || memberName.trim().isEmpty()) {
return null;
}
return member.name.containsIgnoreCase(memberName);
}

@Override
public long countByCompanyIdAndDeletedFalse(UUID companyId) {
return memberRepository.countByCompanyIdAndDeletedFalse(companyId);
public long countByCompanyIdAndDeletedFalse(UUID companyId,String memberName) {
Long result = queryFactory
.select(member.count())
.from(member)
.where(
member.companyId.eq(companyId),
member.deleted.eq(false),
memberNameCondition(memberName) // 부분 검색 조건
)
.fetchOne();
return result != null ? result : 0L;
}

@Override
Expand Down
40 changes: 13 additions & 27 deletions src/main/java/kr/mywork/interfaces/company/controller/CompanyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
package kr.mywork.interfaces.company.controller;

import java.util.List;
import java.util.UUID;

import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.Pattern;
import kr.mywork.common.api.support.response.ApiResponse;
Expand All @@ -29,18 +15,15 @@
import kr.mywork.domain.member.service.dto.response.CompanyMemberResponse;
import kr.mywork.interfaces.company.controller.dto.request.CompanyCreateWebRequest;
import kr.mywork.interfaces.company.controller.dto.request.CompanyUpdateWebRequest;
import kr.mywork.interfaces.company.controller.dto.response.CompanyCreateWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyDeleteWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyDetailWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyIdCreateWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyListWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyNameWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyNamesWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanySelectWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.CompanyUpdateWebResponse;
import kr.mywork.interfaces.company.controller.dto.response.*;
import kr.mywork.interfaces.member.controller.dto.response.CompanyMemberListWebResponse;
import kr.mywork.interfaces.member.controller.dto.response.CompanyMemberWebResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.UUID;

@RestController
@RequiredArgsConstructor
Expand Down Expand Up @@ -141,11 +124,14 @@ public ApiResponse<CompanyNamesWebResponse> companyListOnlyIdNameWebResponseApiR
}

@GetMapping("/{companyId}/members")
public ApiResponse<CompanyMemberWebResponse> getCompanyMember(@PathVariable(name = "companyId") UUID companyId,
@RequestParam(defaultValue = "1") @Min(value = 1, message = "{invalid.page-size}") int page) {
List<CompanyMemberResponse> companyMemberResponses = memberService.findMemberByCompanyId(companyId, page);
public ApiResponse<CompanyMemberWebResponse> getCompanyMember(
@PathVariable(name = "companyId") UUID companyId,
@RequestParam(defaultValue = "1") @Min(value = 1, message = "{invalid.page-size}") int page,
@RequestParam(name = "memberName", required = false) final String memberName
) {
List<CompanyMemberResponse> companyMemberResponses = memberService.findMemberByCompanyId(companyId, page,memberName);

long total = memberService.countMembersByCompanyId(companyId);
long total = memberService.countMembersByCompanyId(companyId,memberName);

List<CompanyMemberListWebResponse> companyMemberWebResponses = companyMemberResponses.stream()
.map(CompanyMemberListWebResponse::fromService)
Expand Down
37 changes: 16 additions & 21 deletions src/test/java/kr/mywork/docs/CompanyDocumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
package kr.mywork.docs;

import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document;
import static com.epages.restdocs.apispec.ResourceDocumentation.headerWithName;
import static com.epages.restdocs.apispec.ResourceDocumentation.parameterWithName;
import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.util.UUID;

import com.epages.restdocs.apispec.ResourceSnippet;
import com.epages.restdocs.apispec.ResourceSnippetParameters;
import com.fasterxml.uuid.Generators;
import kr.mywork.common.api.support.response.ResultType;
import kr.mywork.interfaces.company.controller.dto.request.CompanyCreateWebRequest;
import kr.mywork.interfaces.company.controller.dto.request.CompanyUpdateWebRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpHeaders;
Expand All @@ -23,13 +15,14 @@
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.web.servlet.ResultActions;

import com.epages.restdocs.apispec.ResourceSnippet;
import com.epages.restdocs.apispec.ResourceSnippetParameters;
import com.fasterxml.uuid.Generators;
import java.util.UUID;

import kr.mywork.common.api.support.response.ResultType;
import kr.mywork.interfaces.company.controller.dto.request.CompanyCreateWebRequest;
import kr.mywork.interfaces.company.controller.dto.request.CompanyUpdateWebRequest;
import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document;
import static com.epages.restdocs.apispec.ResourceDocumentation.*;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

public class CompanyDocumentationTest extends RestDocsDocumentation {

Expand Down Expand Up @@ -464,6 +457,7 @@ private ResourceSnippet findAllCompanyListSuccessResource() {
final ResultActions result = mockMvc.perform(
get("/api/companies/{companyId}/members", id)
.param("page", "1")
.param("memberName","김민수")
.contentType(MediaType.APPLICATION_JSON)
.header(HttpHeaders.AUTHORIZATION, toBearerAuthorizationHeader(accessToken)));

Expand All @@ -483,7 +477,8 @@ private ResourceSnippet CompanyMemberGetSuccess() {
.summary("회사의 직원 목록 조회 API")
.description("회사의 직원 목록을 조회한다.")
.queryParameters(
parameterWithName("page").description("페이지 번호"))
parameterWithName("page").description("페이지 번호"),
parameterWithName("memberName").optional().description("이름 검색어 (부분 일치 검색)"))
.requestHeaders(
headerWithName(HttpHeaders.CONTENT_TYPE).description("컨텐츠 타입"),
headerWithName(HttpHeaders.AUTHORIZATION).description("엑세스 토큰"))
Expand Down
Loading