Merge remote-tracking branch 'origin/dev-server' into dev-server

Taekgil99 · Dec 1, 2022 · 0afc908 · 0afc908
2 parents 85e46b6 + 042e963
commit 0afc908
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/backend/src/main/java/com/backend/domain/product/api/ProductController.java b/backend/src/main/java/com/backend/domain/product/api/ProductController.java
@@ -4,6 +4,7 @@
 import com.backend.domain.product.domain.Product;
 import com.backend.domain.product.dto.DetailImg;
 import com.backend.domain.product.dto.ProResponseDto;
+import com.backend.domain.product.dto.ProductResponseDto;
 import com.backend.domain.product.dto.TitleImg;
 import com.backend.domain.product.mapper.ProductMapper;
 import com.backend.global.annotation.CurrentUser;
@@ -48,8 +49,10 @@ public ResponseEntity update(@PathVariable Long productsId,@CurrentUser CustomUs
         log.info(" 수정 실행 ");
 
         Product response = productService.update(productsId,categoryId,price,productName,titleImg,detailImg);
+        ProductResponseDto productResponseDto = productMapper.productToProductResponseDto(response);
+        productResponseDto.setCategoryId(response.getCategory().getCategoryId());
         log.info(" 수정 된 상품 출력 ");
-        return new ResponseEntity(new SingleResponseDto<>(productMapper.productToProductResponseDto(response)), HttpStatus.OK);
+        return new ResponseEntity(new SingleResponseDto<>(productResponseDto), HttpStatus.OK);
     }
 
     @DeleteMapping("/products/{productsId}")

diff --git a/backend/src/main/java/com/backend/domain/product/dto/ProductResponseDto.java b/backend/src/main/java/com/backend/domain/product/dto/ProductResponseDto.java
@@ -28,5 +28,7 @@ public class ProductResponseDto {
 
     private String tag;
 
+    private Long categoryId;
+
 
 }