From 01dfeca40a91f12a6b1a7c031ea6eece6d75594b Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 11:55:59 +0900 Subject: [PATCH 01/10] =?UTF-8?q?fix=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=9E=84=EC=8B=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/web/MemberControllerTest.java | 59 ++++++++++--------- src/test/resources/application.yml | 6 ++ 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java b/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java index 4838d045..499c3141 100644 --- a/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java +++ b/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java @@ -5,16 +5,19 @@ import com.sptp.backend.member.web.dto.request.MemberLoginRequestDto; import com.sptp.backend.member.web.dto.request.MemberSaveRequestDto; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; import org.springframework.security.test.context.support.WithUserDetails; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.result.MockMvcResultHandlers; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; @@ -40,7 +43,7 @@ class MemberControllerTest extends BaseControllerTest { MemberService memberService; // 인증 필요한 api 테스트 시 해당 유저 정보 사용 - @PostConstruct + @BeforeEach void settingAuthenticatedUser() { MemberSaveRequestDto dto = MemberSaveRequestDto.builder() @@ -124,33 +127,33 @@ void memberLoginTest() throws Exception { .andExpect(MockMvcResultMatchers.status().isOk()); } - @Test - @DisplayName("회원 정보 조회 테스트") - @WithUserDetails(value = "test2") - public void getUserInfo() throws Exception { - - //when - ResultActions resultActions = mockMvc.perform( - MockMvcRequestBuilders.get("/members/me") - .contentType(MediaType.APPLICATION_JSON) - .characterEncoding(StandardCharsets.UTF_8) - .accept(MediaType.APPLICATION_JSON) - ) - .andDo(MockMvcResultHandlers.print()); - - //then - resultActions - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.jsonPath("nickname").value("nickname2")) - .andExpect(MockMvcResultMatchers.jsonPath("userId").value("test2")) - .andExpect(MockMvcResultMatchers.jsonPath("email").value("test2@gmail.com")) - .andExpect(MockMvcResultMatchers.jsonPath("telephone").value("01012341234")) - .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[0]").value("사진")) - .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[1]").value("파스텔")) - .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[2]").value("유화")) - .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[3]").value("미디어아트")) - .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[4]").value("세련된")); - } +// @Test +// @DisplayName("회원 정보 조회 테스트") +// @WithUserDetails(value = "test2") +// public void getUserInfo() throws Exception { +// +// //when +// ResultActions resultActions = mockMvc.perform( +// MockMvcRequestBuilders.get("/members/me") +// .contentType(MediaType.APPLICATION_JSON) +// .characterEncoding(StandardCharsets.UTF_8) +// .accept(MediaType.APPLICATION_JSON) +// ) +// .andDo(MockMvcResultHandlers.print()); +// +// //then +// resultActions +// .andExpect(MockMvcResultMatchers.status().isOk()) +// .andExpect(MockMvcResultMatchers.jsonPath("nickname").value("nickname2")) +// .andExpect(MockMvcResultMatchers.jsonPath("userId").value("test2")) +// .andExpect(MockMvcResultMatchers.jsonPath("email").value("test2@gmail.com")) +// .andExpect(MockMvcResultMatchers.jsonPath("telephone").value("01012341234")) +// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[0]").value("사진")) +// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[1]").value("파스텔")) +// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[2]").value("유화")) +// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[3]").value("미디어아트")) +// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[4]").value("세련된")); +// } } \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index c967e103..63a9d54f 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -3,6 +3,12 @@ spring: host: localhost port: ${application.spring.redis.port} + datasource: + url: ${application.spring.datasource.url} + username: ${application.spring.datasource.username} + password: ${application.spring.datasource.password} + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: hibernate: ddl-auto: create From b30993856234282f3224de266bd09117022da218 Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 13:00:38 +0900 Subject: [PATCH 02/10] =?UTF-8?q?fix=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/web/MemberControllerTest.java | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java b/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java index 499c3141..e07db5d9 100644 --- a/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java +++ b/src/test/java/com/sptp/backend/member/web/MemberControllerTest.java @@ -1,26 +1,21 @@ package com.sptp.backend.member.web; import com.sptp.backend.common.BaseControllerTest; -import com.sptp.backend.member.repository.Member; import com.sptp.backend.member.service.MemberService; import com.sptp.backend.member.web.dto.request.MemberLoginRequestDto; import com.sptp.backend.member.web.dto.request.MemberSaveRequestDto; +import com.sptp.backend.member.web.dto.response.MemberLoginResponseDto; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.security.test.context.support.WithUserDetails; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.result.MockMvcResultHandlers; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.PostConstruct; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; @@ -127,33 +122,36 @@ void memberLoginTest() throws Exception { .andExpect(MockMvcResultMatchers.status().isOk()); } -// @Test -// @DisplayName("회원 정보 조회 테스트") -// @WithUserDetails(value = "test2") -// public void getUserInfo() throws Exception { -// -// //when -// ResultActions resultActions = mockMvc.perform( -// MockMvcRequestBuilders.get("/members/me") -// .contentType(MediaType.APPLICATION_JSON) -// .characterEncoding(StandardCharsets.UTF_8) -// .accept(MediaType.APPLICATION_JSON) -// ) -// .andDo(MockMvcResultHandlers.print()); -// -// //then -// resultActions -// .andExpect(MockMvcResultMatchers.status().isOk()) -// .andExpect(MockMvcResultMatchers.jsonPath("nickname").value("nickname2")) -// .andExpect(MockMvcResultMatchers.jsonPath("userId").value("test2")) -// .andExpect(MockMvcResultMatchers.jsonPath("email").value("test2@gmail.com")) -// .andExpect(MockMvcResultMatchers.jsonPath("telephone").value("01012341234")) -// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[0]").value("사진")) -// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[1]").value("파스텔")) -// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[2]").value("유화")) -// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[3]").value("미디어아트")) -// .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[4]").value("세련된")); -// } + @Test + @DisplayName("회원 정보 조회 테스트") + public void getUserInfo() throws Exception { + + //given + MemberLoginRequestDto dto = MemberLoginRequestDto.builder().userId("test2").password("test1234").build(); + MemberLoginResponseDto token = memberService.login(dto); + //when + ResultActions resultActions = mockMvc.perform( + MockMvcRequestBuilders.get("/members/me") + .header("Authorization", token.getAccessToken()) + .contentType(MediaType.APPLICATION_JSON) + .characterEncoding(StandardCharsets.UTF_8) + .accept(MediaType.APPLICATION_JSON) + ) + .andDo(MockMvcResultHandlers.print()); + + //then + resultActions + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.jsonPath("nickname").value("nickname2")) + .andExpect(MockMvcResultMatchers.jsonPath("userId").value("test2")) + .andExpect(MockMvcResultMatchers.jsonPath("email").value("test2@gmail.com")) + .andExpect(MockMvcResultMatchers.jsonPath("telephone").value("01012341234")) + .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[0]").value("사진")) + .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[1]").value("파스텔")) + .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[2]").value("유화")) + .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[3]").value("미디어아트")) + .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[4]").value("세련된")); + } } \ No newline at end of file From 26fa25c5abf2dd0534454db9d39b6c18c16d3866 Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 14:34:38 +0900 Subject: [PATCH 03/10] =?UTF-8?q?fix=20:=20=EC=9E=91=ED=92=88=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EA=B4=80=EB=A0=A8=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/art_work/repository/ArtWork.java | 17 +++++++++++++++-- .../art_work/service/ArtWorkService.java | 8 +++++++- .../web/dto/request/ArtWorkSaveRequestDto.java | 11 +++++++++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java b/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java index a0979b3e..47fa986f 100644 --- a/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java +++ b/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java @@ -32,8 +32,6 @@ public class ArtWork extends BaseEntity { private String material; - private String size; - private Integer price; private String status; @@ -43,4 +41,19 @@ public class ArtWork extends BaseEntity { private String guaranteeImage; private String mainImage; + + private Integer width; + + private Integer length; + + private Integer height; + + private Integer size; + + private boolean isFrame; + + private String genre; + + private String description; + } diff --git a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java index 37b5be61..146795e0 100644 --- a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java +++ b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java @@ -52,12 +52,18 @@ public void saveArtWork(Long loginMemberId, ArtWorkSaveRequestDto dto) throws IO .member(findMember) .title(dto.getTitle()) .material(dto.getMaterial()) - .size(dto.getSize()) .price(dto.getPrice()) .status(dto.getStatus()) .statusDescription(dto.getStatusDescription()) .guaranteeImage(GuaranteeImageUUID + "." + GuaranteeImageEXT) .mainImage(mainImageUUID + "." + mainImageEXT) + .genre(dto.getGenre()) + .size(dto.getSize()) + .height(dto.getHeight()) + .length(dto.getLength()) + .width(dto.getWidth()) + .isFrame(dto.isFrame()) + .description(dto.getDescription()) .build(); artWorkRepository.save(artWork); diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java index 4df81880..709a143f 100644 --- a/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java +++ b/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java @@ -16,8 +16,15 @@ public class ArtWorkSaveRequestDto { private String[] keywords; private String productionYear; private String material; - private String size; - private Integer price; private String status; private String statusDescription; + private Integer width; + private Integer length; + private Integer height; + private Integer size; + private boolean isFrame; + private String genre; + private Integer price; + private String description; + } From 18a75bd0d7703c661fc301f1e068abe7015cfbfe Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 15:41:26 +0900 Subject: [PATCH 04/10] =?UTF-8?q?feat=20:=20=EC=9E=91=ED=92=88=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/art_work/repository/ArtWork.java | 4 ++- .../art_work/service/ArtWorkService.java | 34 ++++++++++++++++++- .../art_work/web/ArtWorkController.java | 12 +++++++ .../dto/request/ArtWorkSaveRequestDto.java | 5 +-- .../dto/response/ArtWorkInfoResponseDto.java | 29 ++++++++++++++++ .../repository/ArtWorkImageRepository.java | 3 ++ .../repository/ArtWorkKeywordRepository.java | 3 ++ .../member/repository/MemberRepository.java | 1 + 8 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java diff --git a/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java b/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java index 47fa986f..d836c272 100644 --- a/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java +++ b/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java @@ -32,6 +32,8 @@ public class ArtWork extends BaseEntity { private String material; + private Integer productionYear; + private Integer price; private String status; @@ -50,7 +52,7 @@ public class ArtWork extends BaseEntity { private Integer size; - private boolean isFrame; + private boolean frame; private String genre; diff --git a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java index 146795e0..a99a9325 100644 --- a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java +++ b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java @@ -3,6 +3,7 @@ import com.sptp.backend.art_work.repository.ArtWork; import com.sptp.backend.art_work.repository.ArtWorkRepository; import com.sptp.backend.art_work.web.dto.request.ArtWorkSaveRequestDto; +import com.sptp.backend.art_work.web.dto.response.ArtWorkInfoResponseDto; import com.sptp.backend.art_work_image.repository.ArtWorkImage; import com.sptp.backend.art_work_image.repository.ArtWorkImageRepository; import com.sptp.backend.art_work_keyword.repository.ArtWorkKeyword; @@ -21,6 +22,8 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.List; +import java.util.Optional; import java.util.UUID; @Service @@ -62,8 +65,9 @@ public void saveArtWork(Long loginMemberId, ArtWorkSaveRequestDto dto) throws IO .height(dto.getHeight()) .length(dto.getLength()) .width(dto.getWidth()) - .isFrame(dto.isFrame()) + .frame(dto.isFrame()) .description(dto.getDescription()) + .productionYear(dto.getProductionYear()) .build(); artWorkRepository.save(artWork); @@ -110,4 +114,32 @@ public void checkExistsImage(ArtWorkSaveRequestDto dto) { throw new CustomException(ErrorCode.SHOULD_EXIST_IMAGE); } } + + public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { + + ArtWork findArtWork = artWorkRepository.findById(artWorkId) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ARTWORK)); + + Member findArtist = memberRepository.findById(findArtWork.getMember().getId()) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ARTIST)); + + ArtWorkInfoResponseDto artWorkInfoResponseDto = ArtWorkInfoResponseDto.builder() + .title(findArtWork.getTitle()) + .artistName(findArtist.getNickname()) + .artistEducation(findArtist.getEducation()) + .productionYear(findArtWork.getProductionYear()) + .material(findArtWork.getMaterial()) + .genre(findArtWork.getGenre()) + .frame(findArtWork.isFrame()) + .width(findArtWork.getWidth()) + .height(findArtWork.getHeight()) + .length(findArtWork.getLength()) + .size(findArtWork.getSize()) + .description(findArtWork.getDescription()) + .artWorkImage(findArtWork.getMainImage()) + .artistImage(findArtist.getImage()) + .build(); + + return artWorkInfoResponseDto; + } } diff --git a/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java b/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java index 6c3c5e91..007c4315 100644 --- a/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java +++ b/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java @@ -2,11 +2,14 @@ import com.sptp.backend.art_work.service.ArtWorkService; import com.sptp.backend.art_work.web.dto.request.ArtWorkSaveRequestDto; +import com.sptp.backend.art_work.web.dto.response.ArtWorkInfoResponseDto; import com.sptp.backend.jwt.service.dto.CustomUserDetails; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,4 +30,13 @@ public ResponseEntity saveArtWork(@AuthenticationPrincipal CustomUserDetai return new ResponseEntity(HttpStatus.OK); } + + // 작품 상세 조회 + @GetMapping("/art-work/{artWorkId}") + public ResponseEntity getArtWork(@PathVariable("artWorkId") Long artWorkId) { + + ArtWorkInfoResponseDto artWorkInfoResponseDto = artWorkService.getArtWork(artWorkId); + + return ResponseEntity.status(HttpStatus.OK).body(artWorkInfoResponseDto); + } } diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java index 709a143f..d2aa0399 100644 --- a/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java +++ b/src/main/java/com/sptp/backend/art_work/web/dto/request/ArtWorkSaveRequestDto.java @@ -1,5 +1,6 @@ package com.sptp.backend.art_work.web.dto.request; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.springframework.web.multipart.MultipartFile; @@ -14,7 +15,7 @@ public class ArtWorkSaveRequestDto { private MultipartFile guaranteeImage; private String title; private String[] keywords; - private String productionYear; + private Integer productionYear; private String material; private String status; private String statusDescription; @@ -22,7 +23,7 @@ public class ArtWorkSaveRequestDto { private Integer length; private Integer height; private Integer size; - private boolean isFrame; + private boolean frame; private String genre; private Integer price; private String description; diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java new file mode 100644 index 00000000..857cd71c --- /dev/null +++ b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java @@ -0,0 +1,29 @@ +package com.sptp.backend.art_work.web.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ArtWorkInfoResponseDto { + + private String title; + private String artistEducation; + private String artistName; + private Integer productionYear; + private String material; + private String genre; + private boolean frame; + private Integer width; + private Integer length; + private Integer height; + private Integer size; + private String description; + + private String artWorkImage; + private String artistImage; + +} diff --git a/src/main/java/com/sptp/backend/art_work_image/repository/ArtWorkImageRepository.java b/src/main/java/com/sptp/backend/art_work_image/repository/ArtWorkImageRepository.java index ea720505..c91800cc 100644 --- a/src/main/java/com/sptp/backend/art_work_image/repository/ArtWorkImageRepository.java +++ b/src/main/java/com/sptp/backend/art_work_image/repository/ArtWorkImageRepository.java @@ -2,6 +2,9 @@ import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ArtWorkImageRepository extends JpaRepository { + List findByArtWorkId(Long artWorkId); } diff --git a/src/main/java/com/sptp/backend/art_work_keyword/repository/ArtWorkKeywordRepository.java b/src/main/java/com/sptp/backend/art_work_keyword/repository/ArtWorkKeywordRepository.java index d0385ee3..42f8381f 100644 --- a/src/main/java/com/sptp/backend/art_work_keyword/repository/ArtWorkKeywordRepository.java +++ b/src/main/java/com/sptp/backend/art_work_keyword/repository/ArtWorkKeywordRepository.java @@ -2,6 +2,9 @@ import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ArtWorkKeywordRepository extends JpaRepository { + List findByArtWorkId(Long artWorkId); } diff --git a/src/main/java/com/sptp/backend/member/repository/MemberRepository.java b/src/main/java/com/sptp/backend/member/repository/MemberRepository.java index 4a685fe4..0869d187 100644 --- a/src/main/java/com/sptp/backend/member/repository/MemberRepository.java +++ b/src/main/java/com/sptp/backend/member/repository/MemberRepository.java @@ -15,4 +15,5 @@ public interface MemberRepository extends JpaRepository { boolean existsByUserId(String userId); boolean existsByNickname(String nickname); + } From 8def7cf1336f98b3080a001821332c055954bda3 Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 16:42:47 +0900 Subject: [PATCH 05/10] =?UTF-8?q?fix=20:=20=EC=9E=91=ED=92=88=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20api=20=EB=B0=98=ED=99=98=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sptp/backend/art_work/service/ArtWorkService.java | 7 +++++++ .../art_work/web/dto/response/ArtWorkInfoResponseDto.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java index a99a9325..a3b083ae 100644 --- a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java +++ b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -123,6 +124,9 @@ public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { Member findArtist = memberRepository.findById(findArtWork.getMember().getId()) .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ARTIST)); + List artWorkImages = artWorkImageRepository.findByArtWorkId(artWorkId); + List artWorkKeywords = artWorkKeywordRepository.findByArtWorkId(artWorkId); + ArtWorkInfoResponseDto artWorkInfoResponseDto = ArtWorkInfoResponseDto.builder() .title(findArtWork.getTitle()) .artistName(findArtist.getNickname()) @@ -136,8 +140,11 @@ public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { .length(findArtWork.getLength()) .size(findArtWork.getSize()) .description(findArtWork.getDescription()) + .guaranteeImage(findArtWork.getGuaranteeImage()) .artWorkImage(findArtWork.getMainImage()) .artistImage(findArtist.getImage()) + .images(artWorkImages.stream().map(m -> m.getImage()).collect(Collectors.toList())) + .keywords(artWorkKeywords.stream().map(m->KeywordMap.getKeywordName(m.getKeywordId())).collect(Collectors.toList())) .build(); return artWorkInfoResponseDto; diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java index 857cd71c..49c52756 100644 --- a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java +++ b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java @@ -3,6 +3,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; +import java.util.List; + @Getter @Setter @NoArgsConstructor @@ -23,7 +25,10 @@ public class ArtWorkInfoResponseDto { private Integer size; private String description; + private String guaranteeImage; private String artWorkImage; private String artistImage; + private List keywords; + private List images; } From 1ec5f160b4ccaa53d31f0cb710f0a48594a4f9eb Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 16:56:29 +0900 Subject: [PATCH 06/10] =?UTF-8?q?fix=20:=20=EB=B0=98=ED=99=98=20response?= =?UTF-8?q?=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sptp/backend/art_work/service/ArtWorkService.java | 2 +- .../art_work/web/dto/response/ArtWorkInfoResponseDto.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java index a3b083ae..bab94056 100644 --- a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java +++ b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java @@ -141,7 +141,7 @@ public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { .size(findArtWork.getSize()) .description(findArtWork.getDescription()) .guaranteeImage(findArtWork.getGuaranteeImage()) - .artWorkImage(findArtWork.getMainImage()) + .mainImage(findArtWork.getMainImage()) .artistImage(findArtist.getImage()) .images(artWorkImages.stream().map(m -> m.getImage()).collect(Collectors.toList())) .keywords(artWorkKeywords.stream().map(m->KeywordMap.getKeywordName(m.getKeywordId())).collect(Collectors.toList())) diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java index 49c52756..79b30a0e 100644 --- a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java +++ b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java @@ -26,7 +26,7 @@ public class ArtWorkInfoResponseDto { private String description; private String guaranteeImage; - private String artWorkImage; + private String mainImage; private String artistImage; private List keywords; private List images; From 1ec953c5e89b4cf13f5845ad0792a2104b47c14f Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 21:52:29 +0900 Subject: [PATCH 07/10] =?UTF-8?q?fix=20:=20=EB=B0=98=ED=99=98=20response?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EB=82=B4=EB=B6=80=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=99=9C=EC=9A=A9=20=EB=B0=8F=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=EC=A6=88=20@Embedded?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/art_work/repository/ArtWork.java | 11 +-- .../art_work/repository/ArtWorkSize.java | 24 ++++++ .../art_work/service/ArtWorkService.java | 29 ++----- .../dto/response/ArtWorkInfoResponseDto.java | 80 ++++++++++++++----- 4 files changed, 94 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/sptp/backend/art_work/repository/ArtWorkSize.java diff --git a/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java b/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java index d836c272..2790b76e 100644 --- a/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java +++ b/src/main/java/com/sptp/backend/art_work/repository/ArtWork.java @@ -44,18 +44,13 @@ public class ArtWork extends BaseEntity { private String mainImage; - private Integer width; - - private Integer length; - - private Integer height; - - private Integer size; - private boolean frame; private String genre; private String description; + @Embedded + private ArtWorkSize artWorkSize; + } diff --git a/src/main/java/com/sptp/backend/art_work/repository/ArtWorkSize.java b/src/main/java/com/sptp/backend/art_work/repository/ArtWorkSize.java new file mode 100644 index 00000000..e3581960 --- /dev/null +++ b/src/main/java/com/sptp/backend/art_work/repository/ArtWorkSize.java @@ -0,0 +1,24 @@ +package com.sptp.backend.art_work.repository; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Embeddable; + +@Embeddable +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ArtWorkSize { + + private Integer width; + + private Integer length; + + private Integer height; + + private Integer size; +} diff --git a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java index bab94056..1e9425a8 100644 --- a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java +++ b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java @@ -2,6 +2,7 @@ import com.sptp.backend.art_work.repository.ArtWork; import com.sptp.backend.art_work.repository.ArtWorkRepository; +import com.sptp.backend.art_work.repository.ArtWorkSize; import com.sptp.backend.art_work.web.dto.request.ArtWorkSaveRequestDto; import com.sptp.backend.art_work.web.dto.response.ArtWorkInfoResponseDto; import com.sptp.backend.art_work_image.repository.ArtWorkImage; @@ -62,10 +63,7 @@ public void saveArtWork(Long loginMemberId, ArtWorkSaveRequestDto dto) throws IO .guaranteeImage(GuaranteeImageUUID + "." + GuaranteeImageEXT) .mainImage(mainImageUUID + "." + mainImageEXT) .genre(dto.getGenre()) - .size(dto.getSize()) - .height(dto.getHeight()) - .length(dto.getLength()) - .width(dto.getWidth()) + .artWorkSize(ArtWorkSize.builder().size(dto.getSize()).length(dto.getLength()).width(dto.getWidth()).height(dto.getHeight()).build()) .frame(dto.isFrame()) .description(dto.getDescription()) .productionYear(dto.getProductionYear()) @@ -127,26 +125,9 @@ public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { List artWorkImages = artWorkImageRepository.findByArtWorkId(artWorkId); List artWorkKeywords = artWorkKeywordRepository.findByArtWorkId(artWorkId); - ArtWorkInfoResponseDto artWorkInfoResponseDto = ArtWorkInfoResponseDto.builder() - .title(findArtWork.getTitle()) - .artistName(findArtist.getNickname()) - .artistEducation(findArtist.getEducation()) - .productionYear(findArtWork.getProductionYear()) - .material(findArtWork.getMaterial()) - .genre(findArtWork.getGenre()) - .frame(findArtWork.isFrame()) - .width(findArtWork.getWidth()) - .height(findArtWork.getHeight()) - .length(findArtWork.getLength()) - .size(findArtWork.getSize()) - .description(findArtWork.getDescription()) - .guaranteeImage(findArtWork.getGuaranteeImage()) - .mainImage(findArtWork.getMainImage()) - .artistImage(findArtist.getImage()) - .images(artWorkImages.stream().map(m -> m.getImage()).collect(Collectors.toList())) - .keywords(artWorkKeywords.stream().map(m->KeywordMap.getKeywordName(m.getKeywordId())).collect(Collectors.toList())) + return ArtWorkInfoResponseDto.builder() + .artist(ArtWorkInfoResponseDto.ArtistDto.from(findArtist)) + .artWork(ArtWorkInfoResponseDto.ArtWorkDto.from(findArtWork, artWorkImages, artWorkKeywords)) .build(); - - return artWorkInfoResponseDto; } } diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java index 79b30a0e..86b8f7b4 100644 --- a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java +++ b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java @@ -1,9 +1,16 @@ package com.sptp.backend.art_work.web.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; +import com.sptp.backend.art_work.repository.ArtWork; +import com.sptp.backend.art_work.repository.ArtWorkSize; +import com.sptp.backend.art_work_image.repository.ArtWorkImage; +import com.sptp.backend.art_work_keyword.repository.ArtWorkKeyword; +import com.sptp.backend.common.KeywordMap; +import com.sptp.backend.member.repository.Member; import lombok.*; import java.util.List; +import java.util.stream.Collectors; @Getter @Setter @@ -12,23 +19,60 @@ @Builder public class ArtWorkInfoResponseDto { - private String title; - private String artistEducation; - private String artistName; - private Integer productionYear; - private String material; - private String genre; - private boolean frame; - private Integer width; - private Integer length; - private Integer height; - private Integer size; - private String description; - - private String guaranteeImage; - private String mainImage; - private String artistImage; - private List keywords; - private List images; + private ArtistDto artist; + private ArtWorkDto artWork; + + @Data + @Builder + public static class ArtistDto { + private String artistEducation; + private String artistName; + private String artistImage; + + public static ArtistDto from(Member member) { + return ArtistDto.builder() + .artistName(member.getNickname()) + .artistEducation(member.getEducation()) + .artistImage(member.getImage()) + .build(); + } + + } + + @Data + @Builder + public static class ArtWorkDto { + + private String title; + private Integer productionYear; + private String material; + private String genre; + private boolean frame; +// private Integer width; +// private Integer length; +// private Integer height; +// private Integer size; + private String description; + private ArtWorkSize artWorkSize; + private String guaranteeImage; + private String mainImage; + private List keywords; + private List images; + + public static ArtWorkDto from(ArtWork artWork, List artWorkImages, List artWorkKeywords) { + return ArtWorkDto.builder() + .title(artWork.getTitle()) + .productionYear(artWork.getProductionYear()) + .material(artWork.getMaterial()) + .genre(artWork.getGenre()) + .frame(artWork.isFrame()) + .artWorkSize(artWork.getArtWorkSize()) + .guaranteeImage(artWork.getGuaranteeImage()) + .mainImage(artWork.getMainImage()) + .images(artWorkImages.stream().map(m -> m.getImage()).collect(Collectors.toList())) + .keywords(artWorkKeywords.stream().map(m-> KeywordMap.getKeywordName(m.getKeywordId())).collect(Collectors.toList())) + .build(); + } + } } From 109c7d9c423ed5172d88346224164382cc4ed717 Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 21:56:50 +0900 Subject: [PATCH 08/10] =?UTF-8?q?fix=20:=20end=20point=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20application.yml=20=ED=8C=8C=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sptp/backend/art_work/web/ArtWorkController.java | 4 ++-- src/test/resources/application.yml | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java b/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java index 007c4315..148672d4 100644 --- a/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java +++ b/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java @@ -22,7 +22,7 @@ public class ArtWorkController { private final ArtWorkService artWorkService; // 작품 등록 - @PostMapping("/art-work") + @PostMapping("/art-works") public ResponseEntity saveArtWork(@AuthenticationPrincipal CustomUserDetails userDetails, ArtWorkSaveRequestDto artWorkSaveRequestDto) throws IOException { @@ -32,7 +32,7 @@ public ResponseEntity saveArtWork(@AuthenticationPrincipal CustomUserDetai } // 작품 상세 조회 - @GetMapping("/art-work/{artWorkId}") + @GetMapping("/art-works/{artWorkId}") public ResponseEntity getArtWork(@PathVariable("artWorkId") Long artWorkId) { ArtWorkInfoResponseDto artWorkInfoResponseDto = artWorkService.getArtWork(artWorkId); diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 63a9d54f..c967e103 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -3,12 +3,6 @@ spring: host: localhost port: ${application.spring.redis.port} - datasource: - url: ${application.spring.datasource.url} - username: ${application.spring.datasource.username} - password: ${application.spring.datasource.password} - driver-class-name: com.mysql.cj.jdbc.Driver - jpa: hibernate: ddl-auto: create From 3cc2c8d50cfbacb3442d41ae4a70b98d2e6cbc05 Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 22:46:04 +0900 Subject: [PATCH 09/10] =?UTF-8?q?feat=20:=20=EB=93=B1=EB=A1=9D=20=EC=9E=91?= =?UTF-8?q?=ED=92=88=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ArtWorkRepository.java | 3 +++ .../art_work/service/ArtWorkService.java | 17 ++++++++++++++++ .../art_work/web/ArtWorkController.java | 11 ++++++++++ .../response/ArtWorkMyListResponseDto.java | 20 +++++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkMyListResponseDto.java diff --git a/src/main/java/com/sptp/backend/art_work/repository/ArtWorkRepository.java b/src/main/java/com/sptp/backend/art_work/repository/ArtWorkRepository.java index 4bb0ce5e..3ab20bfc 100644 --- a/src/main/java/com/sptp/backend/art_work/repository/ArtWorkRepository.java +++ b/src/main/java/com/sptp/backend/art_work/repository/ArtWorkRepository.java @@ -2,6 +2,9 @@ import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ArtWorkRepository extends JpaRepository { + List findByMemberId(Long memberId); } diff --git a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java index 1e9425a8..88e88c54 100644 --- a/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java +++ b/src/main/java/com/sptp/backend/art_work/service/ArtWorkService.java @@ -5,6 +5,7 @@ import com.sptp.backend.art_work.repository.ArtWorkSize; import com.sptp.backend.art_work.web.dto.request.ArtWorkSaveRequestDto; import com.sptp.backend.art_work.web.dto.response.ArtWorkInfoResponseDto; +import com.sptp.backend.art_work.web.dto.response.ArtWorkMyListResponseDto; import com.sptp.backend.art_work_image.repository.ArtWorkImage; import com.sptp.backend.art_work_image.repository.ArtWorkImageRepository; import com.sptp.backend.art_work_keyword.repository.ArtWorkKeyword; @@ -114,6 +115,7 @@ public void checkExistsImage(ArtWorkSaveRequestDto dto) { } } + @Transactional(readOnly = true) public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { ArtWork findArtWork = artWorkRepository.findById(artWorkId) @@ -130,4 +132,19 @@ public ArtWorkInfoResponseDto getArtWork(Long artWorkId) { .artWork(ArtWorkInfoResponseDto.ArtWorkDto.from(findArtWork, artWorkImages, artWorkKeywords)) .build(); } + + @Transactional(readOnly = true) + public List getMyArtWorkList(Long loginMemberId) { + + Member findMember = memberRepository.findById(loginMemberId) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER)); + + List findArtWorkList = artWorkRepository.findByMemberId(findMember.getId()); + + List artWorkMyListResponseDto = findArtWorkList.stream() + .map(m -> new ArtWorkMyListResponseDto(m.getId(), m.getTitle(), findMember.getNickname())) + .collect(Collectors.toList()); + + return artWorkMyListResponseDto; + } } diff --git a/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java b/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java index 148672d4..f0820b31 100644 --- a/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java +++ b/src/main/java/com/sptp/backend/art_work/web/ArtWorkController.java @@ -3,6 +3,7 @@ import com.sptp.backend.art_work.service.ArtWorkService; import com.sptp.backend.art_work.web.dto.request.ArtWorkSaveRequestDto; import com.sptp.backend.art_work.web.dto.response.ArtWorkInfoResponseDto; +import com.sptp.backend.art_work.web.dto.response.ArtWorkMyListResponseDto; import com.sptp.backend.jwt.service.dto.CustomUserDetails; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import java.io.IOException; +import java.util.List; @RestController @RequiredArgsConstructor @@ -39,4 +41,13 @@ public ResponseEntity getArtWork(@PathVariable("artWorkI return ResponseEntity.status(HttpStatus.OK).body(artWorkInfoResponseDto); } + + // 내 등록 작품 조회 + @GetMapping("/art-works/me") + public ResponseEntity> getMyArtWorkList(@AuthenticationPrincipal CustomUserDetails userDetails) { + + List artWorkMyListResponseDto = artWorkService.getMyArtWorkList(userDetails.getMember().getId()); + + return ResponseEntity.status(HttpStatus.OK).body(artWorkMyListResponseDto); + } } diff --git a/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkMyListResponseDto.java b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkMyListResponseDto.java new file mode 100644 index 00000000..9d558356 --- /dev/null +++ b/src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkMyListResponseDto.java @@ -0,0 +1,20 @@ +package com.sptp.backend.art_work.web.dto.response; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ArtWorkMyListResponseDto { + + private Long id; + private String title; + private String artistName; + +// 경매 명과 입찰 현황, 등록 현황은 추후 경매 기능 이후에 적용 +// private String auctionName; +// private String biddingStatus; +// private String status; +} From 3bf6b8dbc92b985141b09a8c6fc3d27398a8277f Mon Sep 17 00:00:00 2001 From: "sgb8170@naver.com" Date: Tue, 17 Jan 2023 23:02:27 +0900 Subject: [PATCH 10/10] =?UTF-8?q?fix=20:=20=EC=B0=9C=20=EC=9E=91=ED=92=88?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20id=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=20=EB=B0=98=ED=99=98(=EC=B6=94=ED=9B=84=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=8B=9C=20id=EA=B0=92=20=ED=95=84=EC=9A=94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sptp/backend/member/service/MemberService.java | 2 +- .../member/web/dto/response/PreferredArtWorkResponse.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sptp/backend/member/service/MemberService.java b/src/main/java/com/sptp/backend/member/service/MemberService.java index 7b464373..d2b050a5 100644 --- a/src/main/java/com/sptp/backend/member/service/MemberService.java +++ b/src/main/java/com/sptp/backend/member/service/MemberService.java @@ -490,7 +490,7 @@ public List getPreferredArtWorkList(Long loginMemberId List findPreferredArtWorkList = memberPreferredArtWorkRepository.findPreferredArtWork(loginMemberId); List preferredArtWorkResponse = findPreferredArtWorkList.stream() - .map(m -> new PreferredArtWorkResponse(m.getTitle(), m.getPrice(), processImage(m.getMainImage()))) + .map(m -> new PreferredArtWorkResponse(m.getId(), m.getTitle(), m.getPrice(), processImage(m.getMainImage()))) .collect(Collectors.toList()); return preferredArtWorkResponse; diff --git a/src/main/java/com/sptp/backend/member/web/dto/response/PreferredArtWorkResponse.java b/src/main/java/com/sptp/backend/member/web/dto/response/PreferredArtWorkResponse.java index 4e367fbf..042c4299 100644 --- a/src/main/java/com/sptp/backend/member/web/dto/response/PreferredArtWorkResponse.java +++ b/src/main/java/com/sptp/backend/member/web/dto/response/PreferredArtWorkResponse.java @@ -9,6 +9,8 @@ @Builder public class PreferredArtWorkResponse { + private Long id; + private String title; private Integer price;