Skip to content

Commit 5e3eb0d

Browse files
committed
⚡ MarkSphere v1.0.11
북마크 갱신 시 url 필요한 버그 수정
1 parent 7870f36 commit 5e3eb0d

4 files changed

Lines changed: 39 additions & 10 deletions

File tree

src/main/java/com/sonkim/bookmarking/domain/bookmark/controller/BookmarkController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.sonkim.bookmarking.auth.entity.UserDetailsImpl;
44
import com.sonkim.bookmarking.common.s3.dto.PresignedUrlDto;
55
import com.sonkim.bookmarking.common.s3.service.S3Service;
6-
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkRequestDto;
76
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkResponseDto;
7+
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkUpdateDto;
88
import com.sonkim.bookmarking.domain.bookmark.service.BookmarkService;
99
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkOGDto;
1010
import com.sonkim.bookmarking.common.util.OGUtil;
@@ -53,7 +53,7 @@ public ResponseEntity<BookmarkResponseDto> getBookmark(
5353
@PatchMapping("/{bookmarkId}")
5454
public ResponseEntity<String> updateBookmark(@AuthenticationPrincipal UserDetailsImpl userDetails,
5555
@PathVariable("bookmarkId") Long bookmarkId,
56-
@RequestBody @Valid BookmarkRequestDto bookmarkRequestDto) {
56+
@RequestBody @Valid BookmarkUpdateDto bookmarkRequestDto) {
5757
log.info("userId: {}, bookmarkId: {} 북마크 수정 요청", userDetails.getId(), bookmarkId);
5858
bookmarkService.updateBookmark(userDetails.getId(), bookmarkId, bookmarkRequestDto);
5959
return ResponseEntity.ok("bookmarkId: " + bookmarkId + " updated");
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.sonkim.bookmarking.domain.bookmark.dto;
2+
3+
import jakarta.validation.constraints.Max;
4+
import jakarta.validation.constraints.Min;
5+
import jakarta.validation.constraints.Size;
6+
import lombok.Data;
7+
8+
import java.util.List;
9+
10+
@Data
11+
public class BookmarkUpdateDto {
12+
private Long categoryId;
13+
private String url;
14+
15+
@Size(max = 100, message = "제목은 100자를 초과할 수 없습니다.")
16+
private String title;
17+
18+
@Size(max = 5000)
19+
private String description;
20+
21+
@Size(max = 10, message = "태그는 최대 10개까지만 등록할 수 있습니다.")
22+
private List<String> tagNames;
23+
24+
@Min(value = -90, message = "위도는 -90 이상이어야 합니다.")
25+
@Max(value = 90, message = "위도는 90 이하여야 합니다.")
26+
private Double latitude;
27+
28+
@Min(value = -180, message = "경도는 -180 이상이어야 합니다.")
29+
@Max(value = 180, message = "경도는 180 이하여야 합니다.")
30+
private Double longitude;
31+
private String imageKey; // S3에 직접 업로드한 경우의 파일 키
32+
private String originalImageUrl; // OG 정보의 이미지 URL
33+
}

src/main/java/com/sonkim/bookmarking/domain/bookmark/entity/Bookmark.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.sonkim.bookmarking.domain.bookmark.entity;
22

3+
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkUpdateDto;
34
import com.sonkim.bookmarking.domain.user.entity.User;
4-
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkRequestDto;
55
import com.sonkim.bookmarking.domain.category.entity.Category;
66
import com.sonkim.bookmarking.domain.team.entity.Team;
77
import jakarta.persistence.*;
@@ -54,7 +54,6 @@ public class Bookmark {
5454
private String originalImageUrl;
5555

5656
// 최종 이미지 파일 키
57-
@Column(length = 255)
5857
private String imageKey;
5958

6059
private Double latitude; // 위도
@@ -84,7 +83,7 @@ public void updateCategory(Category category) {
8483
this.category = category;
8584
}
8685

87-
public void update(BookmarkRequestDto dto) {
86+
public void update(BookmarkUpdateDto dto) {
8887
if(dto.getTitle() != null) this.title = dto.getTitle();
8988
if(dto.getDescription() != null) this.description = dto.getDescription();
9089
if(dto.getLatitude() != null) {

src/main/java/com/sonkim/bookmarking/domain/bookmark/service/BookmarkService.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import com.sonkim.bookmarking.common.dto.CursorResultDto;
44
import com.sonkim.bookmarking.common.s3.service.S3Service;
55
import com.sonkim.bookmarking.common.service.BookmarkCreatedEvent;
6-
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkResponseDto;
7-
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkSearchCond;
8-
import com.sonkim.bookmarking.domain.bookmark.dto.LikeCountDto;
6+
import com.sonkim.bookmarking.domain.bookmark.dto.*;
97
import com.sonkim.bookmarking.domain.bookmark.entity.BookmarkTag;
108
import com.sonkim.bookmarking.domain.bookmark.repository.BookmarkLikeRepository;
119
import com.sonkim.bookmarking.domain.bookmark.repository.BookmarkTagRepository;
@@ -14,7 +12,6 @@
1412
import com.sonkim.bookmarking.domain.tag.service.TagService;
1513
import com.sonkim.bookmarking.domain.user.entity.User;
1614
import com.sonkim.bookmarking.domain.user.service.UserService;
17-
import com.sonkim.bookmarking.domain.bookmark.dto.BookmarkRequestDto;
1815
import com.sonkim.bookmarking.domain.bookmark.entity.Bookmark;
1916
import com.sonkim.bookmarking.domain.bookmark.repository.BookmarkRepository;
2017
import com.sonkim.bookmarking.domain.category.service.CategoryService;
@@ -168,7 +165,7 @@ public BookmarkResponseDto getBookmarkDetails(Long userID, Long bookmarkId) {
168165

169166
// 북마크 정보 갱신
170167
@Transactional
171-
public void updateBookmark(Long userId, Long bookmarkId, BookmarkRequestDto dto) {
168+
public void updateBookmark(Long userId, Long bookmarkId, BookmarkUpdateDto dto) {
172169
Bookmark bookmark = getBookmarkById(bookmarkId);
173170

174171
// 그룹 상태 검증

0 commit comments

Comments
 (0)