Merge pull request #233 from PLADI-ALM/fix/PDS-116-createResource

[PDS-116/fix] 장비 및 차량 추가 로직 수정
PLADI-ALM · Nov 26, 2023 · 34f9cc0 · 34f9cc0
2 parents c56a0f8 + 463e887
commit 34f9cc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/example/pladialmserver/product/car/entity/Car.java b/src/main/java/com/example/pladialmserver/product/car/entity/Car.java
@@ -37,7 +37,6 @@ public class Car extends BaseEntity {
     @Size(max = 30)
     private String location;
 
-    @NotNull
     @Size(max = 255)
     private String description;
 
@@ -61,8 +60,9 @@ public Car(String name, String manufacturer, String description, String imgKey,
     public static Car toDto(CreateProductReq request, User responsibility) {
         return Car.builder()
                 .name(request.getName())
-                .location(request.getLocation())
-                .description(request.getDescription())
+                .manufacturer(request.getManufacturer() == null ? null : request.getManufacturer())
+                .location(request.getLocation() == null ? null : request.getLocation())
+                .description(request.getDescription() == null ? null : request.getDescription())
                 .imgKey((request.getImgKey() == null) ? null : request.getImgKey())
                 .user(responsibility)
                 .build();

diff --git a/src/main/java/com/example/pladialmserver/product/resource/entity/Resource.java b/src/main/java/com/example/pladialmserver/product/resource/entity/Resource.java
@@ -34,7 +34,6 @@ public class Resource extends BaseEntity {
   @Size(max = 30)
   private String location;
 
-  @NotNull
   @Size(max = 255)
   private String description;
 
@@ -72,8 +71,9 @@ public Resource(Long resourceId, String name, String manufacturer, String locati
   public static Resource toDto(CreateProductReq request, User responsibility) {
     return Resource.builder()
             .name(request.getName())
-            .location(request.getLocation())
-            .description(request.getDescription())
+            .manufacturer(request.getManufacturer() == null ? null : request.getDescription())
+            .location(request.getLocation() == null ? null : request.getDescription())
+            .description(request.getDescription() == null ? null : request.getDescription())
             .imgKey((request.getImgKey() == null) ? null : request.getImgKey())
             .user(responsibility)
             .build();