From bab4c669feed1b1b4602263cb627efe991263c5c Mon Sep 17 00:00:00 2001 From: kokoa322 Date: Wed, 13 Jul 2022 21:11:28 +0900 Subject: [PATCH] =?UTF-8?q?#28=20[update]=20BookmarkResponseDto=20?= =?UTF-8?q?=EB=B6=81=EB=A7=88=ED=81=AC=20=EC=A1=B0=ED=9A=8C=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bookmark/controller/FolderController.java | 6 ++--- .../{BookmarkDTO.java => BookmarkDto.java} | 0 .../bookmark/dto/FolderResponseDto.java | 25 +++++++++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) rename src/main/java/com/mpnp/baechelin/bookmark/dto/{BookmarkDTO.java => BookmarkDto.java} (100%) diff --git a/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java b/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java index 5406c4b..bdf18b6 100644 --- a/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java +++ b/src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java @@ -23,7 +23,7 @@ public void folder (@RequestBody FolderRequestDto folderRequestDto){ folderService.folder(folderRequestDto); } - /* 폴더 삭제 -> 삭제 시 안에 담긴 모든 북마크가 삭제됨 */ + /** 폴더 삭제 -> 삭제 시 안에 담긴 모든 북마크가 삭제됨 */ @DeleteMapping("/folder/{folderId}") public void folderDelete (@PathVariable int folderId){ @@ -31,8 +31,7 @@ public void folderDelete (@PathVariable int folderId){ folderService.folderDelete(folderId); } - /* 폴더 명 변경 */ - + /** 폴더 명 변경 */ @PutMapping("/folderUpdate/{folderId}") public void folderUpdate (@PathVariable int folderId, @RequestParam String newFolderName){ System.out.println(newFolderName); @@ -40,6 +39,7 @@ public void folderUpdate (@PathVariable int folderId, @RequestParam String newFo folderService.folderUpdate(folderId, newFolderName); } + /** 폴더 리스트 */ @PutMapping("/folderList/{userId}") public List folderList (@PathVariable int userId){ diff --git a/src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkDTO.java b/src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkDto.java similarity index 100% rename from src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkDTO.java rename to src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkDto.java diff --git a/src/main/java/com/mpnp/baechelin/bookmark/dto/FolderResponseDto.java b/src/main/java/com/mpnp/baechelin/bookmark/dto/FolderResponseDto.java index 8376fbd..988573f 100644 --- a/src/main/java/com/mpnp/baechelin/bookmark/dto/FolderResponseDto.java +++ b/src/main/java/com/mpnp/baechelin/bookmark/dto/FolderResponseDto.java @@ -3,6 +3,7 @@ import com.mpnp.baechelin.bookmark.domain.Bookmark; import com.mpnp.baechelin.bookmark.domain.Folder; +import com.mpnp.baechelin.store.domain.StoreImage; import lombok.*; import java.util.ArrayList; @@ -24,19 +25,39 @@ public FolderResponseDto(Folder folder) { } public static FolderResponseDto FolderDtoRes(Folder folder) { + /** 북마크의 정보를 담는 작업 */ List> bookmarks = new ArrayList<>(); + if(folder.getBookmarkList() != null) { for (Bookmark bookmark : folder.getBookmarkList()) { - List tempBookmarkList = new ArrayList<>(); - tempBookmarkList.add(bookmark.getStoreId().getName()); + + String pointAvg = String.valueOf(bookmark.getStoreId().getPointAvg()); // 업장 별점 + String name = bookmark.getStoreId().getName(); // 업장 이름 + String address = bookmark.getStoreId().getAddress(); // 업장 주소 + String category = bookmark.getStoreId().getCategory(); // 업장 카테고리 + String PhoneNumber = bookmark.getStoreId().getPhoneNumber(); // 업장 전화번호 + + List storeImageList = bookmark.getStoreId().getStoreImageList();// 업장 이미지 리스트 + List tempBookmarkList = new ArrayList<>(); // 정보를 담는 리스트 + + tempBookmarkList.add(name); + tempBookmarkList.add(pointAvg); + tempBookmarkList.add(address); + tempBookmarkList.add(category); + tempBookmarkList.add(PhoneNumber); + tempBookmarkList.add(storeImageList.get(0).getStoreImageUrl()); + bookmarks.add(tempBookmarkList); + } } else if(folder.getBookmarkList() == null) { + return FolderResponseDto.builder() .folderName(folder.getFolderName()) .id(folder.getId()) .build(); + } return FolderResponseDto.builder()