Skip to content
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

Jump to bottom

[πŸ”¨ fix/#140] 검색화면 totalPages, totalCount 데이터 λΆ€μ •ν™•ν•œ 였λ₯˜ μˆ˜μ • #152

Merged
merged 2 commits into from
Sep 27, 2024
Merged

[πŸ”¨ fix/#140] 검색화면 totalPages, totalCount 데이터 λΆ€μ •ν™•ν•œ 였λ₯˜ μˆ˜μ • #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
840ec52
[♻️ refactor/#140] InternshipAnnoucement μ—”ν‹°ν‹° μˆ˜μ •
JungYoonShin Sep 27, 2024
abd09d0
[πŸ”¨fix/#140]: left join으둜 μΈν•œ 데이터 쀑볡 문제 ν•΄κ²°
JungYoonShin Sep 27, 2024
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: 1 addition & 8 deletions src/main/java/org/terning/terningserver/domain/InternshipAnnouncement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.terning.terningserver.domain.common.BaseTimeEntity;
import org.terning.terningserver.domain.enums.Grade;

import java.time.LocalDate;
import java.time.YearMonth;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import static jakarta.persistence.GenerationType.IDENTITY;
Expand Down Expand Up @@ -48,7 +44,7 @@ public class InternshipAnnouncement extends BaseTimeEntity {
@Column(nullable = false, length = 256)
private String url; // 인턴십 곡고 URL

@OneToMany(mappedBy = "internshipAnnouncement")
@OneToMany(mappedBy = "internshipAnnouncement", cascade = CascadeType.ALL)
private List<Scrap> scraps;

@Embedded
Expand All @@ -66,9 +62,6 @@ public class InternshipAnnouncement extends BaseTimeEntity {
@Column(nullable = false)
private boolean isGraduating; // μ‘Έμ—… μ˜ˆμ • μ—¬λΆ€

@OneToMany(mappedBy = "internshipAnnouncement", cascade = CascadeType.ALL)
private List<Scrap> scrapList = new ArrayList<>(); //슀크랩 리슀트

public void updateViewCount(){
this.viewCount += 1;
}
Expand Down
6 changes: 4 additions & 2 deletions ...rg/terning/terningserver/repository/internship_announcement/InternshipRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.querydsl.jpa.impl.JPAQuery;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -65,7 +66,6 @@ public Page<InternshipAnnouncement> searchInternshipAnnouncement(String keyword,

List<InternshipAnnouncement> internshipAnnouncements = jpaQueryFactory
.selectFrom(internshipAnnouncement)
.leftJoin(internshipAnnouncement.scraps)
.where(contentLike(keyword))
.orderBy(sortAnnouncementsByDeadline().asc(), createOrderSpecifier(sortBy))
.offset(pageable.getOffset())
Expand All @@ -77,6 +77,7 @@ public Page<InternshipAnnouncement> searchInternshipAnnouncement(String keyword,
.from(internshipAnnouncement)
.where(contentLike(keyword));


return PageableExecutionUtils.getPage(internshipAnnouncements, pageable, count::fetchOne);
}

Expand All @@ -86,6 +87,7 @@ private BooleanExpression contentLike(String keyword) {

//μ •λ ¬ 쑰건(5가지, μ±„μš© 마감 이λ₯Έ 순, 짧은 근무 κΈ°κ°„ 순, κΈ΄ 근무 κΈ°κ°„ 순,
private OrderSpecifier createOrderSpecifier(String sortBy) {
System.out.println("sortBy = " + sortBy);
return switch (sortBy) {
case "mostViewed" -> internshipAnnouncement.viewCount.desc();
case "shortestDuration" -> getWorkingPeriodAsNumber().asc();
Expand All @@ -100,7 +102,7 @@ private OrderSpecifier createOrderSpecifier(String sortBy) {
public List<InternshipAnnouncement> findFilteredInternships(User user, String sortBy, int startYear, int startMonth){
return jpaQueryFactory
.selectFrom(internshipAnnouncement)
.leftJoin(internshipAnnouncement.scrapList, scrap).on(scrap.user.eq(user))
.leftJoin(internshipAnnouncement.scraps, scrap).on(scrap.user.eq(user))
.where(
getGraduatingFilter(user),
getWorkingPeriodFilter(user),
Expand Down
Loading