diff --git a/src/main/java/NextLevel/demo/project/project/dto/request/RequestMainPageProjectListDto.java b/src/main/java/NextLevel/demo/project/project/dto/request/RequestMainPageProjectListDto.java index d16eb37..2b894b9 100644 --- a/src/main/java/NextLevel/demo/project/project/dto/request/RequestMainPageProjectListDto.java +++ b/src/main/java/NextLevel/demo/project/project/dto/request/RequestMainPageProjectListDto.java @@ -31,10 +31,31 @@ public List getTagIds() { return tag; } - public long getLimit() { + public Long getLimit() { return pageCount; } public long getOffset() { + if(page == null) + page = 0; return pageCount * page; } + + public void setTag(List tag) { + if(tag ==null || tag.isEmpty()) + return; + this.tag = tag; + } + + public void setPage(Integer page) { + if(page == null) + return; + this.page = page; + } + + public void setPageCount(Long pageCount) { + if(pageCount == null) + return; + this.pageCount = pageCount; + } + } diff --git a/src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java b/src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java index 6406113..519102b 100644 --- a/src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java +++ b/src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java @@ -47,7 +47,8 @@ public ResponseProjectListDto selectProjectDsl(RequestMainPageProjectListDto dto } ); - orderByType(builder, ProjectOrderType.getType(dto.getOrder()), dto.getDesc()); + if(dto.getOrder() != null && !dto.getOrder().isEmpty() && dto.getDesc() != null) + orderByType(builder, ProjectOrderType.getType(dto.getOrder()), dto.getDesc()); ResponseProjectListDto projectList = builder .limit(dto.getLimit(), dto.getPage()) diff --git a/src/main/java/NextLevel/demo/project/project/repository/ProjectOrderType.java b/src/main/java/NextLevel/demo/project/project/repository/ProjectOrderType.java index 095d0fc..8373fa8 100644 --- a/src/main/java/NextLevel/demo/project/project/repository/ProjectOrderType.java +++ b/src/main/java/NextLevel/demo/project/project/repository/ProjectOrderType.java @@ -23,7 +23,7 @@ public enum ProjectOrderType { // } public static ProjectOrderType getType(String typeName) { - ProjectOrderType type = Arrays.stream(ProjectOrderType.values()).filter(t -> t.name().equals(typeName)).findFirst().orElse(ProjectOrderType.RECOMMEND); + ProjectOrderType type = Arrays.stream(ProjectOrderType.values()).filter(t -> t.name().equals(typeName)).findFirst().orElse(ProjectOrderType.CREATED); return type; } diff --git a/src/main/java/NextLevel/demo/summery/dto/TotalSummeryDto.java b/src/main/java/NextLevel/demo/summery/dto/TotalSummeryDto.java index e407bac..191aa39 100644 --- a/src/main/java/NextLevel/demo/summery/dto/TotalSummeryDto.java +++ b/src/main/java/NextLevel/demo/summery/dto/TotalSummeryDto.java @@ -24,12 +24,12 @@ public TotalSummeryDto( Long totalSupporterCount, Long totalCreatorCount ) { - this.totalFundingPrice = totalFundingPrice; - this.totalFundingCount = totalFundingCount; - this.totalSuccessProjectCount = totalSuccessProjectCount; - this.totalProgressProjectCount = totalProgressProjectCount; - this.totalSupporterCount = totalSupporterCount; - this.totalCreatorCount = totalCreatorCount; + this.totalFundingPrice = totalFundingPrice != null ? totalFundingPrice : 0L; + this.totalFundingCount = totalFundingCount != null ? totalFundingCount : 0L; + this.totalSuccessProjectCount = totalSuccessProjectCount != null ? totalSuccessProjectCount : 0L; + this.totalProgressProjectCount = totalProgressProjectCount != null ? totalProgressProjectCount : 0L; + this.totalSupporterCount = totalSupporterCount != null ? totalSupporterCount : 0L; + this.totalCreatorCount = totalCreatorCount != null ? totalCreatorCount : 0L; } } diff --git a/src/main/java/NextLevel/demo/summery/repo/SummeryRepository.java b/src/main/java/NextLevel/demo/summery/repo/SummeryRepository.java index f731bda..9808372 100644 --- a/src/main/java/NextLevel/demo/summery/repo/SummeryRepository.java +++ b/src/main/java/NextLevel/demo/summery/repo/SummeryRepository.java @@ -12,29 +12,29 @@ public interface SummeryRepository extends Repository { @Query("select sum(f.price) from FreeFundingEntity f") - long getTotalFreeFundingPrice(); + Long getTotalFreeFundingPrice(); @Query("select count(f) from FreeFundingEntity f") - long getFreeFundingCount(); + Long getFreeFundingCount(); @Query("select sum(of.count * of.option.price - coalesce(of.coupon.price, 0)) from OptionFundingEntity of") - long getTotalOptionFundingPrice(); + Long getTotalOptionFundingPrice(); @Query("select count(of) from OptionFundingEntity of") - long getTotalOptionFundingCount(); + Long getTotalOptionFundingCount(); @Query("select count(p) from ProjectEntity p where p.projectStatus in :status") - long getProjectCount(@Param("status") List status); + Long getProjectCount(@Param("status") List status); @Query("select count(distinct u) from UserEntity u " + "left join ProjectEntity p on p.user.id = u.id " + "where p.id is not null") - long getCreatorCount(); + Long getCreatorCount(); @Query("select count(distinct u) from UserEntity u " + "left join FreeFundingEntity ff on ff.user.id = u.id " + "left join OptionFundingEntity of on of.user.id = u.id " + "where ff.id is not null or of.id is not null") - long getSupporterCount(); + Long getSupporterCount(); }