Merge pull request #21 from DMU-NextLevel/feat/recent-project

Feat/recent project

Author: kwonhee1

src/main/java/NextLevel/demo/funding/service/FundingValidateService.java

@@ -15,8 +15,10 @@ public class FundingValidateService {
     // validate not exist funding (Project project) // db 조회인데 구지 option validate service에 둘 이유가 없어 보임
 
     public Long getTotalFundingPrice(Long projectId) {
-        return optionFundingRepository.getTotalPriceByProject(projectId) +
-                freeFundingRepository.getTotalPriceByProject(projectId);
+        Long optionFundingPrice = optionFundingRepository.getTotalPriceByProject(projectId);
+        Long freeFundingPrice = freeFundingRepository.getTotalPriceByProject(projectId);
+        return (optionFundingPrice != null ? optionFundingPrice : 0)
+                + (freeFundingPrice != null ? freeFundingPrice : 0);
     }
 
 }

src/main/java/NextLevel/demo/project/project/controller/ProjectController.java

@@ -1,16 +1,17 @@
 package NextLevel.demo.project.project.controller;
 
 import NextLevel.demo.common.SuccessResponse;
-import NextLevel.demo.funding.dto.response.FundingResponseDto;
 import NextLevel.demo.project.project.dto.request.CreateProjectDto;
-import NextLevel.demo.project.project.dto.request.SelectProjectListRequestDto;
+import NextLevel.demo.project.project.dto.request.RequestMainPageProjectListDto;
 import NextLevel.demo.project.project.dto.response.ResponseProjectAllDto;
 import NextLevel.demo.project.project.dto.response.ResponseProjectDetailDto;
 import NextLevel.demo.project.project.dto.response.ResponseProjectListDto;
 import NextLevel.demo.project.project.service.ProjectService;
 import NextLevel.demo.util.jwt.JWTUtil;
 import jakarta.validation.Valid;
 import java.util.List;
+
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.http.HttpStatus;
@@ -64,7 +65,7 @@ public ResponseEntity<?> getAllProjects(
     {
         Long userId = JWTUtil.getUserIdFromSecurityContextCanNULL();
 
-        SelectProjectListRequestDto dto = SelectProjectListRequestDto.builder()
+        RequestMainPageProjectListDto dto = RequestMainPageProjectListDto.builder()
             .tag(tagId)
             .page(page)
             .order(order)
@@ -79,7 +80,7 @@ public ResponseEntity<?> getAllProjects(
 
     @PostMapping("/public/project/all")
     public ResponseEntity<?> getAllProjects(
-        @RequestBody SelectProjectListRequestDto dto)
+        @RequestBody RequestMainPageProjectListDto dto)
     {
         Long userId = JWTUtil.getUserIdFromSecurityContextCanNULL();
         dto.setUserId(userId);
@@ -90,7 +91,7 @@ public ResponseEntity<?> getAllProjects(
 
     // 상세 조회
     @GetMapping("/public/project/{projectId}")
-    public ResponseEntity<?> getProjectDetailById(@PathVariable("projectId") Long projectId) {
+    public ResponseEntity<?> getProjectDetailById(@PathVariable("projectId") @NotNull Long projectId) {
         Long userId = JWTUtil.getUserIdFromSecurityContextCanNULL();
 
         ResponseProjectDetailDto dto = projectService.getProjectDetailById(projectId, userId);

src/main/java/NextLevel/demo/project/project/dto/request/RequestMainPageProjectListDto.java

@@ -0,0 +1,36 @@
+package NextLevel.demo.project.project.dto.request;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class RequestMainPageProjectListDto {
+    private Long userId;
+    private List<Long> tag;
+    private String order;
+    private String search;
+    private Boolean desc;
+    private Integer page = 0;
+    private Long pageCount = 8L; // default 8
+
+    public List<Long> getTagIds() {
+        return tag;
+    }
+
+    public long getLimit() {
+        return pageCount;
+    }
+    public long getOffset() {
+        return pageCount * page;
+    }
+}

src/main/java/NextLevel/demo/project/project/dto/request/SelectProjectListRequestDto.java

@@ -8,6 +8,9 @@
 
 import NextLevel.demo.img.ImgDto;
 import NextLevel.demo.img.entity.ImgEntity;
+import NextLevel.demo.project.tag.entity.ProjectTagEntity;
+import NextLevel.demo.project.tag.entity.TagEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -39,6 +42,9 @@ public class ResponseProjectListDetailDto {
     private LocalDateTime expired;
     private Boolean isExpired;
 
+    @JsonIgnore
+    private LocalDateTime projectViewCreateAt;
+
     public ResponseProjectListDetailDto(
         Long id,
         String title,
@@ -51,7 +57,7 @@ public ResponseProjectListDetailDto(
         long userCount,
         long isLiked,
         long viewCount,
-        long totalCount // 전체 조건에 만족하는 project 갯수
+        LocalDateTime projectViewCreateAt // select distinct 용 column
     ) {
         this.id = id;
         this.title = title;
@@ -64,7 +70,8 @@ public ResponseProjectListDetailDto(
         this.isExpired = expired.isBefore(LocalDateTime.now());
         this.expired = expired;
         this.viewCount = viewCount;
-        this.totalCount = totalCount;
+        // this.totalCount = totalCount;
+        this.projectViewCreateAt = projectViewCreateAt;
     }
 
 }

src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectListDetailDto.java

@@ -12,15 +12,10 @@ public class ResponseProjectListDto {
     private long pageCount; // page 당 반환 project 갯수
     private long page; // 요청시 들어옴
 
-    public ResponseProjectListDto(List<ResponseProjectListDetailDto> projects) {
+    public ResponseProjectListDto(List<ResponseProjectListDetailDto> projects, long totalCount, long pageCount, long page) {
         this.projects = projects;
-    }
-
-    public void setPageCount(long pageCount, long page) {
         this.pageCount = pageCount;
         this.page = page;
-        if(projects != null && projects.size() > 0) {
-            this.totalCount = projects.get(0).getTotalCount();
-        }
+        this.totalCount = totalCount;
     }
 }

src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectListDto.java

@@ -8,6 +8,7 @@
 import NextLevel.demo.project.notice.entity.ProjectNoticeEntity;
 import NextLevel.demo.project.story.entity.ProjectStoryEntity;
 import NextLevel.demo.project.tag.entity.ProjectTagEntity;
+import NextLevel.demo.project.view.ProjectViewEntity;
 import NextLevel.demo.user.entity.LikeEntity;
 import NextLevel.demo.user.entity.UserEntity;
 import jakarta.persistence.CascadeType;
@@ -22,11 +23,9 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import lombok.AccessLevel;
@@ -105,7 +104,7 @@ public ProjectEntity(Long id, UserEntity user, String title, String content,
         this.content = content;
         this.goal = goal;
         this.titleImg = titleImg;
-        this.expired = LocalDate.parse(expired, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atTime(32, 59); //LocalDateTime.of(new SimpleDateFormat("yyyy-MM-dd").parse(expired));
+        this.expired = LocalDate.parse(expired, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atTime(23, 59); //LocalDateTime.of(new SimpleDateFormat("yyyy-MM-dd").parse(expired));
         this.tags = tags;
         this.stories = stories;
     }