Skip to content

fix: main page project list api #57

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
kwonhee1 merged 1 commit into from
Oct 14, 2025
Merged

fix: main page project list api #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ public class ProjectDslRepository {
public ResponseProjectListDto selectProjectDsl(RequestMainPageProjectListDto dto) {
QProjectTagEntity projectTagEntity = new QProjectTagEntity("projectTagEntity");
SelectProjectListDslRepository.Builder builder = selectProjectRepository
.builder(dto.getUserId())
.leftJoin(projectTagEntity, QProjectEntity.class, (project)->projectTagEntity.project.id.eq(project.id));
.builder(dto.getUserId());

String search = dto.getSearch();
if(search != null && !search.isEmpty())
builder.where(QProjectEntity.class, (project)->whereSearch(project, dto.getSearch()));

List<Long> tagIds = dto.getTagIds();
if(tagIds != null && !tagIds.isEmpty())
builder.where(null, (entity)->projectTagEntity.tag.id.in(dto.getTagIds()));
if(tagIds != null && !tagIds.isEmpty()) {
builder.leftJoin(projectTagEntity, QProjectEntity.class, (project)->projectTagEntity.project.id.eq(project.id));
builder.where(null, (entity) -> projectTagEntity.tag.id.in(dto.getTagIds()));
}

builder.where(QProjectEntity.class, (projectEntity) -> projectEntity.projectStatus.in(ProjectStatus.PROGRESS, ProjectStatus.STOPPED));

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/NextLevel/demo/user/repository/UserProjectDslRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private void where(SelectProjectListDslRepository.Builder builder, Long userId,
builder = builder.leftJoin(
view,
QProjectEntity.class,
(project)->view.user.id.eq(userId).and(project.id.eq(view.project.id))
(project)->view.user.id.eq(userId).and(project.id.eq(view.project.id)) // 수정 필요 -> 최신의 view만 left join 시킴
);
builder.where(null,entity->view.isNotNull());
builder.orderBy(null, entity->view.createAt.max().desc());
Expand Down
Loading