From 23b0ce08074c69f8c7e77cec7f72505321122d5f Mon Sep 17 00:00:00 2001 From: Yeju-Kang Date: Thu, 3 Jul 2025 19:02:38 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C=20=EC=B5=9C=EC=8B=A0=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EC=A0=95=EB=A0=AC=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EC=A4=80=20=EC=88=98=EC=A0=95(#3?= =?UTF-8?q?22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/mywork/domain/project/service/ProjectService.java | 1 - .../infrastructure/company/rdb/QueryDslCompanyRepository.java | 1 + .../infrastructure/member/rdb/QueryDslMemberRepository.java | 2 +- .../infrastructure/project/rdb/QueryDslProjectRepository.java | 2 ++ .../rdb/QueryDslProjectCheckListRepository.java | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/kr/mywork/domain/project/service/ProjectService.java b/src/main/java/kr/mywork/domain/project/service/ProjectService.java index d250e0cd..280030ab 100644 --- a/src/main/java/kr/mywork/domain/project/service/ProjectService.java +++ b/src/main/java/kr/mywork/domain/project/service/ProjectService.java @@ -131,7 +131,6 @@ public List findProjectsBySearchConditionWithPaging( projectRepository.findAllByStepAndNameWithPaging(step, null, page, projectPageSize); final List projectIds = projects.stream().map(Project::getId).toList(); - projects.sort(Comparator.comparing(Project::getId)); final Map projectIdAssignMap = transformProjectAssignMap(projectAssignRepository.findAllByProjectIds(projectIds)); diff --git a/src/main/java/kr/mywork/infrastructure/company/rdb/QueryDslCompanyRepository.java b/src/main/java/kr/mywork/infrastructure/company/rdb/QueryDslCompanyRepository.java index 1b5f6e95..e42fc2a4 100644 --- a/src/main/java/kr/mywork/infrastructure/company/rdb/QueryDslCompanyRepository.java +++ b/src/main/java/kr/mywork/infrastructure/company/rdb/QueryDslCompanyRepository.java @@ -66,6 +66,7 @@ public List findCompaniesBySearchConditionWithPaging(fina eqDeleted(deleted), containsKeyword(keywordType, keyword) ) + .orderBy(company.createdAt.desc()) .offset(offset) .limit(companyPageSize) .fetch(); diff --git a/src/main/java/kr/mywork/infrastructure/member/rdb/QueryDslMemberRepository.java b/src/main/java/kr/mywork/infrastructure/member/rdb/QueryDslMemberRepository.java index f9227d46..cf0100c8 100644 --- a/src/main/java/kr/mywork/infrastructure/member/rdb/QueryDslMemberRepository.java +++ b/src/main/java/kr/mywork/infrastructure/member/rdb/QueryDslMemberRepository.java @@ -147,7 +147,7 @@ public List findMembersBySearchWithPaging(int page, int me .from(member) .join(company).on(member.companyId.eq(company.id)) .where(builder) - .orderBy(member.id.desc()) + .orderBy(member.createdAt.desc()) .offset(offset) .limit(memberPageSize) .fetch(); diff --git a/src/main/java/kr/mywork/infrastructure/project/rdb/QueryDslProjectRepository.java b/src/main/java/kr/mywork/infrastructure/project/rdb/QueryDslProjectRepository.java index 9e16901b..d4e6b583 100644 --- a/src/main/java/kr/mywork/infrastructure/project/rdb/QueryDslProjectRepository.java +++ b/src/main/java/kr/mywork/infrastructure/project/rdb/QueryDslProjectRepository.java @@ -80,6 +80,7 @@ public List findAllByStepAndNameWithPaging(final String step, final Str return queryFactory.selectFrom(project) .where(eqDeleted(false), eqProjectStep(step), containsProjectName(projectName)) + .orderBy(project.createdAt.desc()) .limit(size) .offset(offset) .fetch(); @@ -189,6 +190,7 @@ public List findProjectsByIds(List projectIds) { return queryFactory .selectFrom(project) .where(project.id.in(projectIds)) + .orderBy(project.createdAt.desc()) .fetch(); } diff --git a/src/main/java/kr/mywork/infrastructure/project_checklist/rdb/QueryDslProjectCheckListRepository.java b/src/main/java/kr/mywork/infrastructure/project_checklist/rdb/QueryDslProjectCheckListRepository.java index 9b23dfae..07111814 100644 --- a/src/main/java/kr/mywork/infrastructure/project_checklist/rdb/QueryDslProjectCheckListRepository.java +++ b/src/main/java/kr/mywork/infrastructure/project_checklist/rdb/QueryDslProjectCheckListRepository.java @@ -71,6 +71,7 @@ public List findAllByProjectIdAndStepId(final UU .from(projectCheckList) .join(projectStep).on(projectCheckList.projectStepId.eq(projectStep.id)) .where(projectStep.projectId.eq(projectId), eqProjectStepId(projectStepId)) + .orderBy(projectCheckList.createdAt.desc()) .fetch(); }