Skip to content

Commit 2a5a889

Browse files
authored
Merge pull request #31 from Team-Sh4re/development
feat: 댓글 엔드포인트 리팩터링 및 마이 페이지 최신순 정렬
2 parents 71c3389 + 5cb247f commit 2a5a889

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

src/main/java/share/sh4re/domain/Code.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import jakarta.persistence.JoinColumn;
1212
import jakarta.persistence.ManyToOne;
1313
import jakarta.persistence.OneToMany;
14+
import jakarta.persistence.OrderBy;
1415
import jakarta.validation.constraints.NotNull;
1516
import java.util.ArrayList;
1617
import java.util.List;
@@ -68,6 +69,7 @@ public enum Fields {
6869

6970
@OneToMany(fetch = FetchType.LAZY, mappedBy = "code", cascade = CascadeType.ALL)
7071
@JsonIgnoreProperties({"code"})
72+
@OrderBy("createdAt DESC")
7173
private List<Comment> commentList = new ArrayList<>();
7274

7375
public void update(String title, String description, String code, Fields field, Long classNo, User user){

src/main/java/share/sh4re/domain/User.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import jakarta.persistence.Enumerated;
99
import jakarta.persistence.FetchType;
1010
import jakarta.persistence.OneToMany;
11+
import jakarta.persistence.OrderBy;
1112
import jakarta.validation.constraints.NotNull;
1213
import java.util.List;
1314
import lombok.Getter;
@@ -45,6 +46,7 @@ public enum Roles {
4546

4647
@OneToMany(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
4748
@JsonIgnoreProperties({"user"})
49+
@OrderBy("createdAt DESC")
4850
private List<Code> codeList;
4951

5052
public void savePassword(String newPassword){

src/main/java/share/sh4re/dto/res/CreateCommentRes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import lombok.AllArgsConstructor;
44
import lombok.Getter;
5+
import share.sh4re.domain.Comment;
56
import share.sh4re.dto.res.CreateCommentRes.CreateCommentResData;
67

78
public class CreateCommentRes extends BaseRes<CreateCommentResData> {
@@ -13,6 +14,6 @@ public CreateCommentRes(boolean ok, CreateCommentResData data) {
1314
@Getter
1415
@AllArgsConstructor
1516
public static class CreateCommentResData {
16-
private Long id;
17+
private Comment comment;
1718
}
1819
}

src/main/java/share/sh4re/service/CodeService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import share.sh4re.dto.req.CreateCodeReq;
2727
import share.sh4re.dto.req.CreateCommentReq;
2828
import share.sh4re.dto.req.EditCodeReq;
29-
import share.sh4re.dto.req.EditCommentReq;
3029
import share.sh4re.dto.res.CreateCodeRes;
3130
import share.sh4re.dto.res.CreateCodeRes.CreateCodeResData;
3231
import share.sh4re.dto.res.CreateCommentRes;
@@ -186,7 +185,7 @@ public ResponseEntity<CreateCommentRes> createComment(CreateCommentReq createCom
186185
if(userRes.isEmpty()) throw UserErrorCode.MEMBER_NOT_FOUND.defaultException();
187186
newComment.update(createCommentReq.getContent(), code, userRes.get());
188187
commentRepository.save(newComment);
189-
return new ResponseEntity<>(new CreateCommentRes(true, new CreateCommentRes.CreateCommentResData(newComment.getId())), HttpStatus.OK);
188+
return new ResponseEntity<>(new CreateCommentRes(true, new CreateCommentRes.CreateCommentResData(newComment)), HttpStatus.OK);
190189
}
191190

192191
public ResponseEntity<EditCommentRes> editComment(String commentId, String content){

0 commit comments

Comments
 (0)