Skip to content

Commit

Permalink
Merge pull request #83 from IDEA-CAMPUS/develop
Browse files Browse the repository at this point in the history
release 2.1.7
  • Loading branch information
jisujeong0 authored Jan 10, 2024
2 parents a4b5814 + 070df74 commit b40c8f4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ public Page<ProjectRes> getAllProjects(int page, int size, String sortBy) {
.team(projectPost.getTeam())
.title(projectPost.getTitle())
.simpleDescription(projectPost.getSimpleDescription())
.hits(projectPost.getHits())
.createdAt(projectPost.getCreatedAt())
.thumbnail(thumbnail)
.build();
})
Expand Down Expand Up @@ -129,6 +131,8 @@ public Page<ProjectRes> getProjectsByKeyword(int page, int size, String sortBy,
.team(projectPost.getTeam())
.title(projectPost.getTitle())
.simpleDescription(projectPost.getSimpleDescription())
.hits(projectPost.getHits())
.createdAt(projectPost.getCreatedAt())
.thumbnail(thumbnail)
.build();
})
Expand Down Expand Up @@ -160,6 +164,8 @@ public ProjectDetailRes getProjectDetail(Long projectId) {
.booleanWeb(projectPost.isBooleanWeb())
.booleanApp(projectPost.isBooleanApp())
.booleanAi(projectPost.isBooleanAi())
.hits(projectPost.getHits())
.createdAt(projectPost.getCreatedAt())
.thumbnail(thumbnailPath)
.otherImages(otherImagePaths)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import jakarta.validation.constraints.NotBlank;
import lombok.*;

import java.time.LocalDateTime;
import java.util.List;

@Builder
Expand All @@ -30,4 +31,5 @@ public class ProjectDetailRes {
private boolean booleanAi;
private String thumbnail;
private List<String> otherImages;
private LocalDateTime createdAt;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import lombok.*;

import java.time.LocalDateTime;

@Builder
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
Expand All @@ -15,4 +17,6 @@ public class ProjectRes {
private String title;
private String simpleDescription;
private String thumbnail;
private Long hits;
private LocalDateTime createdAt;
}

0 comments on commit b40c8f4

Please sign in to comment.