#82 fix : type 변경

TeamSynergyy · Apr 29, 2024 · 95769f0 · 95769f0
1 parent 71afbc6
commit 95769f0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/src/main/java/com/seoultech/synergybe/domain/comment/dto/response/GetCommentResponse.java b/src/main/java/com/seoultech/synergybe/domain/comment/dto/response/GetCommentResponse.java
@@ -6,9 +6,9 @@
 
 @Builder
 public record GetCommentResponse(
-    Long commentId,
+    String commentId,
     String userId,
-    Long postId,
+    String postId,
     String comment,
     LocalDateTime updateAt
 ) {

diff --git a/src/main/java/com/seoultech/synergybe/domain/post/dto/response/GetPostResponse.java b/src/main/java/com/seoultech/synergybe/domain/post/dto/response/GetPostResponse.java
@@ -4,21 +4,22 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.seoultech.synergybe.domain.post.Post;
+import com.seoultech.synergybe.domain.comment.dto.response.GetCommentResponse;
 import lombok.Builder;
-import org.springframework.data.domain.Page;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Builder
 public record GetPostResponse(
-        Long postId,
+        String postId,
         String title,
         String content,
         String userId,
         String authorName,
+
+        List<GetCommentResponse> commentList,
+
         @JsonSerialize(using = LocalDateTimeSerializer.class)
         @JsonDeserialize(using = LocalDateTimeDeserializer.class)
         LocalDateTime createAt,

diff --git a/src/main/java/com/seoultech/synergybe/domain/project/dto/response/GetProjectResponse.java b/src/main/java/com/seoultech/synergybe/domain/project/dto/response/GetProjectResponse.java
@@ -11,7 +11,6 @@
 @Builder
 public record GetProjectResponse(
         String projectId,
-        Long projectSequence,
         String name,
         String content,
         String field,

diff --git a/src/main/java/com/seoultech/synergybe/domain/project/service/ProjectService.java b/src/main/java/com/seoultech/synergybe/domain/project/service/ProjectService.java
@@ -10,6 +10,7 @@
 import com.seoultech.synergybe.domain.project.Project;
 import com.seoultech.synergybe.domain.project.dto.request.CreateProjectRequest;
 import com.seoultech.synergybe.domain.project.dto.request.UpdateProjectRequest;
+import com.seoultech.synergybe.domain.project.dto.response.GetListProjectResponse;
 import com.seoultech.synergybe.domain.project.dto.response.GetProjectResponse;
 import com.seoultech.synergybe.domain.project.exception.ProjectBadRequestException;
 import com.seoultech.synergybe.domain.project.exception.ProjectNotFoundException;
@@ -50,7 +51,7 @@ public class ProjectService {
     private final UserService userService;
 
     @Transactional
-    public String createProject(String userId, CreateProjectRequest request) {
+    public GetProjectResponse createProject(String userId, CreateProjectRequest request) {
         User user = userService.getUser(userId);
         String projectId = idGenerator.generateId(IdPrefix.PROJECT);
         Point point = new Point(request.longitude(), request.latitude());
@@ -66,7 +67,9 @@ public String createProject(String userId, CreateProjectRequest request) {
                 .build();
         Project savedProject = projectRepository.save(project);
         projectUserService.createProjectUser(savedProject, user);
-        return savedProject.getId();
+        return GetProjectResponse.builder()
+                .projectId(savedProject.getId())
+                .build();
     }
 
     private void validateProjectUser(String userId, String projectId) {
@@ -117,7 +120,6 @@ public GetProjectResponse getProject(String projectId) {
 
         return GetProjectResponse.builder()
                 .projectId(projectId)
-                .projectSequence(project.getSeq())
                 .name(project.getName().getName())
                 .content(project.getContent().getContent())
                 .field(project.getField().name())
@@ -130,10 +132,21 @@ public GetProjectResponse getProject(String projectId) {
                 .build();
     }
 
-    public ListResponse<GetProjectResponse> getProjectList(Long end) {
-        List<Project> projects = projectRepository.findAllByEndSequence(end);
+    public GetListProjectResponse getProjectList(Long offset) {
+        List<Project> projects = projectRepository.findAllByCreateAtAndLimit(offset);
+        int totalCount = projectRepository.countTotalProjectSize();
+
+        boolean hasNext;
+        int pageSize = 10;
+
+        if (totalCount > pageSize + offset) {
+            hasNext = true;
+        } else {
+            hasNext = false;
+        }
+
+        return ProjectMapperEntityToDto.projectListToResponse(projects, hasNext);
 
-        return (ListResponse<GetProjectResponse>) new ListResponse(projects);
     }
 
     public Page<Project> searchAllProjects(String keyword, Pageable pageable) {