Merge pull request #34 from DMU-NextLevel/refactor/project-all

kwonhee1 · web-flow · commit 6fd9c6dece0b · 2025-09-17T21:24:23.000+09:00
select project story, notice, community
diff --git a/src/main/java/NextLevel/demo/project/community/controller/ProjectCommunityController.java b/src/main/java/NextLevel/demo/project/community/controller/ProjectCommunityController.java
@@ -2,6 +2,7 @@
 
 import NextLevel.demo.common.SuccessResponse;
 import NextLevel.demo.project.community.dto.request.SaveCommunityDto;
+import NextLevel.demo.project.community.dto.response.ResponseCommunityListDto;
 import NextLevel.demo.project.community.service.ProjectCommunityAskService;
 import NextLevel.demo.util.jwt.JWTUtil;
 import jakarta.validation.Valid;
@@ -10,10 +11,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 @Controller
 @Slf4j
@@ -22,6 +20,12 @@ public class ProjectCommunityController {
 
     private final ProjectCommunityAskService communityService;
 
+    // list
+    @GetMapping("/public/project/{projectId}/community")
+    public ResponseEntity getProjectCommunity(@PathVariable Long projectId) {
+        return ResponseEntity.ok().body(new SuccessResponse("success", new ResponseCommunityListDto(communityService.selectAll(projectId))));
+    }
+
     // 생성만
     @PostMapping("/api1/project/{projectId}/community")
     public ResponseEntity<?> saveProjectCommunity(@PathVariable("projectId") Long projectId, @RequestBody @Valid SaveCommunityDto dto) {
diff --git a/src/main/java/NextLevel/demo/project/community/dto/response/ResponseCommunityListDto.java b/src/main/java/NextLevel/demo/project/community/dto/response/ResponseCommunityListDto.java
@@ -12,7 +12,7 @@ public class ResponseCommunityListDto {
     private int communityCount;
     private List<ResponseProjectCommunityDto> communities;
 
-    public ResponseCommunityListDto (Collection<ProjectCommunityAskEntity> communities) {
+    public ResponseCommunityListDto (List<ProjectCommunityAskEntity> communities) {
         this.communities = communities.stream().map(e->ResponseProjectCommunityDto.of(e)).toList();
         this.communityCount = communities.size();
     }
diff --git a/src/main/java/NextLevel/demo/project/community/repository/ProjectCommunityAskRepository.java b/src/main/java/NextLevel/demo/project/community/repository/ProjectCommunityAskRepository.java
@@ -9,7 +9,7 @@
 
 public interface ProjectCommunityAskRepository extends JpaRepository<ProjectCommunityAskEntity, Long> {
 
-    @Query("select ask from ProjectCommunityAskEntity ask left join fetch ask.answer where ask.project.id = :projectId")
-    List<ProjectCommunityAskEntity> findAllByProjectId(@Param("projectId") Long projectId);
+    @Query("select ask from ProjectCommunityAskEntity ask left join fetch ask.answer where ask.project.id = :projectId order by ask.createdAt desc")
+    List<ProjectCommunityAskEntity> findAllByProjectIdOrderByCreatedAt(@Param("projectId") Long projectId);
 
 }
diff --git a/src/main/java/NextLevel/demo/project/community/service/ProjectCommunityAskService.java b/src/main/java/NextLevel/demo/project/community/service/ProjectCommunityAskService.java
@@ -50,10 +50,9 @@ public void update(SaveCommunityDto dto) {
     }
 
     @Transactional
-    public ResponseCommunityListDto selectAll(Long projectId) {
+    public List<ProjectCommunityAskEntity> selectAll(Long projectId) {
         ProjectEntity project = projectValidateService.getProjectEntity(projectId);
-        List<ProjectCommunityAskEntity> asks = projectCommunityAskRepository.findAllByProjectId(project.getId());
-        return new ResponseCommunityListDto(asks);
+        return projectCommunityAskRepository.findAllByProjectIdOrderByCreatedAt(project.getId());
     }
 
     @Transactional
diff --git a/src/main/java/NextLevel/demo/project/notice/controller/ProjectNoticeController.java b/src/main/java/NextLevel/demo/project/notice/controller/ProjectNoticeController.java
@@ -2,6 +2,8 @@
 
 import NextLevel.demo.common.SuccessResponse;
 import NextLevel.demo.project.notice.dto.request.SaveProjectNoticeRequestDto;
+import NextLevel.demo.project.notice.dto.response.ResponseNoticeListDto;
+import NextLevel.demo.project.notice.dto.response.ResponseProjectNoticeDto;
 import NextLevel.demo.project.notice.service.ProjectNoticeService;
 import NextLevel.demo.util.jwt.JWTUtil;
 import jakarta.validation.Valid;
@@ -10,11 +12,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.*;
 
 @Controller
 @Slf4j
@@ -23,6 +21,12 @@ public class ProjectNoticeController {
 
     private final ProjectNoticeService projectNoticeService;
 
+    // select notice by project
+    @GetMapping("/public/project/{projectId}/notice")
+    public ResponseEntity<?> getProjectNotice(@PathVariable Long projectId) {
+        return ResponseEntity.ok().body(new SuccessResponse("success", new ResponseNoticeListDto(projectNoticeService.getAllNotice(projectId))));
+    }
+
     @PostMapping("/api1/project/{projectId}/notice")
     public ResponseEntity<?> addProjectNotice(@PathVariable("projectId") long projectId, @ModelAttribute @Valid SaveProjectNoticeRequestDto dto) {
         dto.setProjectId(projectId);
diff --git a/src/main/java/NextLevel/demo/project/notice/dto/response/ResponseNoticeListDto.java b/src/main/java/NextLevel/demo/project/notice/dto/response/ResponseNoticeListDto.java
@@ -11,7 +11,7 @@ public class ResponseNoticeListDto {
     private int noticeCount;
     private List<ResponseProjectNoticeDto> notices;
 
-    public ResponseNoticeListDto(Set<ProjectNoticeEntity> entities) {
+    public ResponseNoticeListDto(List<ProjectNoticeEntity> entities) {
         this.notices = entities.stream().map(e->ResponseProjectNoticeDto.of(e)).toList();
         this.noticeCount = notices.size();
     }
diff --git a/src/main/java/NextLevel/demo/project/notice/repository/ProjectNoticeRepository.java b/src/main/java/NextLevel/demo/project/notice/repository/ProjectNoticeRepository.java
@@ -1,6 +1,8 @@
 package NextLevel.demo.project.notice.repository;
 
 import NextLevel.demo.project.notice.entity.ProjectNoticeEntity;
+
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -10,4 +12,8 @@ public interface ProjectNoticeRepository extends JpaRepository<ProjectNoticeEnti
 
     @Query("select n from ProjectNoticeEntity n left join fetch n.project where n.id = :noticeId")
     Optional<ProjectNoticeEntity> findByIdWithProject(@Param("noticeId") Long noticeId);
+
+    @Query("select pn from ProjectNoticeEntity pn where pn.project.id = :projectId order by pn.createdAt desc")
+    List<ProjectNoticeEntity> findAllByProjectOrderByCreatedAt(@Param("projectId") Long projectId);
+
 }
diff --git a/src/main/java/NextLevel/demo/project/notice/service/ProjectNoticeService.java b/src/main/java/NextLevel/demo/project/notice/service/ProjectNoticeService.java
@@ -13,6 +13,8 @@
 import jakarta.persistence.EntityManager;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.List;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -27,6 +29,11 @@ public class ProjectNoticeService {
     private final ImgServiceImpl imgService;
     private final ProjectValidateService projectValidateService;
 
+    public List<ProjectNoticeEntity> getAllNotice(Long projectId){
+        ProjectEntity project = projectValidateService.getProjectEntity(projectId);
+        return projectNoticeRepository.findAllByProjectOrderByCreatedAt(project.getId());
+    }
+
     @Transactional
     @ImgTransaction
     public void saveProjectNotice(SaveProjectNoticeRequestDto dto, ArrayList<Path> imgPaths) {
diff --git a/src/main/java/NextLevel/demo/project/project/controller/ProjectController.java b/src/main/java/NextLevel/demo/project/project/controller/ProjectController.java
@@ -3,7 +3,6 @@
 import NextLevel.demo.common.SuccessResponse;
 import NextLevel.demo.project.project.dto.request.CreateProjectDto;
 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;
@@ -99,11 +98,4 @@ public ResponseEntity<?> getProjectDetailById(@PathVariable("projectId") @NotNul
         return ResponseEntity.status(HttpStatus.OK).body(new SuccessResponse("success" ,dto));
     }
 
-    @GetMapping("/public/project/{projectId}/all")
-    public ResponseEntity<?> getProjectNotice(@PathVariable("projectId") Long projectId) {
-        ResponseProjectAllDto dto = projectService.getProjectCommunityAndNoticeAndStoryDto(projectId);
-
-        return ResponseEntity.status(HttpStatus.OK).body(new SuccessResponse("success", dto));
-    }
-
 }
diff --git a/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectAllDto.java b/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectAllDto.java
diff --git a/src/main/java/NextLevel/demo/project/project/entity/ProjectEntity.java b/src/main/java/NextLevel/demo/project/project/entity/ProjectEntity.java
@@ -66,10 +66,10 @@ public class ProjectEntity extends BasedEntity {
     private List<ProjectTagEntity> tags;
 
     @OneToMany(mappedBy = "project", fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    private Set<ProjectStoryEntity> stories;
+    private List<ProjectStoryEntity> stories;
 
     @OneToMany(mappedBy = "project", fetch = FetchType.LAZY)
-    private Set<OptionEntity> options;
+    private List<OptionEntity> options;
 
     @OneToMany(mappedBy = "project", fetch = FetchType.LAZY)
     private Set<FreeFundingEntity> freeFundings;
@@ -78,15 +78,15 @@ public class ProjectEntity extends BasedEntity {
     private Set<LikeEntity> likes;
 
     @OneToMany(mappedBy = "project", fetch = FetchType.LAZY)
-    private Set<ProjectCommunityAskEntity> communities;
+    private List<ProjectCommunityAskEntity> communities;
 
     @OneToMany(mappedBy = "project", fetch = FetchType.LAZY)
-    private Set<ProjectNoticeEntity> notices;
+    private List<ProjectNoticeEntity> notices;
 
     @OneToMany(mappedBy = "project", fetch = FetchType.LAZY)
-    private Set<ProjectViewEntity> views;
+    private List<ProjectViewEntity> views;
 
-    public void setStories(Set<ProjectStoryEntity> imgs) {
+    public void setStories(List<ProjectStoryEntity> imgs) {
         this.stories = imgs;
     }
     public void setTags(List<ProjectTagEntity> tags) {
@@ -96,7 +96,7 @@ public void setTags(List<ProjectTagEntity> tags) {
     @Builder
     public ProjectEntity(Long id, UserEntity user, String title, String content,
         Long goal, ImgEntity titleImg, String expired, List<ProjectTagEntity> tags,
-        Set<ProjectStoryEntity> stories) throws ParseException {
+        List<ProjectStoryEntity> stories) throws ParseException {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         this.id = id;
         this.user = user;
diff --git a/src/main/java/NextLevel/demo/project/project/repository/ProjectRepository.java b/src/main/java/NextLevel/demo/project/project/repository/ProjectRepository.java
@@ -31,11 +31,4 @@ public interface ProjectRepository extends JpaRepository<ProjectEntity, Long> {
         + "where p.id = :id")
     Optional<ProjectEntity> findProjectDetailById(@Param("id") Long id);
 
-    @Query("select p from ProjectEntity p "
-        + "left join fetch p.notices as n "
-        + "left join fetch p.communities as c "
-        + "left join fetch p.stories as story "
-        + "where p.id = :id")
-    Optional<ProjectEntity> findProjectWithNoticesAndCommunityAndStory(@Param("id") Long id);
-
 }
diff --git a/src/main/java/NextLevel/demo/project/project/service/ProjectService.java b/src/main/java/NextLevel/demo/project/project/service/ProjectService.java
@@ -6,18 +6,14 @@
 import NextLevel.demo.img.entity.ImgEntity;
 import NextLevel.demo.img.service.ImgServiceImpl;
 import NextLevel.demo.img.service.ImgTransaction;
-import NextLevel.demo.project.community.dto.response.ResponseCommunityListDto;
-import NextLevel.demo.project.notice.dto.response.ResponseNoticeListDto;
 import NextLevel.demo.project.project.dto.request.CreateProjectDto;
 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.ResponseProjectListDetailDto;
 import NextLevel.demo.project.project.dto.response.ResponseProjectListDto;
 import NextLevel.demo.project.project.entity.ProjectEntity;
 import NextLevel.demo.project.project.repository.ProjectDslRepository;
 import NextLevel.demo.project.project.repository.ProjectRepository;
-import NextLevel.demo.project.story.dto.ResponseProjectStoryListDto;
+import NextLevel.demo.project.story.entity.ProjectStoryEntity;
 import NextLevel.demo.project.story.service.ProjectStoryService;
 import NextLevel.demo.project.tag.service.TagService;
 import NextLevel.demo.project.view.ProjectViewService;
@@ -48,6 +44,7 @@ public class ProjectService {
 
     private final FundingValidateService fundingValidateService;
     private final ProjectDslRepository projectDslRepository;
+    private final ProjectValidateService projectValidateService;
 
     // 추가
     @ImgTransaction
@@ -134,20 +131,4 @@ public ResponseProjectDetailDto getProjectDetailById(Long id, Long userId) {
         return ResponseProjectDetailDto.of(project, fundingPrice, fundingCount, userId);
     }
 
-    // notice and community and story
-    // 추가 수정 필요!!! 정렬 어디다 팔아 먹음? 다시 만들것!
-    @Transactional
-    public ResponseProjectAllDto getProjectCommunityAndNoticeAndStoryDto(Long projectId) {
-        ProjectEntity project = projectRepository.findProjectWithNoticesAndCommunityAndStory(projectId).orElseThrow(
-                ()-> new CustomException(ErrorCode.NOT_FOUND,"project")
-        );
-
-        return ResponseProjectAllDto
-                .builder()
-                .community(new ResponseCommunityListDto(project.getCommunities()))
-                .notice(new ResponseNoticeListDto(project.getNotices()))
-                .story(new ResponseProjectStoryListDto(project.getStories()))
-                .build();
-    }
-
 }
diff --git a/src/main/java/NextLevel/demo/project/story/controller/ProjectStoryController.java b/src/main/java/NextLevel/demo/project/story/controller/ProjectStoryController.java
@@ -1,6 +1,7 @@
 package NextLevel.demo.project.story.controller;
 
 import NextLevel.demo.common.SuccessResponse;
+import NextLevel.demo.project.story.dto.ResponseProjectStoryListDto;
 import NextLevel.demo.project.story.service.ProjectStoryService;
 import NextLevel.demo.util.jwt.JWTUtil;
 import java.util.List;
@@ -9,6 +10,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,4 +29,9 @@ public ResponseEntity<?> updateProjectStory(@PathVariable("projectId") long proj
         return ResponseEntity.status(HttpStatus.OK).body(new SuccessResponse("success",null));
     }
 
+    @GetMapping("/public/project/{projectId}/story")
+    public ResponseEntity<?> getProjectStory(@PathVariable("projectId") long projectId){
+        return ResponseEntity.ok().body(new SuccessResponse("success", new ResponseProjectStoryListDto(projectStoryService.getProjectStory(projectId))));
+    }
+
 }
diff --git a/src/main/java/NextLevel/demo/project/story/dto/ResponseProjectStoryListDto.java b/src/main/java/NextLevel/demo/project/story/dto/ResponseProjectStoryListDto.java
@@ -3,7 +3,6 @@
 import NextLevel.demo.img.ImgDto;
 import NextLevel.demo.project.story.entity.ProjectStoryEntity;
 import java.util.List;
-import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +11,7 @@
 public class ResponseProjectStoryListDto {
     private List<ImgDto> imgs;
 
-    public ResponseProjectStoryListDto (Set<ProjectStoryEntity> entities) {
+    public ResponseProjectStoryListDto (List<ProjectStoryEntity> entities) {
         this.imgs = entities.stream().map(e-> new ImgDto(e.getImg())).toList();
     }
 }
diff --git a/src/main/java/NextLevel/demo/project/story/repository/ProjectStoryRepository.java b/src/main/java/NextLevel/demo/project/story/repository/ProjectStoryRepository.java
@@ -2,7 +2,7 @@
 
 import NextLevel.demo.project.story.entity.ProjectStoryEntity;
 import java.util.List;
-import java.util.Set;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -13,4 +13,7 @@ public interface ProjectStoryRepository extends JpaRepository<ProjectStoryEntity
     @Query("delete from ProjectStoryEntity s where s.project.id = :id")
     void deleteAllByProjectId(@Param("id") Long projectId);
 
+    @Query("select ps from ProjectStoryEntity ps where ps.project.id = :projectId order by ps.img.id asc")
+    List<ProjectStoryEntity> findAllByProjectOrderByCreatedAt(@Param("projectId") Long projectId);
+
 }
diff --git a/src/main/java/NextLevel/demo/project/story/service/ProjectStoryService.java b/src/main/java/NextLevel/demo/project/story/service/ProjectStoryService.java

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ResponseCommunityListDto {`
`12`	`12`	`private int communityCount;`
`13`	`13`	`private List<ResponseProjectCommunityDto> communities;`
`14`	`14`
`15`		`- public ResponseCommunityListDto (Collection<ProjectCommunityAskEntity> communities) {`
	`15`	`+ public ResponseCommunityListDto (List<ProjectCommunityAskEntity> communities) {`
`16`	`16`	`this.communities = communities.stream().map(e->ResponseProjectCommunityDto.of(e)).toList();`
`17`	`17`	`this.communityCount = communities.size();`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`public interface ProjectCommunityAskRepository extends JpaRepository<ProjectCommunityAskEntity, Long> {`
`11`	`11`
`12`		`- @Query("select ask from ProjectCommunityAskEntity ask left join fetch ask.answer where ask.project.id = :projectId")`
`13`		`- List<ProjectCommunityAskEntity> findAllByProjectId(@Param("projectId") Long projectId);`
	`12`	`+ @Query("select ask from ProjectCommunityAskEntity ask left join fetch ask.answer where ask.project.id = :projectId order by ask.createdAt desc")`
	`13`	`+ List<ProjectCommunityAskEntity> findAllByProjectIdOrderByCreatedAt(@Param("projectId") Long projectId);`
`14`	`14`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,9 @@ public void update(SaveCommunityDto dto) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Transactional`
`53`		`- public ResponseCommunityListDto selectAll(Long projectId) {`
	`53`	`+ public List<ProjectCommunityAskEntity> selectAll(Long projectId) {`
`54`	`54`	`ProjectEntity project = projectValidateService.getProjectEntity(projectId);`
`55`		`- List<ProjectCommunityAskEntity> asks = projectCommunityAskRepository.findAllByProjectId(project.getId());`
`56`		`- return new ResponseCommunityListDto(asks);`
	`55`	`+ return projectCommunityAskRepository.findAllByProjectIdOrderByCreatedAt(project.getId());`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`@Transactional`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class ResponseNoticeListDto {`
`11`	`11`	`private int noticeCount;`
`12`	`12`	`private List<ResponseProjectNoticeDto> notices;`
`13`	`13`
`14`		`- public ResponseNoticeListDto(Set<ProjectNoticeEntity> entities) {`
	`14`	`+ public ResponseNoticeListDto(List<ProjectNoticeEntity> entities) {`
`15`	`15`	`this.notices = entities.stream().map(e->ResponseProjectNoticeDto.of(e)).toList();`
`16`	`16`	`this.noticeCount = notices.size();`
`17`	`17`	`}`