Skip to content

Commit c9a7fd6

Browse files
authored
Merge pull request #42 from rhkr8521/fix/#change-return-date
[FIX] 메모,댓글 날짜 반환 로직 수정
2 parents 9f29ed7 + 18411a2 commit c9a7fd6

File tree

6 files changed

+12
-2
lines changed

6 files changed

+12
-2
lines changed

src/main/java/com/rhkr8521/mapping/api/comment/dto/CommentResponseDTO.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class CommentResponseDTO {
1414
private String comment;
1515
private int rating;
1616
private int likeCnt;
17+
private boolean modify;
1718
private String nickname;
1819
private String profileImageUrl;
1920
private String updatedAt;
@@ -29,8 +30,9 @@ public static CommentResponseDTO fromEntity(Comment comment, boolean myLike) {
2930
.likeCnt(comment.getLikeCnt())
3031
.nickname(comment.getMember().getNickname())
3132
.profileImageUrl(comment.getMember().getImageUrl())
32-
.updatedAt(comment.getUpdatedAt().format(dateTimeFormatter))
33+
.updatedAt(comment.getCreatedAt().format(dateTimeFormatter))
3334
.myLike(myLike)
35+
.modify(comment.isModify())
3436
.build();
3537
}
3638
}

src/main/java/com/rhkr8521/mapping/api/comment/entity/Comment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class Comment extends BaseTimeEntity {
2424

2525
private int rating;
2626
private int likeCnt;
27+
private boolean modify;
2728

2829
@ManyToOne(fetch = FetchType.LAZY)
2930
@JoinColumn(name = "memo_id")

src/main/java/com/rhkr8521/mapping/api/comment/service/CommentService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public void createComment(CommentCreateDTO commentCreateDTO, Long userId) {
5151
.member(member)
5252
.rating(commentCreateDTO.getRating())
5353
.likeCnt(0)
54+
.modify(false)
5455
.build();
5556

5657
commentRepository.save(comment);
@@ -99,6 +100,7 @@ public void updateComment(Long commentId, CommentUpdateDTO commentUpdateDTO, Lon
99100
comment = comment.toBuilder()
100101
.comment(commentUpdateDTO.getComment())
101102
.rating(commentUpdateDTO.getRating())
103+
.modify(true)
102104
.build();
103105

104106
commentRepository.save(comment);

src/main/java/com/rhkr8521/mapping/api/memo/dto/MemoDetailResponseDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class MemoDetailResponseDTO {
2626
private boolean myLike;
2727
private boolean myHate;
2828
private boolean certified;
29+
private boolean modify;
2930
private Long authorId;
3031
private String nickname;
3132
private String profileImage;

src/main/java/com/rhkr8521/mapping/api/memo/entity/Memo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class Memo extends BaseTimeEntity {
3535
private String ip;
3636
private boolean secret;
3737
private boolean certified;
38+
private boolean modify;
3839

3940
@ManyToOne(fetch = FetchType.LAZY)
4041
@JoinColumn(name = "user_id")

src/main/java/com/rhkr8521/mapping/api/memo/service/MemoService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void createMemo(Long userId, MemoCreateRequestDTO memoRequest, List<Multi
7070
.ip(clientIp)
7171
.secret(memoRequest.isSecret())
7272
.certified(certified)
73+
.modify(false)
7374
.build();
7475

7576
// 이미지 처리
@@ -177,7 +178,7 @@ public MemoDetailResponseDTO getMemoDetail(Long memoId, UserDetails userDetails)
177178

178179
// 날짜 포맷팅
179180
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd:HH:mm:ss");
180-
String formattedDate = memo.getUpdatedAt().format(formatter);
181+
String formattedDate = memo.getCreatedAt().format(formatter);
181182

182183
return MemoDetailResponseDTO.builder()
183184
.id(memo.getId())
@@ -197,6 +198,7 @@ public MemoDetailResponseDTO getMemoDetail(Long memoId, UserDetails userDetails)
197198
.nickname(memo.getMember().getNickname())
198199
.profileImage(memo.getMember().getImageUrl())
199200
.certified(memo.isCertified())
201+
.modify(memo.isModify())
200202
.build();
201203
}
202204

@@ -255,6 +257,7 @@ public void updateMemo(Long memoId, Long userId, MemoCreateRequestDTO memoReques
255257
.hateCnt(memo.getHateCnt())
256258
.ip(memo.getIp())
257259
.images(new ArrayList<>(memo.getImages()))
260+
.modify(true)
258261
.build();
259262

260263
// 삭제할 이미지 처리

0 commit comments

Comments
 (0)