Merge pull request #45 from saessagMarket/feat/#44-location-save

지도 위치 저장
saessagMarket · Jan 22, 2025 · dccaf95 · dccaf95
2 parents 21eede9 + d6c4283
commit dccaf95
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,6 +38,7 @@ dependencies {
 	implementation 'software.amazon.awssdk:s3:2.20.0'
 	implementation 'software.amazon.awssdk:core:2.20.0'
 	implementation 'software.amazon.awssdk:auth:2.20.0'
+	implementation 'me.paulschwarz:spring-dotenv:3.0.0'
 }
 
 test {

diff --git a/src/main/java/com/market/saessag/domain/product/controller/ProductController.java b/src/main/java/com/market/saessag/domain/product/controller/ProductController.java
@@ -2,7 +2,6 @@
 
 import com.market.saessag.domain.product.dto.ProductRequest;
 import com.market.saessag.domain.product.dto.ProductResponse;
-import com.market.saessag.domain.product.entity.Product;
 import com.market.saessag.domain.product.service.ProductService;
 import com.market.saessag.global.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
@@ -62,8 +61,8 @@ public ResponseEntity<ApiResponse<ProductResponse>> createProduct(@RequestBody P
     //상품 수정
     @PutMapping("/{productId}")
     public ResponseEntity<ApiResponse<ProductResponse>> updateProduct(@PathVariable Long productId,
-                                 @RequestBody Product product) {
-        ProductResponse updatedProduct = productService.updateProduct(productId, product);
+                                 @RequestBody ProductRequest productRequest) {
+        ProductResponse updatedProduct = productService.updateProduct(productId, productRequest);
         ApiResponse<ProductResponse> response = ApiResponse.<ProductResponse>builder()
                 .status("200")
                 .data(updatedProduct)

diff --git a/src/main/java/com/market/saessag/domain/product/dto/ProductRequest.java b/src/main/java/com/market/saessag/domain/product/dto/ProductRequest.java
@@ -11,7 +11,10 @@ public class ProductRequest {
     private String title;
     private Long price;
     private String description;
-    private String meetingPlace;
+    private Double latitude;
+    private Double longitude;
+    private String basicAddress;
+    private String detailedAddress;
     private List<String> photo;
     private String status;
 }
diff --git a/src/main/java/com/market/saessag/domain/product/dto/ProductResponse.java b/src/main/java/com/market/saessag/domain/product/dto/ProductResponse.java
@@ -14,7 +14,8 @@ public class ProductResponse {
     private String title;
     private Long price;
     private String description;
-    private String meetingPlace;
+    private String basicAddress;
+    private String detailedAddress;
     private final String addedDate;
     private String status;
     private final UserResponse user;

diff --git a/src/main/java/com/market/saessag/domain/product/entity/Product.java b/src/main/java/com/market/saessag/domain/product/entity/Product.java
@@ -33,7 +33,13 @@ public class Product {
     @Column(columnDefinition = "TEXT")
     private String description;
 
-    private String meetingPlace;
+    private Double latitude;
+
+    private Double longitude;
+
+    private String basicAddress;
+
+    private String detailedAddress;
 
     private LocalDateTime addedDate;
 

diff --git a/src/main/java/com/market/saessag/domain/product/service/ProductService.java b/src/main/java/com/market/saessag/domain/product/service/ProductService.java
@@ -33,22 +33,28 @@ public ProductResponse createProduct(ProductRequest productRequest) {
         product.setTitle(productRequest.getTitle());
         product.setPrice(productRequest.getPrice());
         product.setDescription(productRequest.getDescription());
-        product.setMeetingPlace(productRequest.getMeetingPlace());
+        product.setLatitude(productRequest.getLatitude());
+        product.setLongitude(productRequest.getLongitude());
+        product.setBasicAddress(productRequest.getBasicAddress());
+        product.setDetailedAddress(productRequest.getDetailedAddress());
         product.setPhoto(productRequest.getPhoto());
         product.setStatus(Product.ProductStatus.valueOf(productRequest.getStatus()));
         return convertToDTO(productRepository.save(product));
     }
 
     //상품 수정
-    public ProductResponse updateProduct(Long productId, Product product) {
+    public ProductResponse updateProduct(Long productId, ProductRequest productRequest) {
         Product productDTO = productRepository.findById(productId)
                 .map(afterProduct -> {
-                    afterProduct.setDescription(product.getDescription());
-                    afterProduct.setMeetingPlace(product.getMeetingPlace());
-                    afterProduct.setPhoto(product.getPhoto());
-                    afterProduct.setPrice(product.getPrice());
-                    afterProduct.setStatus(product.getStatus());
-                    afterProduct.setTitle(product.getTitle());
+                    afterProduct.setDescription(productRequest.getDescription());
+                    afterProduct.setLatitude(productRequest.getLatitude());
+                    afterProduct.setLongitude(productRequest.getLongitude());
+                    afterProduct.setBasicAddress(productRequest.getBasicAddress());
+                    afterProduct.setDetailedAddress(productRequest.getDetailedAddress());
+                    afterProduct.setPhoto(productRequest.getPhoto());
+                    afterProduct.setPrice(productRequest.getPrice());
+                    afterProduct.setStatus(Product.ProductStatus.valueOf(productRequest.getStatus()));
+                    afterProduct.setTitle(productRequest.getTitle());
                     return productRepository.save(afterProduct);
                 }).orElseThrow(() -> new IllegalArgumentException("없는 상품 번호 입니다."));
 
@@ -86,7 +92,8 @@ private ProductResponse convertToDTO(Product product) {
                 .title(product.getTitle())
                 .price(product.getPrice())
                 .description(product.getDescription())
-                .meetingPlace(product.getMeetingPlace())
+                .basicAddress(product.getBasicAddress())
+                .detailedAddress(product.getDetailedAddress())
                 .addedDate(TimeUtils.getRelativeTime(product.getAddedDate()))
                 .status(product.getStatus().toString())
                 .user(UserResponse.builder()