Feature/84 artwork more info

src/main/java/com/sptp/backend/art_work/repository/ArtWork.java

@@ -32,7 +32,7 @@ public class ArtWork extends BaseEntity {
 
     private String material;
 
-    private String size;
+    private Integer productionYear;
 
     private Integer price;
 
@@ -43,4 +43,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 frame;
+
+    private String genre;
+
+    private String description;
+
 }

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,7 +22,10 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -52,12 +56,19 @@ 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())
+                .frame(dto.isFrame())
+                .description(dto.getDescription())
+                .productionYear(dto.getProductionYear())
                 .build();
 
         artWorkRepository.save(artWork);
@@ -104,4 +115,38 @@ 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));
+
+        List<ArtWorkImage> artWorkImages = artWorkImageRepository.findByArtWorkId(artWorkId);
+        List<ArtWorkKeyword> 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()))
+                .build();
+
+        return artWorkInfoResponseDto;
+    }
 }

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<Void> saveArtWork(@AuthenticationPrincipal CustomUserDetai
 
         return new ResponseEntity(HttpStatus.OK);
     }
+
+    // 작품 상세 조회
+    @GetMapping("/art-work/{artWorkId}")
+    public ResponseEntity<ArtWorkInfoResponseDto> getArtWork(@PathVariable("artWorkId") Long artWorkId) {
+
+        ArtWorkInfoResponseDto artWorkInfoResponseDto = artWorkService.getArtWork(artWorkId);
+
+        return ResponseEntity.status(HttpStatus.OK).body(artWorkInfoResponseDto);
+    }
 }

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,10 +15,17 @@ public class ArtWorkSaveRequestDto {
     private MultipartFile guaranteeImage;
     private String title;
     private String[] keywords;
-    private String productionYear;
+    private Integer 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 frame;
+    private String genre;
+    private Integer price;
+    private String description;
+
 }

src/main/java/com/sptp/backend/art_work/web/dto/response/ArtWorkInfoResponseDto.java

@@ -0,0 +1,34 @@
+package com.sptp.backend.art_work.web.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+import java.util.List;
+
+@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 guaranteeImage;
+    private String mainImage;
+    private String artistImage;
+    private List<String> keywords;
+    private List<String> images;
+
+}

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<ArtWorkImage, Long> {
 
+    List<ArtWorkImage> findByArtWorkId(Long artWorkId);
 }

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<ArtWorkKeyword, Long> {
 
+    List<ArtWorkKeyword> findByArtWorkId(Long artWorkId);
 }

src/main/java/com/sptp/backend/member/repository/MemberRepository.java

@@ -15,4 +15,5 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
     boolean existsByUserId(String userId);
 
     boolean existsByNickname(String nickname);
+
 }

src/test/java/com/sptp/backend/member/web/MemberControllerTest.java

@@ -1,23 +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.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 javax.annotation.PostConstruct;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
@@ -40,7 +38,7 @@ class MemberControllerTest extends BaseControllerTest {
     MemberService memberService;
 
     // 인증 필요한 api 테스트 시 해당 유저 정보 사용
-    @PostConstruct
+    @BeforeEach
     void settingAuthenticatedUser() {
 
         MemberSaveRequestDto dto = MemberSaveRequestDto.builder()
@@ -126,12 +124,16 @@ void memberLoginTest() throws Exception {
 
     @Test
     @DisplayName("회원 정보 조회 테스트")
-    @WithUserDetails(value = "test2")
     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)
@@ -152,5 +154,4 @@ public void getUserInfo() throws Exception {
                 .andExpect(MockMvcResultMatchers.jsonPath("$.keywords[4]").value("세련된"));
     }
 
-
 }

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